テストデータをTARGZ形式に変更

diff --git a/pom.xml b/pom.xml
index f6ebd8c..19025a2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -35,17 +35,6 @@
 
   <repositories>
     <repository>
-      <id>surveyor.mirror</id>
-      <name>Hayashi Repository</name>
-      <url>http://surveyor.mydns.jp/archiva/repository/mirror/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-    <repository>
       <id>surveyor.haya4</id>
       <name>Hayashi Repository</name>
       <url>http://surveyor.mydns.jp/archiva/repository/haya4/</url>
@@ -67,7 +56,6 @@
         <enabled>true</enabled>
       </snapshots>
     </repository>
-
   </repositories>
 
   <pluginRepositories>
@@ -211,8 +199,8 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/Sony20170518/4/Sony20170518-4.zip</url>
-              <unpack>true</unpack>
+              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/Sony20170518/4/Sony20170518-5.tar.gz</url>
+              <unpack>false</unpack>
               <outputDirectory>${project.build.directory}/test-classes/imgdata</outputDirectory>
             </configuration>
           </execution>
@@ -223,8 +211,8 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/WiMiUS20170518/2/WiMiUS20170518-2.zip</url>
-              <unpack>true</unpack>
+              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/WiMiUS20170518/2/WiMiUS20170518-5.tar.gz</url>
+              <unpack>false</unpack>
               <outputDirectory>${project.build.directory}/test-classes/imgdata</outputDirectory>
             </configuration>
           </execution>
@@ -235,8 +223,8 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/separate/1/separate-1.zip</url>
-              <unpack>true</unpack>
+              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/separate/1/separate-5.tar.gz</url>
+              <unpack>false</unpack>
               <outputDirectory>${project.build.directory}/test-classes/imgdata</outputDirectory>
             </configuration>
           </execution>

diff --git a/src/test/java/osm/jp/gpx/AppParametersTest.java b/src/test/java/osm/jp/gpx/AppParametersTest.java
index c624988..afb7dc0 100644 (file)
--- a/src/test/java/osm/jp/gpx/AppParametersTest.java
+++ b/src/test/java/osm/jp/gpx/AppParametersTest.java
@@ -6,7 +6,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.nio.channels.FileChannel;
 
 import org.junit.After;

diff --git a/src/test/java/osm/jp/gpx/Fixture.java b/src/test/java/osm/jp/gpx/Fixture.java
index 1809d84..ce8b038 100644 (file)
--- a/src/test/java/osm/jp/gpx/Fixture.java
+++ b/src/test/java/osm/jp/gpx/Fixture.java
@@ -45,7 +45,7 @@ public class Fixture {
     public static Fixture[] stddatas = {
                new Fixture(
                    "[std0].Canonカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時",
-                   "target/test-classes/imgdata/Canon20200426.tar.gz", 
+                   "target/test-classes/imgdata/Canon20200426-1.zip", 
                    "target/test-classes/cameradata/",
                    "target/test-classes/cameradata/",
                    "target/test-classes/cameradata/AdjustTime.ini",
@@ -66,7 +66,7 @@ public class Fixture {
                ),
                new Fixture(
                            "[std1].Canonカメラの場合.FILE_UPDATE時間を基準,MAGVARをONの時",
-                           "target/test-classes/imgdata/Canon20200426.tar.gz", 
+                           "target/test-classes/imgdata/Canon20200426-1.zip", 
                            "target/test-classes/cameradata/",
                            "target/test-classes/cameradata/",
                            "target/test-classes/cameradata/AdjustTime.magvar.ini",
@@ -96,7 +96,7 @@ public class Fixture {
         // 1
         new Fixture(
             "[A1].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時",
-            "target/test-classes/imgdata/Sony20170518.tar.gz", 
+            "target/test-classes/imgdata/Sony20170518-4.zip", 
             "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.tar.gz", 
+            "target/test-classes/imgdata/Sony20170518-4.zip", 
             "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.tar.gz", 
+            "target/test-classes/imgdata/WiMiUS20170518-2.zip", 
             "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.tar.gz", 
+            "target/test-classes/imgdata/WiMiUS20170518-2.zip", 
             "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.tar.gz",
+            "target/test-classes/imgdata/separate-2.zip",
             "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.tar.gz", 
+            "target/test-classes/imgdata/separate-2.zip",
             "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.tar.gz", 
+            "target/test-classes/imgdata/separate-2.zip",
             "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.tar.gz", 
+            "target/test-classes/imgdata/separate-2.zip", 
             "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.tar.gz", 
+            "target/test-classes/imgdata/separate-2.zip", 
             "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.tar.gz", 
+            "target/test-classes/imgdata/separate-2.zip", 
             "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.tar.gz", 
+            "target/test-classes/imgdata/separate-2.zip", 
             "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.tar.gz", 
+            "target/test-classes/imgdata/separate-2.zip", 
             "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.tar.gz", 
+            "target/test-classes/imgdata/separate-2.zip", 
             "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.tar.gz", 
+            "target/test-classes/imgdata/separate-2.zip", 
             "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.tar.gz", 
+            "target/test-classes/imgdata/separate-2.zip", 
             "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.tar.gz", 
+            "target/test-classes/imgdata/separate-2.zip", 
             "target/test-classes/gpx/multiTRKSEGreverse.eTrex_20J.gpx.xml",
             "target/test-classes/cameradata/separate.gpx",
             "target/test-classes/ini/AdjustTime.M2d.separate.ini",

diff --git a/src/test/java/osm/jp/gpx/ImportPictureUnitTest.java b/src/test/java/osm/jp/gpx/ImportPictureUnitTest.java
index 7f5cfea..1690ce2 100644 (file)
--- a/src/test/java/osm/jp/gpx/ImportPictureUnitTest.java
+++ b/src/test/java/osm/jp/gpx/ImportPictureUnitTest.java
@@ -13,7 +13,7 @@ import org.junit.experimental.runners.*;
 @RunWith(Enclosed.class)
 public class ImportPictureUnitTest {
 
-    public static class 出力ディレクトリが存在しないとき {
+    public static class NoExist_outputDir {
        
        @Before
         public void setUp() throws Exception {
@@ -37,7 +37,7 @@ public class ImportPictureUnitTest {
 
 
         @Test
-        public void 実行() throws Exception {
+        public void test() throws Exception {
                Fixture dataset = Fixture.datas[0];
             try {
                 ImportPictureUnitTest.testdo(dataset.iniFilePath);
@@ -55,7 +55,7 @@ public class ImportPictureUnitTest {
         }
 
         @Test
-        public void MAGVARをON() throws Exception {
+        public void testMAGVAR_ON() throws Exception {
                Fixture dataset = Fixture.datas[1];
             try {
                 ImportPictureUnitTest.testdo(dataset.iniFilePath);
@@ -77,7 +77,10 @@ public class ImportPictureUnitTest {
         }
     }
 
-    public static class 出力ディレクトリがFILEのとき {
+    /**
+     * 出力ディレクトリがFILEの時
+     */
+    public static class OutputDirIsFile {
        
        @Before
         public void setUp() throws Exception {
@@ -103,7 +106,7 @@ public class ImportPictureUnitTest {
 
 
         @Test
-        public void 実行() throws Exception {
+        public void test() throws Exception {
                Fixture dataset = Fixture.datas[0];
                try {
                 ImportPictureUnitTest.testdo(dataset.iniFilePath);