From 7a4083918a5a23cd7d735bbc166979069da08030 Mon Sep 17 00:00:00 2001
From: yuuhayashi <hayashi.yuu@gmail.com>
Date: Tue, 8 Feb 2022 06:59:22 +0900
Subject: [PATCH] =?utf8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=83=A1=E3=82=BD?=
 =?utf8?q?=E3=83=83=E3=83=89=E3=81=AE=E5=90=8D=E7=A7=B0=E3=82=92=E6=97=A5?=
 =?utf8?q?=E6=9C=AC=E8=AA=9E=E3=81=8B=E3=82=89=E3=82=A2=E3=83=AB=E3=83=95?=
 =?utf8?q?=E3=82=A1=E3=83=99=E3=83=83=E3=83=88=E3=81=AB=E5=A4=89=E6=9B=B4?=
 =?utf8?q?=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                            | 16 ++++++----------
 src/test/java/osm/jp/gpx/ElementMapTRKSEGTest.java | 13 ++++++++++---
 src/test/java/osm/jp/gpx/Fixture.java              |  2 --
 src/test/java/osm/jp/gpx/ImportPictureTest.java    |  7 ++++++-
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 63481af..f6ebd8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,8 +211,8 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>http://surveyor.mydns.jp/data/Sony20170518.tar.gz</url>
-              <unpack>false</unpack>
+              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/Sony20170518/4/Sony20170518-4.zip</url>
+              <unpack>true</unpack>
               <outputDirectory>${project.build.directory}/test-classes/imgdata</outputDirectory>
             </configuration>
           </execution>
@@ -223,8 +223,8 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>http://surveyor.mydns.jp/data/WiMiUS20170518.tar.gz</url>
-              <unpack>false</unpack>
+              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/WiMiUS20170518/2/WiMiUS20170518-2.zip</url>
+              <unpack>true</unpack>
               <outputDirectory>${project.build.directory}/test-classes/imgdata</outputDirectory>
             </configuration>
           </execution>
@@ -235,8 +235,8 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>http://surveyor.mydns.jp/data/separate.tar.gz</url>
-              <unpack>false</unpack>
+              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/separate/1/separate-1.zip</url>
+              <unpack>true</unpack>
               <outputDirectory>${project.build.directory}/test-classes/imgdata</outputDirectory>
             </configuration>
           </execution>
@@ -254,10 +254,6 @@
           <tagNameFormat>v@{project.version}</tagNameFormat>
         </configuration>
       </plugin>
-    
     </plugins>
-    
-    
   </build>
-  
 </project>
diff --git a/src/test/java/osm/jp/gpx/ElementMapTRKSEGTest.java b/src/test/java/osm/jp/gpx/ElementMapTRKSEGTest.java
index eadc092..280bed9 100644
--- a/src/test/java/osm/jp/gpx/ElementMapTRKSEGTest.java
+++ b/src/test/java/osm/jp/gpx/ElementMapTRKSEGTest.java
@@ -21,7 +21,7 @@ import static org.hamcrest.CoreMatchers.*;
 public class ElementMapTRKSEGTest {
 
     @RunWith(Theories.class)
-    public static class 各種GPXファイルを食わせる {
+    public static class testGpxFiles {
         static class Fixture {
             String gpxSourcePath;		// GPXファイル（オリジナル）
             int segCount;				// GPXファイルに含まれるTRKSEGノードの数
@@ -59,8 +59,12 @@ public class ElementMapTRKSEGTest {
         	osm.jp.gpx.AppParametersTest.delTestData("AdjustTime.ini");
         }
 
+        /**
+         * TRKSEGを読み込む
+         * @param dataset
+         */
         @Theory
-        public void TRKSEGを読み込む(Fixture dataset) {
+        public void readTRKSEG(Fixture dataset) {
             try {
                 System.out.println("GPX file: "+ dataset.gpxSourcePath);
                 GpxFile gpx = new GpxFile(new AppParameters(), new File(dataset.gpxSourcePath));
@@ -77,8 +81,11 @@ public class ElementMapTRKSEGTest {
 			}
         }
         
+        /**
+         * test整形されていないGPX
+         */
         @Test
-        public void test整形されていないGPX() {
+        public void testUnreformatGPX() {
         	String gpxSourcePath = "target/test-classes/gpx/2020-02-29 13.35.58 Day.gpx";
             try {
                 System.out.println("GPX file: "+ gpxSourcePath);
diff --git a/src/test/java/osm/jp/gpx/Fixture.java b/src/test/java/osm/jp/gpx/Fixture.java
index f9215e0..1809d84 100644
--- a/src/test/java/osm/jp/gpx/Fixture.java
+++ b/src/test/java/osm/jp/gpx/Fixture.java
@@ -2,8 +2,6 @@ package osm.jp.gpx;
 
 import org.junit.experimental.theories.DataPoints;
 
-import osm.jp.gpx.Expecter;
-
 public class Fixture {
     String comment;				// テスト概要（コメント）
     String tarFilePath;			// TARデータ
diff --git a/src/test/java/osm/jp/gpx/ImportPictureTest.java b/src/test/java/osm/jp/gpx/ImportPictureTest.java
index ebcf388..8de71c3 100644
--- a/src/test/java/osm/jp/gpx/ImportPictureTest.java
+++ b/src/test/java/osm/jp/gpx/ImportPictureTest.java
@@ -18,8 +18,13 @@ public class ImportPictureTest {
     @DataPoints
     public static Fixture[] datas = Fixture.datas;
 
+    /**
+     * パラメータテスト
+     * @param dataset
+     * @throws Exception
+     */
     @Theory
-    public void パラメータテスト(Fixture dataset) throws Exception {
+    public void testParameter(Fixture dataset) throws Exception {
         setup(dataset);
         testdo(dataset.iniFilePath);
         Expecter.check(dataset);
-- 
2.11.0