複数のTRSKG項目を持つ場合のtest項目を追加

diff --git a/importPicture/.classpath b/importPicture/.classpath
index f811421..55c672d 100644 (file)
--- a/importPicture/.classpath
+++ b/importPicture/.classpath
@@ -6,6 +6,6 @@
        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
        <classpathentry kind="lib" path="hayashi_0226.jar"/>
        <classpathentry kind="lib" path="commons-imaging-1.0-SNAPSHOT.jar"/>
-       <classpathentry kind="lib" path="/home/yuu/workspace/commons-compress-1.14.jar"/>
+       <classpathentry kind="lib" path="commons-compress-1.14.jar"/>
        <classpathentry kind="output" path="classes"/>
 </classpath>

diff --git a/importPicture/AdjustTime.ini b/importPicture/AdjustTime.ini
index f3fed27..f4e1829 100644 (file)
--- a/importPicture/AdjustTime.ini
+++ b/importPicture/AdjustTime.ini
@@ -1,5 +1,5 @@
 #by AdjustTime
-#Sat Jun 03 22:01:29 JST 2017
+#Sun Jun 04 14:08:04 JST 2017
 GPX.BASETIME=FILE_UPDATE
 IMG.OUTPUT_EXIF=true
 GPX.OUTPUT_WPT=false

diff --git a/importPicture/AdjustTime.ini.org b/importPicture/AdjustTime.ini.org
index 16100cd..0f44ab2 100644 (file)
--- a/importPicture/AdjustTime.ini.org
+++ b/importPicture/AdjustTime.ini.org
@@ -1,5 +1,5 @@
 #by AdjustTime
-#Sat Jun 03 22:00:34 JST 2017
+#Sun Jun 04 14:07:56 JST 2017
 GPX.BASETIME=EXIF_TIME
 IMG.OUTPUT_EXIF=true
 GPX.OUTPUT_WPT=false

diff --git a/importPicture/build.xml b/importPicture/build.xml
index 2f35759..860f088 100644 (file)
--- a/importPicture/build.xml
+++ b/importPicture/build.xml
@@ -63,6 +63,7 @@
                <classpath>\r
                                <pathelement path="${src}"/>\r
                        <pathelement path="${commons-imaging}"/>\r
+                       <pathelement path="${basedir}/commons-compress-1.14.jar"/>\r
                        </classpath>\r
                </javac>\r
        </target>\r

diff --git a/importPicture/commons-compress-1.14.jar b/importPicture/commons-compress-1.14.jar
new file mode 100644 (file)
index 0000000..7490eb8
Binary files /dev/null and b/importPicture/commons-compress-1.14.jar differ

diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java
index c3b4f35..3dc7ef2 100644 (file)
--- a/importPicture/src/osm/jp/gpx/ImportPicture.java
+++ b/importPicture/src/osm/jp/gpx/ImportPicture.java
@@ -487,7 +487,6 @@ public class ImportPicture extends Thread {
         os = new FileOutputStream(outputFile);\r
         result = new StreamResult(os);\r
         transformer.transform(source, result);\r
-\r
     }\r
     \r
        \r

diff --git a/importPicture/test/osm/jp/gpx/utils/TarGz.java b/importPicture/src/osm/jp/gpx/utils/TarGz.java
similarity index 100%
rename from importPicture/test/osm/jp/gpx/utils/TarGz.java
rename to importPicture/src/osm/jp/gpx/utils/TarGz.java

diff --git a/importPicture/test/osm/jp/gpx/ImportPictureTest.java b/importPicture/test/osm/jp/gpx/ImportPictureTest.java
index 83bf1f3..b9543f3 100644 (file)
--- a/importPicture/test/osm/jp/gpx/ImportPictureTest.java
+++ b/importPicture/test/osm/jp/gpx/ImportPictureTest.java
@@ -322,16 +322,27 @@ public class ImportPictureTest {
                // 実行する
                        testdo();
 
-               File gpxfile = new File("./testdata/output/cameradata/separate", "separate_.gpx");
-               assertThat(gpxfile.exists(), is(true));
-               File file0 = new File("./testdata/output/cameradata/separate", "20170529_102305A.jpg");
-               assertThat(file0.exists(), is(false));
-               File file1 = new File("./testdata/output/cameradata/separate", "20170529_103146A.jpg");
-               assertThat(file1.exists(), is(true));
-               File file3 = new File("./testdata/output/cameradata/separate", "20170529_103515A.jpg");
+                       boolean exists;
+               File gpxfile = new File("./testdata/output/separate", "separate_.gpx");
+               exists = gpxfile.exists();
+               assertThat(exists, is(true));
+               
+               File file0 = new File("./testdata/output/separate", "20170529_102305A.jpg");
+               exists = file0.exists();
+               assertThat(exists, is(false));
+               
+               File file1 = new File("./testdata/output/separate", "20170529_103146A.jpg");
+               exists = file1.exists();
+               assertThat(exists, is(true));
+
+               File file3 = new File("./testdata/output/separate", "20170529_103515A.jpg");
                assertThat(file3.exists(), is(true));
-               File file4 = new File("./testdata/output/cameradata/separate", "20170529_104119A.jpg");
-               assertThat(file4.exists(), is(true));
+               exists = file3.exists();
+               assertThat(exists, is(true));
+
+               File file4 = new File("./testdata/output/separate", "20170529_104119A.jpg");
+               exists = file4.exists();
+               assertThat(exists, is(true));
                }
 
                @Test
@@ -344,15 +355,15 @@ public class ImportPictureTest {
                // 実行する
                        testdo();
 
-               File gpxfile = new File("./testdata/output/cameradata/separate", "separate_.gpx");
+               File gpxfile = new File("./testdata/output/separate", "separate_.gpx");
                assertThat(gpxfile.exists(), is(true));
-               File file0 = new File("./testdata/output/cameradata/separate", "20170529_102305A.jpg");
+               File file0 = new File("./testdata/output/separate", "20170529_102305A.jpg");
                assertThat(file0.exists(), is(false));
-               File file1 = new File("./testdata/output/cameradata/separate", "20170529_103146A.jpg");
+               File file1 = new File("./testdata/output/separate", "20170529_103146A.jpg");
                assertThat(file1.exists(), is(true));
-               File file3 = new File("./testdata/output/cameradata/separate", "20170529_103515A.jpg");
+               File file3 = new File("./testdata/output/separate", "20170529_103515A.jpg");
                assertThat(file3.exists(), is(true));
-               File file4 = new File("./testdata/output/cameradata/separate", "20170529_104119A.jpg");
+               File file4 = new File("./testdata/output/separate", "20170529_104119A.jpg");
                assertThat(file4.exists(), is(true));
                }