svn commit: r1799504 - in /commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2: TestJSONConfiguration.java TestYAMLConfiguration.java

[oheger]

Author: oheger
Date: Wed Jun 21 20:00:51 2017
New Revision: 1799504

URL: http://svn.apache.org/viewvc?rev=1799504&view=rev
Log:
[CONFIGURATION-258] Improvements on test classes.

Temporary files are not written; so there is no need to define an
output file.

Modified:
    
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java
    
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestYAMLConfiguration.java

Modified: 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java?rev=1799504&r1=1799503&r2=1799504&view=diff
==============================================================================
--- 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java
 (original)
+++ 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java
 Wed Jun 21 20:00:51 2017
@@ -23,7 +23,6 @@ import org.apache.commons.configuration2
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.StringWriter;
@@ -31,7 +30,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Unit test for {@link JSONConfiguration} Not ideal: it uses the Jackson JSON
@@ -42,7 +42,6 @@ public class TestJSONConfiguration
     /** The files that we test with. */
     private String testJson =
             ConfigurationAssert.getTestFile("test.json").getAbsolutePath();
-    private File testSaveConf = 
ConfigurationAssert.getOutFile("testsave.json");
 
     private JSONConfiguration jsonConfiguration;
 
@@ -51,7 +50,6 @@ public class TestJSONConfiguration
     {
         jsonConfiguration = new JSONConfiguration();
         jsonConfiguration.read(new FileReader(testJson));
-        removeTestFile();
     }
 
     @Test
@@ -132,15 +130,4 @@ public class TestJSONConfiguration
         assertEquals("Elite", jsonConfiguration.getProperty("martin.skill"));
     }
 
-    /**
-     * Removes the test output file if it exists.
-     */
-    private void removeTestFile()
-    {
-        if (testSaveConf.exists())
-        {
-            assertTrue(testSaveConf.delete());
-        }
-    }
-
 }

Modified: 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestYAMLConfiguration.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestYAMLConfiguration.java?rev=1799504&r1=1799503&r2=1799504&view=diff
==============================================================================
--- 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestYAMLConfiguration.java
 (original)
+++ 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestYAMLConfiguration.java
 Wed Jun 21 20:00:51 2017
@@ -2,7 +2,9 @@ package org.apache.commons.configuration
 
 import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.File;
@@ -24,7 +26,6 @@ public class TestYAMLConfiguration
     /** The files that we test with. */
     private String testYaml =
             ConfigurationAssert.getTestFile("test.yaml").getAbsolutePath();
-    private File testSaveConf = 
ConfigurationAssert.getOutFile("testsave.yaml");
 
     private YAMLConfiguration yamlConfiguration;
 
@@ -33,7 +34,6 @@ public class TestYAMLConfiguration
     {
         yamlConfiguration = new YAMLConfiguration();
         yamlConfiguration.read(new FileReader(testYaml));
-        removeTestFile();
     }
 
     @Test
@@ -110,15 +110,4 @@ public class TestYAMLConfiguration
         assertEquals("Developer", yamlConfiguration.getProperty("martin.job"));
         assertEquals("Elite", yamlConfiguration.getProperty("martin.skill"));
     }
-
-    /**
-     * Removes the test output file if it exists.
-     */
-    private void removeTestFile()
-    {
-        if (testSaveConf.exists())
-        {
-            assertTrue(testSaveConf.delete());
-        }
-    }
 }