BAEL-952 Removed mutable state by having separate files for tests (eu…

…genp#1994)
bipul-agarwal · Jun 5, 2017 · 97c1291 · 97c1291
1 parent ecc91a6
commit 97c1291
Show file tree

Hide file tree

Showing 17 changed files with 177 additions and 26 deletions.
diff --git a/xml/src/main/java/com/baeldung/xml/Dom4JParser.java b/xml/src/main/java/com/baeldung/xml/Dom4JParser.java
@@ -82,7 +82,7 @@ public void generateModifiedDocument() {
                     title.setText(title.getText() + " updated");
                 }
             }
-            XMLWriter writer = new XMLWriter(new FileWriter(new File("src/test/resources/example_updated.xml")));
+            XMLWriter writer = new XMLWriter(new FileWriter(new File("src/test/resources/example_dom4j_updated.xml")));
             writer.write(document);
             writer.close();
         } catch (DocumentException e) {
@@ -110,7 +110,7 @@ public void generateNewDocument() {
             tutorialElement.addElement("author").addText("Dom4J tech writer");
 
             OutputFormat format = OutputFormat.createPrettyPrint();
-            XMLWriter writer = new XMLWriter(new FileWriter(new File("src/test/resources/example_new.xml")), format);
+            XMLWriter writer = new XMLWriter(new FileWriter(new File("src/test/resources/example_dom4j_new.xml")), format);
             writer.write(document);
             writer.close();
         } catch (IOException e) {

diff --git a/xml/src/test/java/com/baeldung/xml/DefaultParserUnitTest.java b/xml/src/test/java/com/baeldung/xml/DefaultParserUnitTest.java
@@ -1,6 +1,8 @@
 package com.baeldung.xml;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 
@@ -10,9 +12,9 @@
 
 public class DefaultParserUnitTest {
 
-    final String fileName = "src/test/resources/example.xml";
+    final String fileName = "src/test/resources/example_default_parser.xml";
 
-    final String fileNameSpace = "src/test/resources/example_namespace.xml";
+    final String fileNameSpace = "src/test/resources/example_default_parser_namespace.xml";
 
     DefaultParser parser;
 

diff --git a/xml/src/test/java/com/baeldung/xml/Dom4JParserUnitTest.java b/xml/src/test/java/com/baeldung/xml/Dom4JParserUnitTest.java
@@ -13,7 +13,7 @@
 
 public class Dom4JParserUnitTest {
 
-    final String fileName = "src/test/resources/example.xml";
+    final String fileName = "src/test/resources/example_dom4j.xml";
 
     Dom4JParser parser;
 
@@ -61,7 +61,7 @@ public void generateModifiedDocumentTest() {
         parser = new Dom4JParser(new File(fileName));
         parser.generateModifiedDocument();
 
-        File generatedFile = new File("src/test/resources/example_updated.xml");
+        File generatedFile = new File("src/test/resources/example_dom4j_updated.xml");
         assertTrue(generatedFile.exists());
 
         parser.setFile(generatedFile);
@@ -76,13 +76,12 @@ public void generateNewDocumentTest() {
         parser = new Dom4JParser(new File(fileName));
         parser.generateNewDocument();
 
-        File newFile = new File("src/test/resources/example_new.xml");
+        File newFile = new File("src/test/resources/example_dom4j_new.xml");
         assertTrue(newFile.exists());
 
         parser.setFile(newFile);
         Node element = parser.getNodeById("01");
 
         assertEquals("XML with Dom4J", element.selectSingleNode("title").getText());
-
     }
 }
diff --git a/xml/src/test/java/com/baeldung/xml/JDomParserUnitTest.java b/xml/src/test/java/com/baeldung/xml/JDomParserUnitTest.java
@@ -12,7 +12,7 @@
 
 public class JDomParserUnitTest {
 
-    final String fileName = "src/test/resources/example.xml";
+    final String fileName = "src/test/resources/example_jdom.xml";
 
     JDomParser parser;
 

diff --git a/xml/src/test/java/com/baeldung/xml/JaxbParserUnitTest.java b/xml/src/test/java/com/baeldung/xml/JaxbParserUnitTest.java
@@ -11,7 +11,7 @@
 
 public class JaxbParserUnitTest {
 
-    final String fileName = "src/test/resources/example.xml";
+    final String fileName = "src/test/resources/example_jaxb.xml";
 
     JaxbParser parser;
 
@@ -27,7 +27,7 @@ public void getFullDocumentTest() {
 
     @Test
     public void createNewDocumentTest() {
-        File newFile = new File("src/test/resources/example_new.xml");
+        File newFile = new File("src/test/resources/example_jaxb_new.xml");
         parser = new JaxbParser(newFile);
         parser.createNewDocument();
 

diff --git a/xml/src/test/java/com/baeldung/xml/JaxenDemoUnitTest.java b/xml/src/test/java/com/baeldung/xml/JaxenDemoUnitTest.java
@@ -10,7 +10,7 @@
 
 public class JaxenDemoUnitTest {
 
-    final String fileName = "src/test/resources/example.xml";
+    final String fileName = "src/test/resources/example_jaxen.xml";
 
     JaxenDemo jaxenDemo;
 

diff --git a/xml/src/test/java/com/baeldung/xml/StaxParserUnitTest.java b/xml/src/test/java/com/baeldung/xml/StaxParserUnitTest.java
@@ -12,7 +12,7 @@
 
 public class StaxParserUnitTest {
 
-    final String fileName = "src/test/resources/example.xml";
+    final String fileName = "src/test/resources/example_stax.xml";
 
     StaxParser parser;
 

diff --git a/xml/src/test/resources/Customer1.xml b/xml/src/test/resources/Customer1.xml
diff --git a/xml/src/test/resources/example.xml → ...test/resources/example_default_parser.xml b/xml/src/test/resources/example.xml → ...test/resources/example_default_parser.xml
diff --git a/xml/src/test/resources/example_default_parser_namespace.xml b/xml/src/test/resources/example_default_parser_namespace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<tutorials xmlns="http://www.baeldung.com/full_archive">
+    <tutorial tutId="01" type="java">
+        <title>Guava</title>
+        <description>Introduction to Guava</description>
+        <date>04/04/2016</date>
+        <author>GuavaAuthor</author>
+    </tutorial>
+    <tutorial tutId="02" type="java">
+        <title>XML</title>
+        <description>Introduction to XPath</description>
+        <date>04/05/2016</date>
+        <author>XMLAuthor</author>
+    </tutorial>
+    <tutorial tutId="03" type="android">
+        <title>Android</title>
+        <description>Introduction to Android</description>
+        <date>04/03/2016</date>
+        <author>AndroidAuthor</author>
+    </tutorial>
+    <tutorial tutId="04" type="java">
+        <title>Spring</title>
+        <description>Introduction to Spring</description>
+        <date>04/02/2016</date>
+        <author>SpringAuthor</author>
+        <sections>
+            <section name="core">Spring Core</section>
+            <section name="mvc">Spring MVC</section>
+            <section name="batch">Spring Batch</section>
+        </sections>
+    </tutorial>
+</tutorials>
diff --git a/xml/src/test/resources/example_namespace.xml → xml/src/test/resources/example_dom4j.xml b/xml/src/test/resources/example_namespace.xml → xml/src/test/resources/example_dom4j.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<tutorials xmlns="http://www.baeldung.com/full_archive">
-    <tutorial tutId="01" type="java">
+<tutorials>
+	<tutorial tutId="01" type="java">
 		<title>Guava</title>
 		<description>Introduction to Guava</description>
 		<date>04/04/2016</date>

diff --git a/xml/src/test/resources/example_updated.xml → .../test/resources/example_dom4j_updated.xml b/xml/src/test/resources/example_updated.xml → .../test/resources/example_dom4j_updated.xml
diff --git a/xml/src/test/resources/example_jaxb.xml b/xml/src/test/resources/example_jaxb.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<tutorials>
+	<tutorial tutId="01" type="java">
+		<title>Guava</title>
+		<description>Introduction to Guava</description>
+		<date>04/04/2016</date>
+		<author>GuavaAuthor</author>
+	</tutorial>
+	<tutorial tutId="02" type="java">
+		<title>XML</title>
+		<description>Introduction to XPath</description>
+		<date>04/05/2016</date>
+		<author>XMLAuthor</author>
+	</tutorial>
+	<tutorial tutId="03" type="android">
+		<title>Android</title>
+		<description>Introduction to Android</description>
+		<date>04/03/2016</date>
+		<author>AndroidAuthor</author>
+	</tutorial>
+	<tutorial tutId="04" type="java">
+		<title>Spring</title>
+		<description>Introduction to Spring</description>
+		<date>04/02/2016</date>
+		<author>SpringAuthor</author>
+		<sections>
+			<section name="core">Spring Core</section>
+			<section name="mvc">Spring MVC</section>
+			<section name="batch">Spring Batch</section>
+		</sections>
+	</tutorial>
+</tutorials>
diff --git a/xml/src/test/resources/example_jaxen.xml b/xml/src/test/resources/example_jaxen.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<tutorials>
+	<tutorial tutId="01" type="java">
+		<title>Guava</title>
+		<description>Introduction to Guava</description>
+		<date>04/04/2016</date>
+		<author>GuavaAuthor</author>
+	</tutorial>
+	<tutorial tutId="02" type="java">
+		<title>XML</title>
+		<description>Introduction to XPath</description>
+		<date>04/05/2016</date>
+		<author>XMLAuthor</author>
+	</tutorial>
+	<tutorial tutId="03" type="android">
+		<title>Android</title>
+		<description>Introduction to Android</description>
+		<date>04/03/2016</date>
+		<author>AndroidAuthor</author>
+	</tutorial>
+	<tutorial tutId="04" type="java">
+		<title>Spring</title>
+		<description>Introduction to Spring</description>
+		<date>04/02/2016</date>
+		<author>SpringAuthor</author>
+		<sections>
+			<section name="core">Spring Core</section>
+			<section name="mvc">Spring MVC</section>
+			<section name="batch">Spring Batch</section>
+		</sections>
+	</tutorial>
+</tutorials>
diff --git a/xml/src/test/resources/example_jdom.xml b/xml/src/test/resources/example_jdom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<tutorials>
+	<tutorial tutId="01" type="java">
+		<title>Guava</title>
+		<description>Introduction to Guava</description>
+		<date>04/04/2016</date>
+		<author>GuavaAuthor</author>
+	</tutorial>
+	<tutorial tutId="02" type="java">
+		<title>XML</title>
+		<description>Introduction to XPath</description>
+		<date>04/05/2016</date>
+		<author>XMLAuthor</author>
+	</tutorial>
+	<tutorial tutId="03" type="android">
+		<title>Android</title>
+		<description>Introduction to Android</description>
+		<date>04/03/2016</date>
+		<author>AndroidAuthor</author>
+	</tutorial>
+	<tutorial tutId="04" type="java">
+		<title>Spring</title>
+		<description>Introduction to Spring</description>
+		<date>04/02/2016</date>
+		<author>SpringAuthor</author>
+		<sections>
+			<section name="core">Spring Core</section>
+			<section name="mvc">Spring MVC</section>
+			<section name="batch">Spring Batch</section>
+		</sections>
+	</tutorial>
+</tutorials>
diff --git a/xml/src/test/resources/example_new.xml b/xml/src/test/resources/example_new.xml
diff --git a/xml/src/test/resources/example_stax.xml b/xml/src/test/resources/example_stax.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<tutorials>
+	<tutorial tutId="01" type="java">
+		<title>Guava</title>
+		<description>Introduction to Guava</description>
+		<date>04/04/2016</date>
+		<author>GuavaAuthor</author>
+	</tutorial>
+	<tutorial tutId="02" type="java">
+		<title>XML</title>
+		<description>Introduction to XPath</description>
+		<date>04/05/2016</date>
+		<author>XMLAuthor</author>
+	</tutorial>
+	<tutorial tutId="03" type="android">
+		<title>Android</title>
+		<description>Introduction to Android</description>
+		<date>04/03/2016</date>
+		<author>AndroidAuthor</author>
+	</tutorial>
+	<tutorial tutId="04" type="java">
+		<title>Spring</title>
+		<description>Introduction to Spring</description>
+		<date>04/02/2016</date>
+		<author>SpringAuthor</author>
+		<sections>
+			<section name="core">Spring Core</section>
+			<section name="mvc">Spring MVC</section>
+			<section name="batch">Spring Batch</section>
+		</sections>
+	</tutorial>
+</tutorials>