MAVEN構成

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

diff --git a/test/osm/jp/gpx/ImportPictureTest.java b/src/test/java/osm/jp/gpx/ImportPictureTest.java
similarity index 91%
rename from test/osm/jp/gpx/ImportPictureTest.java
rename to src/test/java/osm/jp/gpx/ImportPictureTest.java
index d20a355..233c154 100644 (file)
--- a/test/osm/jp/gpx/ImportPictureTest.java
+++ b/src/test/java/osm/jp/gpx/ImportPictureTest.java
@@ -88,10 +88,10 @@ public class ImportPictureTest {
             // 1
             new Fixture(
                 "[A1].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時",
-                "testdata/Sony20170518.tar.gz", 
-                "testdata/20170518.gpx",
-                "testdata/cameradata/20170518.gpx",
-                "testdata/AdjustTime.20170518.A1.ini",
+                "src/test/data/Sony20170518.tar.gz", 
+                "src/test/data/20170518.gpx",
+                "src/test/data/cameradata/20170518.gpx",
+                "src/test/data/AdjustTime.20170518.A1.ini",
                 new Expecter[] {
                     new Expecter("10170518/20170518_.gpx", true, null, 90.0D, 180.0D, false),
                     new Expecter("10170518/DSC05183.JPG", false, null, 90.0D, 180.0D, false),
@@ -104,10 +104,10 @@ public class ImportPictureTest {
             // 2
             new Fixture(
                 "[A2].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時",
-                "testdata/Sony20170518.tar.gz", 
-                "testdata/20170518.gpx",
-                "testdata/cameradata/20170518.gpx",
-                "testdata/AdjustTime.20170518.A2.ini",
+                "src/test/data/Sony20170518.tar.gz", 
+                "src/test/data/20170518.gpx",
+                "src/test/data/cameradata/20170518.gpx",
+                "src/test/data/AdjustTime.20170518.A2.ini",
                 new Expecter[] {
                     new Expecter("10170518/20170518_.gpx", true, null, 90.0D, 180.0D, false),
                     new Expecter("10170518/DSC05183.JPG", true, "2017:05:18 09:16:48", 90.0D, 180.0D, true),
@@ -120,10 +120,10 @@ public class ImportPictureTest {
             // 3.
             new Fixture(
                 "[B1].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時",
-                "testdata/WiMiUS20170518.tar.gz", 
-                "testdata/20170518.gpx",
-                "testdata/cameradata/20170518.gpx",
-                "testdata/AdjustTime.20170518.B1.ini",
+                "src/test/data/WiMiUS20170518.tar.gz", 
+                "src/test/data/20170518.gpx",
+                "src/test/data/cameradata/20170518.gpx",
+                "src/test/data/AdjustTime.20170518.B1.ini",
                 new Expecter[] {
                     new Expecter("cameradata/20170518_.gpx", true, null, 90.0D, 180.0D, false),
                     new Expecter("cameradata/20170518_092031A.jpg", false, null, 90.0D, 180.0D, false),
@@ -135,10 +135,10 @@ public class ImportPictureTest {
             // 4.
             new Fixture(
                 "[B2].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時",
-                "testdata/WiMiUS20170518.tar.gz", 
-                "testdata/20170518.gpx",
-                "testdata/cameradata/20170518.gpx",
-                "testdata/AdjustTime.20170518.B2.ini",
+                "src/test/data/WiMiUS20170518.tar.gz", 
+                "src/test/data/20170518.gpx",
+                "src/test/data/cameradata/20170518.gpx",
+                "src/test/data/AdjustTime.20170518.B2.ini",
                 new Expecter[] {
                     new Expecter("cameradata/20170518_.gpx", true, null, 90.0D, 180.0D, false),
                     new Expecter("cameradata/20170518_092031A.jpg", true, "2017:05:18 09:20:30", 90.0D, 180.0D, true),
@@ -150,10 +150,10 @@ public class ImportPictureTest {
             // 5.
             new Fixture(
                 "[M1a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado",
-                "testdata/separate.tar.gz",
-                "testdata/muiltiTRK.GarminColorado.gpx.xml",
-                "testdata/cameradata/separate.gpx",
-                "testdata/AdjustTime.M1a.separate.ini",
+                "src/test/data/separate.tar.gz",
+                "src/test/data/muiltiTRK.GarminColorado.gpx.xml",
+                "src/test/data/cameradata/separate.gpx",
+                "src/test/data/AdjustTime.M1a.separate.ini",
                 new Expecter[] {
                     // GPX file
                     new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
@@ -187,10 +187,10 @@ public class ImportPictureTest {
 
             new Fixture(
                 "[M1b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado",
-                "testdata/separate.tar.gz", 
-                "testdata/muiltiTRK.GarminColorado.gpx.xml",
-                "testdata/cameradata/separate.gpx",
-                "testdata/AdjustTime.M1b.separate.ini",
+                "src/test/data/separate.tar.gz", 
+                "src/test/data/muiltiTRK.GarminColorado.gpx.xml",
+                "src/test/data/cameradata/separate.gpx",
+                "src/test/data/AdjustTime.M1b.separate.ini",
                 new Expecter[] {
                     // GPX file
                     new Expecter("separate/separate_.gpx", true, null, 90.D, 180.0D, false),
@@ -224,10 +224,10 @@ public class ImportPictureTest {
 
             new Fixture(
                 "[M1c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado",
-                "testdata/separate.tar.gz", 
-                "testdata/muiltiTRK.GarminColorado.gpx.xml",
-                "testdata/cameradata/separate.gpx",
-                "testdata/AdjustTime.M1c.separate.ini",
+                "src/test/data/separate.tar.gz", 
+                "src/test/data/muiltiTRK.GarminColorado.gpx.xml",
+                "src/test/data/cameradata/separate.gpx",
+                "src/test/data/AdjustTime.M1c.separate.ini",
                 new Expecter[] {
                     // GPX file
                     new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
@@ -261,10 +261,10 @@ public class ImportPictureTest {
 
             new Fixture(
                 "[M1d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado",
-                "testdata/separate.tar.gz", 
-                "testdata/muiltiTRK.GarminColorado.gpx.xml",
-                "testdata/cameradata/separate.gpx",
-                "testdata/AdjustTime.M1d.separate.ini",
+                "src/test/data/separate.tar.gz", 
+                "src/test/data/muiltiTRK.GarminColorado.gpx.xml",
+                "src/test/data/cameradata/separate.gpx",
+                "src/test/data/AdjustTime.M1d.separate.ini",
                 new Expecter[] {
                     // GPX file
                     new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
@@ -299,10 +299,10 @@ public class ImportPictureTest {
 
             new Fixture(
                 "[M2a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J",
-                "testdata/separate.tar.gz", 
-                "testdata/multiTRKSEG.eTrex_20J.gpx.xml",
-                "testdata/cameradata/separate.gpx",
-                "testdata/AdjustTime.M2a.separate.ini",
+                "src/test/data/separate.tar.gz", 
+                "src/test/data/multiTRKSEG.eTrex_20J.gpx.xml",
+                "src/test/data/cameradata/separate.gpx",
+                "src/test/data/AdjustTime.M2a.separate.ini",
                 new Expecter[] {
                     // GPX file
                     new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
@@ -336,10 +336,10 @@ public class ImportPictureTest {
 
             new Fixture(
                 "[M2b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J",
-                "testdata/separate.tar.gz", 
-                "testdata/multiTRKSEG.eTrex_20J.gpx.xml",
-                "testdata/cameradata/separate.gpx",
-                "testdata/AdjustTime.M2b.separate.ini",
+                "src/test/data/separate.tar.gz", 
+                "src/test/data/multiTRKSEG.eTrex_20J.gpx.xml",
+                "src/test/data/cameradata/separate.gpx",
+                "src/test/data/AdjustTime.M2b.separate.ini",
                 new Expecter[] {
                     // GPX file
                     new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
@@ -373,10 +373,10 @@ public class ImportPictureTest {
 
             new Fixture(
                 "[M2c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J",
-                "testdata/separate.tar.gz", 
-                "testdata/multiTRKSEG.eTrex_20J.gpx.xml",
-                "testdata/cameradata/separate.gpx",
-                "testdata/AdjustTime.M2c.separate.ini",
+                "src/test/data/separate.tar.gz", 
+                "src/test/data/multiTRKSEG.eTrex_20J.gpx.xml",
+                "src/test/data/cameradata/separate.gpx",
+                "src/test/data/AdjustTime.M2c.separate.ini",
                 new Expecter[] {
                     // GPX file
                     new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
@@ -410,10 +410,10 @@ public class ImportPictureTest {
 
             new Fixture(
                 "[M2d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J",
-                "testdata/separate.tar.gz", 
-                "testdata/multiTRKSEG.eTrex_20J.gpx.xml",
-                "testdata/cameradata/separate.gpx",
-                "testdata/AdjustTime.M2d.separate.ini",
+                "src/test/data/separate.tar.gz", 
+                "src/test/data/multiTRKSEG.eTrex_20J.gpx.xml",
+                "src/test/data/cameradata/separate.gpx",
+                "src/test/data/AdjustTime.M2d.separate.ini",
                 new Expecter[] {
                     // GPX file
                     new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
@@ -447,10 +447,10 @@ public class ImportPictureTest {
 
             new Fixture(
                 "[M3a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse",
-                "testdata/separate.tar.gz", 
-                "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
-                "testdata/cameradata/separate.gpx",
-                "testdata/AdjustTime.M2a.separate.ini",
+                "src/test/data/separate.tar.gz", 
+                "src/test/data/multiTRKSEGreverse.eTrex_20J.gpx.xml",
+                "src/test/data/cameradata/separate.gpx",
+                "src/test/data/AdjustTime.M2a.separate.ini",
                 new Expecter[] {
                     // GPX file
                     new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
@@ -484,10 +484,10 @@ public class ImportPictureTest {
 
             new Fixture(
                 "[M3b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse",
-                "testdata/separate.tar.gz", 
-                "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
-                "testdata/cameradata/separate.gpx",
-                "testdata/AdjustTime.M2b.separate.ini",
+                "src/test/data/separate.tar.gz", 
+                "src/test/data/multiTRKSEGreverse.eTrex_20J.gpx.xml",
+                "src/test/data/cameradata/separate.gpx",
+                "src/test/data/AdjustTime.M2b.separate.ini",
                 new Expecter[] {
                     // GPX file
                     new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
@@ -521,10 +521,10 @@ public class ImportPictureTest {
 
             new Fixture(
                 "[M3c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse",
-                "testdata/separate.tar.gz", 
-                "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
-                "testdata/cameradata/separate.gpx",
-                "testdata/AdjustTime.M2c.separate.ini",
+                "src/test/data/separate.tar.gz", 
+                "src/test/data/multiTRKSEGreverse.eTrex_20J.gpx.xml",
+                "src/test/data/cameradata/separate.gpx",
+                "src/test/data/AdjustTime.M2c.separate.ini",
                 new Expecter[] {
                     // GPX file
                     new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
@@ -558,10 +558,10 @@ public class ImportPictureTest {
 
             new Fixture(
                 "[M3d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse",
-                "testdata/separate.tar.gz", 
-                "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
-                "testdata/cameradata/separate.gpx",
-                "testdata/AdjustTime.M2d.separate.ini",
+                "src/test/data/separate.tar.gz", 
+                "src/test/data/multiTRKSEGreverse.eTrex_20J.gpx.xml",
+                "src/test/data/cameradata/separate.gpx",
+                "src/test/data/AdjustTime.M2d.separate.ini",
                 new Expecter[] {
                     // GPX file
                     new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
@@ -642,18 +642,18 @@ public class ImportPictureTest {
         System.out.println(dataset.toString());
 
         // カメラディレクトリを削除する
-        File dir = new File("testdata/cameradata");
+        File dir = new File("src/test/data/cameradata");
         if (dir.exists()) {
             ImportPictureTest.delete(dir);
         }
-        File outDir = new File("testdata/output");
+        File outDir = new File("src/test/data/output");
         if (outDir.exists()) {
             ImportPictureTest.delete(outDir);
         }
         outDir.mkdir();
 
         // カメラディレクトリを作成する
-        ImportPictureTest.uncompress(new File(dataset.tarFilePath), new File("testdata/cameradata"));
+        ImportPictureTest.uncompress(new File(dataset.tarFilePath), new File("src/test/data/cameradata"));
 
         // GPXファイルをセット
         try (FileInputStream inStream = new FileInputStream(new File(dataset.gpxSourcePath));
@@ -706,13 +706,12 @@ public class ImportPictureTest {
                     destPath.createNewFile();
                     byte[] btoRead = new byte[1024];
                     try (BufferedOutputStream bout = new BufferedOutputStream(new FileOutputStream(destPath))) {
-                        int len = 0;
+                        int len;
                         while ((len = tarIn.read(btoRead)) != -1) {
                             bout.write(btoRead, 0, len);
                         }
                     }
                     destPath.setLastModified(tarEntry.getLastModifiedDate().getTime());
-                    btoRead = null;
                 }
                 tarEntry = tarIn.getNextTarEntry();
             }