Merge pull request #68 from ing-bank/release/2.3

Release v2.3

Author: renzjephte

.gitignore

@@ -25,6 +25,7 @@ nb-configuration.xml
 .settings/
 .classpath
 .idea/
+.project
 
 # System Files
 .DS_Store

Common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ing</groupId>
         <artifactId>ingenious-playwright</artifactId>
-        <version>2.2</version>
+        <version>2.3</version>
     </parent>
     <artifactId>Common</artifactId>
     <properties>

Common/src/main/java/com/ing/parent/createParentPOM.java

@@ -31,17 +31,23 @@ public static void main(String[] args) {
             // Get target pom and source pom for properties
             String targetPath = args[0];
             String propertiesSourcePath = args[1];
-
+            
             // Copy properties from main pom to target pom
             String sourcePomContent = Files.readString(Paths.get(propertiesSourcePath));
             String propertiesContent = getPropertiesContent(sourcePomContent);
             String destinationPomContent = Files.readString(Paths.get(targetPath));
             String updatedDestinationPomContent = updatePropertiesContent(destinationPomContent, propertiesContent);
             Files.write(Paths.get(targetPath), updatedDestinationPomContent.getBytes());
             System.out.println("Properties copied successfully!");
+            
+            // Create a new document for the source/parent pom.xml file
+            Document parentDocument = createSourceDocument(propertiesSourcePath);
 
             // Create a new document for the target pom.xml file
             Document targetDocument = createTargetDocument(targetPath);
+            
+            // Copy the version value from the source/parent pom.xml file to the target pom.xml
+            copySourceVersionValue(parentDocument, targetDocument);
 
             System.out.println("TargetPath = " + targetPath);
             // Remove content under dependencies,repositories and pluginRepositories tag from target document
@@ -94,7 +100,7 @@ private static Document createTargetDocument(String targetPath) throws ParserCon
     }
 
     private static Document createSourceDocument(String sourcePath) throws ParserConfigurationException, SAXException, IOException {
-        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+    	DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
         DocumentBuilder document = dbFactory.newDocumentBuilder();
         File sourcePomPath = new File(sourcePath);
         return document.parse(sourcePomPath);
@@ -177,6 +183,29 @@ private static void removeEngineArtifact(Document targetDocument) throws XPathEx
             parent.removeChild(dependencyNode);
         }
     }
+    
+    private static Node getVersionNode(Document doc) throws XPathExpressionException {
+    	XPathFactory xpathFactory = XPathFactory.newInstance();
+    	XPath xpath = xpathFactory.newXPath();
+    	XPathExpression expr = xpath.compile("//project/version");
+    	NodeList nodeList = (NodeList) expr.evaluate(doc,
+    	    XPathConstants.NODE);
+    	return nodeList.getLength() > 0 ? nodeList.item(0) : null;	
+    } 
+    
+    private static void copySourceVersionValue(Document source, Document target) throws XPathExpressionException {
+    	String version = getSourceVersionNumber(source);
+    	System.out.println("Setting version value to: " + version);
+    	Node node = getVersionNode(target);
+    	node.setNodeValue(version);
+    }
+    
+    private static String getSourceVersionNumber(Document parentDocument) throws XPathExpressionException {
+    	XPathFactory xpathFactory = XPathFactory.newInstance();
+    	XPath xpath = xpathFactory.newXPath();
+    	XPathExpression expr = xpath.compile("//project/version");
+    	return (String) expr.evaluate(parentDocument, XPathConstants.STRING);
+    }
 
     private static Node getNodes(Document doc, String tagName) {
         NodeList nodeList = doc.getElementsByTagName(tagName);

Datalib/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ing</groupId>
         <artifactId>ingenious-playwright</artifactId>
-        <version>2.2</version>
+        <version>2.3</version>
     </parent>
     <artifactId>ingenious-datalib</artifactId>
     <packaging>jar</packaging>

Datalib/src/main/java/com/ing/datalib/component/EnvTestData.java

@@ -1,13 +1,14 @@
-
 package com.ing.datalib.component;
 
 import com.ing.datalib.testdata.TestDataFactory;
 import com.ing.datalib.testdata.model.AbstractDataModel;
 import com.ing.datalib.testdata.model.TestDataModel;
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
@@ -20,7 +21,7 @@
 
 /**
  *
- * 
+ *
  */
 public class EnvTestData {
 
@@ -201,11 +202,24 @@ public void save() {
             testData.save();
         }
         environmentProperties.put("Environment", getEnvironmentsAsString());
-        try (FileOutputStream fout = new FileOutputStream(new File(getPropertiesLocation()));) {
-            environmentProperties.store(fout, "List of Environments in comma seperated order");
+        saveProperties(environmentProperties, getPropertiesLocation());
+    }
+
+    private static void saveProperties(Properties prop, String filename) {
+        File file = new File(filename);
+        try (BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "ISO_8859_1"))) {
+            synchronized (prop) {
+                for (Map.Entry<Object, Object> e : prop.entrySet()) {
+                    String key = (String) e.getKey();
+                    String val = (String) e.getValue();
+                    bw.write(key + "=" + val);
+                    bw.newLine();
+                }
+            }
         } catch (IOException ex) {
             Logger.getLogger(EnvTestData.class.getName()).log(Level.SEVERE, null, ex);
         }
+
     }
 
     private String getEnvironmentsAsString() {

Datalib/src/main/java/com/ing/datalib/component/TestStep.java

@@ -340,4 +340,8 @@ public Boolean isWebserviceStartStep() {
     public Boolean isWebserviceStopStep() {
         return (getObject().equals("Webservice") && getAction().contains("closeConnection"));
     }
+    
+    public Boolean isStringOperationsStep() {
+        return getObject().equals("String Operations");
+    }
 }

Datalib/src/main/java/com/ing/datalib/settings/AbstractPropSettings.java

@@ -9,7 +9,7 @@
  *
  * 
  */
-public class AbstractPropSettings extends LinkedProperties {
+    public class AbstractPropSettings extends LinkedProperties {
 
     private String location;