MAVEN構成

[importpicture/importpicture.git] / src / test / java / osm / jp / gpx / AppParametersTest.java

diff --git a/test/osm/jp/gpx/AppParametersTest.java b/src/test/java/osm/jp/gpx/AppParametersTest.java
similarity index 94%
rename from test/osm/jp/gpx/AppParametersTest.java
rename to src/test/java/osm/jp/gpx/AppParametersTest.java
index e0f9f6b..da80851 100644 (file)
--- a/test/osm/jp/gpx/AppParametersTest.java
+++ b/src/test/java/osm/jp/gpx/AppParametersTest.java
@@ -49,7 +49,7 @@ public class AppParametersTest {
         @Test
         public void IMG_OUTPUT_ALLが定義されていない時() {
             try {
-                params = new AppParameters("testdata/AdjustTime.off.ini");
+                params = new AppParameters("src/test/data/AdjustTime.off.ini");
                 String valueStr = params.getProperty(AppParameters.IMG_OUTPUT_ALL);
                 assertThat(valueStr, is("false"));
             }
@@ -65,13 +65,13 @@ public class AppParametersTest {
         public void setUp() throws Exception {
             File iniFile = new File("AdjustTime.ini");
             File orgFile = new File("AdjustTime.ini.org");
-            File testFile = new File("testdata", "AdjustTime.on.ini");
+            File testFile = new File("src/test/data", "AdjustTime.on.ini");
 
             if (orgFile.exists()) {
-                    orgFile.delete();
+                orgFile.delete();
             }
             if (iniFile.exists()) {
-                    iniFile.renameTo(orgFile);
+                iniFile.renameTo(orgFile);
             }
 
             FileInputStream inStream = new FileInputStream(testFile);
@@ -120,7 +120,6 @@ public class AppParametersTest {
                 AppParameters params = new AppParameters();
                 params.setProperty(AppParameters.IMG_OUTPUT_ALL, "false");
                 params.store();
-                params = null;
                 AppParameters newParams = new AppParameters();
                 String valueStr = newParams.getProperty(AppParameters.IMG_OUTPUT_ALL);
                 assertThat(valueStr, is("false"));
@@ -137,7 +136,7 @@ public class AppParametersTest {
         public void setUp() throws Exception {
             File iniFile = new File("AdjustTime.ini");
             File orgFile = new File("AdjustTime.ini.org");
-            File testFile = new File("testdata", "AdjustTime.off.ini");
+            File testFile = new File("src/test/data", "AdjustTime.off.ini");
 
             if (orgFile.exists()) {
                 orgFile.delete();
@@ -191,7 +190,6 @@ public class AppParametersTest {
                 AppParameters params = new AppParameters();
                 params.setProperty(AppParameters.IMG_OUTPUT_ALL, "true");
                 params.store();
-                params = null;
                 AppParameters newParams = new AppParameters();
                 String valueStr = newParams.getProperty(AppParameters.IMG_OUTPUT_ALL);
                 assertThat(valueStr, is("true"));