bug fix

Signed-off-by: automike <[email protected]>
nexiality · Mar 6, 2019 · 979727d · 979727d
1 parent 2c7da28
commit 979727d
Show file tree

Hide file tree

Showing 24 changed files with 9 additions and 12 deletions.
diff --git a/src/main/kotlin/org/nexial/core/plugins/xml/XmlModification.kt b/src/main/kotlin/org/nexial/core/plugins/xml/XmlModification.kt
@@ -134,7 +134,9 @@ internal class Replace : Modification("replace", true) {
     }
 
     override fun handleModification(target: Element, content: String?) {
-        target.setContent(Text(content))
+        val index = target.parent.content.indexOf(target)
+        target.parent.addContent(index, Text(content))
+        target.parent.removeContent(target)
     }
 
     override fun handleModification(target: Attribute, content: String?) {

diff --git a/src/test/java/org/nexial/core/plugins/xml/XmlCommandTest.java b/src/test/java/org/nexial/core/plugins/xml/XmlCommandTest.java
@@ -983,15 +983,15 @@ public void replace_text() throws Exception {
                             "        <COUNTRY>USA</COUNTRY>\n" +
                             "        <COMPANY>Columbia</COMPANY>\n" +
                             "        <PRICE>10.90</PRICE>\n" +
-                            "        <YEAR>UNKNOWN</YEAR>\n" +
+                            "        UNKNOWN\n" +
                             "    </CD>\n" +
                             "    <CD>\n" +
                             "        <TITLE>Eros</TITLE>\n" +
                             "        <ARTIST>Eros Ramazzotti</ARTIST>\n" +
                             "        <COUNTRY>EU</COUNTRY>\n" +
                             "        <COMPANY>BMG</COMPANY>\n" +
                             "        <PRICE>9.90</PRICE>\n" +
-                            "        <YEAR>UNKNOWN</YEAR>\n" +
+                            "        UNKNOWN\n" +
                             "    </CD>\n" +
                             "</CATALOG>", newXml);
     }
@@ -1095,12 +1095,8 @@ public void replace_multiple() throws Exception {
         newXml = context.getStringData("newXml");
         System.out.println("newXml = " + newXml);
         Assert.assertEquals("<CATALOG>\n" +
-                            "    <CD>\n" +
-                            "        <MESSAGE>Not available at this time</MESSAGE>\n" +
-                            "    </CD>\n" +
-                            "    <CD>\n" +
-                            "        <MESSAGE>Not available at this time</MESSAGE>\n" +
-                            "    </CD>\n" +
+                            "    <CD>Not available at this time</CD>\n" +
+                            "    <CD>Not available at this time</CD>\n" +
                             "</CATALOG>", newXml);
 
         result = fixture.replace(newXml, "//CATALOG/CD[position()=1]", "<CD id=\"123\">Not available</CD>", "newXml");
@@ -1111,9 +1107,7 @@ public void replace_multiple() throws Exception {
         System.out.println("newXml = " + newXml);
         Assert.assertEquals("<CATALOG>\n" +
                             "    <CD id=\"123\">Not available</CD>\n" +
-                            "    <CD>\n" +
-                            "        <MESSAGE>Not available at this time</MESSAGE>\n" +
-                            "    </CD>\n" +
+                            "    <CD>Not available at this time</CD>\n" +
                             "</CATALOG>", newXml);
     }
 

diff --git a/src/test/resources/showcase/artifact/data/sqs-showcase.data.xlsx b/src/test/resources/showcase/artifact/data/sqs-showcase.data.xlsx
diff --git a/src/test/resources/showcase/artifact/script/base-showcase-macro.xlsx b/src/test/resources/showcase/artifact/script/base-showcase-macro.xlsx
diff --git a/src/test/resources/showcase/artifact/script/base-showcase.xlsx b/src/test/resources/showcase/artifact/script/base-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/disable-showcase-macro.xlsx b/src/test/resources/showcase/artifact/script/disable-showcase-macro.xlsx
diff --git a/src/test/resources/showcase/artifact/script/disable-showcase.xlsx b/src/test/resources/showcase/artifact/script/disable-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/electron-showcase.xlsx b/src/test/resources/showcase/artifact/script/electron-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/expression-showcase.xlsx b/src/test/resources/showcase/artifact/script/expression-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/failafter-showcase.xlsx b/src/test/resources/showcase/artifact/script/failafter-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/image-showcase.xlsx b/src/test/resources/showcase/artifact/script/image-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/io-showcase.xlsx b/src/test/resources/showcase/artifact/script/io-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/jmeter-showcase.xlsx b/src/test/resources/showcase/artifact/script/jmeter-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/json-showcase.xlsx b/src/test/resources/showcase/artifact/script/json-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/mail-showcase.xlsx b/src/test/resources/showcase/artifact/script/mail-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/number-showcase.xlsx b/src/test/resources/showcase/artifact/script/number-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/redis-showcase.xlsx b/src/test/resources/showcase/artifact/script/redis-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/sqs-showcase.xlsx b/src/test/resources/showcase/artifact/script/sqs-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/step-showcase.xlsx b/src/test/resources/showcase/artifact/script/step-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/testplan-report-test-harness.xlsx b/src/test/resources/showcase/artifact/script/testplan-report-test-harness.xlsx
diff --git a/src/test/resources/showcase/artifact/script/web-showcase.xlsx b/src/test/resources/showcase/artifact/script/web-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/ws.async-showcase.xlsx b/src/test/resources/showcase/artifact/script/ws.async-showcase.xlsx
diff --git a/src/test/resources/showcase/artifact/script/xml-showcase.xlsx b/src/test/resources/showcase/artifact/script/xml-showcase.xlsx
diff --git a/src/test/resources/unittesting/.meta/project.id b/src/test/resources/unittesting/.meta/project.id
@@ -0,0 +1 @@
+unittesting