Fix : テストデータの形式をZIPからTAR.GZに変更

ファイルの更新日付を制御するため

diff --git a/pom.xml b/pom.xml
index 19025a2..d2f2d7e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -199,7 +199,7 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/Sony20170518/4/Sony20170518-5.tar.gz</url>
+              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/Sony20170518/5/Sony20170518-5.tar.gz</url>
               <unpack>false</unpack>
               <outputDirectory>${project.build.directory}/test-classes/imgdata</outputDirectory>
             </configuration>
@@ -211,7 +211,7 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/WiMiUS20170518/2/WiMiUS20170518-5.tar.gz</url>
+              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/WiMiUS20170518/5/WiMiUS20170518-5.tar.gz</url>
               <unpack>false</unpack>
               <outputDirectory>${project.build.directory}/test-classes/imgdata</outputDirectory>
             </configuration>
@@ -223,7 +223,7 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/separate/1/separate-5.tar.gz</url>
+              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/separate/5/separate-5.tar.gz</url>
               <unpack>false</unpack>
               <outputDirectory>${project.build.directory}/test-classes/imgdata</outputDirectory>
             </configuration>

diff --git a/src/test/java/osm/jp/gpx/Fixture.java b/src/test/java/osm/jp/gpx/Fixture.java
index ce8b038..df1fc48 100644 (file)
--- a/src/test/java/osm/jp/gpx/Fixture.java
+++ b/src/test/java/osm/jp/gpx/Fixture.java
@@ -96,7 +96,7 @@ public class Fixture {
         // 1
         new Fixture(
             "[A1].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時",
-            "target/test-classes/imgdata/Sony20170518-4.zip", 
+            "target/test-classes/imgdata/Sony20170518-5.tar.gz", 
             "target/test-classes/gpx/20170518.gpx",
             "target/test-classes/cameradata/20170518.gpx",
             "target/test-classes/ini/AdjustTime.20170518.A1.ini",
@@ -112,7 +112,7 @@ public class Fixture {
         new Fixture(
                        
             "[A2].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時",
-            "target/test-classes/imgdata/Sony20170518-4.zip", 
+            "target/test-classes/imgdata/Sony20170518-5.tar.gz", 
             "target/test-classes/cameradata/20170518.gpx",
             "target/test-classes/output/20170518.gpx",
             "target/test-classes/ini/AdjustTime.20170518.A2.ini",
@@ -127,7 +127,7 @@ public class Fixture {
         // 3.
         new Fixture(
             "[B1].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時",
-            "target/test-classes/imgdata/WiMiUS20170518-2.zip", 
+            "target/test-classes/imgdata/WiMiUS20170518-5.tar.gz", 
             "target/test-classes/gpx/20170518.gpx",
             "target/test-classes/output/20170518.gpx",
             "target/test-classes/ini/AdjustTime.20170518.B1.ini",
@@ -141,7 +141,7 @@ public class Fixture {
         // 4.
         new Fixture(
             "[B2].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時",
-            "target/test-classes/imgdata/WiMiUS20170518-2.zip", 
+            "target/test-classes/imgdata/WiMiUS20170518-5.tar.gz", 
             "target/test-classes/gpx/20170518.gpx",
             "target/test-classes/cameradata/20170518.gpx",
             "target/test-classes/ini/AdjustTime.20170518.B2.ini",
@@ -156,7 +156,7 @@ public class Fixture {
         // 5.
         new Fixture(
             "[M1a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado",
-            "target/test-classes/imgdata/separate-2.zip",
+            "target/test-classes/imgdata/separate-5.tar.gz",
             "target/test-classes/gpx/muiltiTRK.GarminColorado.gpx.xml",
             "target/test-classes/cameradata/separate.gpx",
             "target/test-classes/ini/AdjustTime.M1a.separate.ini",
@@ -190,7 +190,7 @@ public class Fixture {
 
         new Fixture(
             "[M1b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado",
-            "target/test-classes/imgdata/separate-2.zip",
+            "target/test-classes/imgdata/separate-5.tar.gz",
             "target/test-classes/gpx/muiltiTRK.GarminColorado.gpx.xml",
             "target/test-classes/cameradata/separate.gpx",
             "target/test-classes/ini/AdjustTime.M1b.separate.ini",
@@ -224,7 +224,7 @@ public class Fixture {
 
         new Fixture(
             "[M1c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado",
-            "target/test-classes/imgdata/separate-2.zip",
+            "target/test-classes/imgdata/separate-5.tar.gz",
             "target/test-classes/gpx/muiltiTRK.GarminColorado.gpx.xml",
             "target/test-classes/cameradata/separate.gpx",
             "target/test-classes/ini/AdjustTime.M1c.separate.ini",
@@ -258,7 +258,7 @@ public class Fixture {
 
         new Fixture(
             "[M1d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado",
-            "target/test-classes/imgdata/separate-2.zip", 
+            "target/test-classes/imgdata/separate-5.tar.gz", 
             "target/test-classes/gpx/muiltiTRK.GarminColorado.gpx.xml",
             "target/test-classes/cameradata/separate.gpx",
             "target/test-classes/ini/AdjustTime.M1d.separate.ini",
@@ -293,7 +293,7 @@ public class Fixture {
 
         new Fixture(
             "[M2a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J",
-            "target/test-classes/imgdata/separate-2.zip", 
+            "target/test-classes/imgdata/separate-5.tar.gz", 
             "target/test-classes/gpx/multiTRKSEG.eTrex_20J.gpx.xml",
             "target/test-classes/cameradata/separate.gpx",
             "target/test-classes/ini/AdjustTime.M2a.separate.ini",
@@ -327,7 +327,7 @@ public class Fixture {
 
         new Fixture(
             "[M2b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J",
-            "target/test-classes/imgdata/separate-2.zip", 
+            "target/test-classes/imgdata/separate-5.tar.gz", 
             "target/test-classes/gpx/multiTRKSEG.eTrex_20J.gpx.xml",
             "target/test-classes/cameradata/separate.gpx",
             "target/test-classes/ini/AdjustTime.M2b.separate.ini",
@@ -361,7 +361,7 @@ public class Fixture {
 
         new Fixture(
             "[M2c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J",
-            "target/test-classes/imgdata/separate-2.zip", 
+            "target/test-classes/imgdata/separate-5.tar.gz", 
             "target/test-classes/gpx/multiTRKSEG.eTrex_20J.gpx.xml",
             "target/test-classes/cameradata/separate.gpx",
             "target/test-classes/ini/AdjustTime.M2c.separate.ini",
@@ -395,7 +395,7 @@ public class Fixture {
 
         new Fixture(
             "[M2d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J",
-            "target/test-classes/imgdata/separate-2.zip", 
+            "target/test-classes/imgdata/separate-5.tar.gz", 
             "target/test-classes/gpx/multiTRKSEG.eTrex_20J.gpx.xml",
             "target/test-classes/cameradata/separate.gpx",
             "target/test-classes/ini/AdjustTime.M2d.separate.ini",
@@ -429,7 +429,7 @@ public class Fixture {
 
         new Fixture(
             "[M3a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse",
-            "target/test-classes/imgdata/separate-2.zip", 
+            "target/test-classes/imgdata/separate-5.tar.gz", 
             "target/test-classes/gpx/multiTRKSEGreverse.eTrex_20J.gpx.xml",
             "target/test-classes/cameradata/separate.gpx",
             "target/test-classes/ini/AdjustTime.M2a.separate.ini",
@@ -463,7 +463,7 @@ public class Fixture {
 
         new Fixture(
             "[M3b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse",
-            "target/test-classes/imgdata/separate-2.zip", 
+            "target/test-classes/imgdata/separate-5.tar.gz", 
             "target/test-classes/gpx/multiTRKSEGreverse.eTrex_20J.gpx.xml",
             "target/test-classes/cameradata/separate.gpx",
             "target/test-classes/ini/AdjustTime.M2b.separate.ini",
@@ -497,7 +497,7 @@ public class Fixture {
 
         new Fixture(
             "[M3c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse",
-            "target/test-classes/imgdata/separate-2.zip", 
+            "target/test-classes/imgdata/separate-5.tar.gz", 
             "target/test-classes/gpx/multiTRKSEGreverse.eTrex_20J.gpx.xml",
             "target/test-classes/cameradata/separate.gpx",
             "target/test-classes/ini/AdjustTime.M2c.separate.ini",
@@ -531,7 +531,7 @@ public class Fixture {
 
         new Fixture(
             "[M3d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse",
-            "target/test-classes/imgdata/separate-2.zip", 
+            "target/test-classes/imgdata/separate-5.tar.gz", 
             "target/test-classes/gpx/multiTRKSEGreverse.eTrex_20J.gpx.xml",
             "target/test-classes/cameradata/separate.gpx",
             "target/test-classes/ini/AdjustTime.M2d.separate.ini",