diff --git a/pom.xml b/pom.xml
index 63481af..f6ebd8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,8 +211,8 @@
wget
- http://surveyor.mydns.jp/data/Sony20170518.tar.gz
- false
+ http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/Sony20170518/4/Sony20170518-4.zip
+ true
${project.build.directory}/test-classes/imgdata
@@ -223,8 +223,8 @@
wget
- http://surveyor.mydns.jp/data/WiMiUS20170518.tar.gz
- false
+ http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/WiMiUS20170518/2/WiMiUS20170518-2.zip
+ true
${project.build.directory}/test-classes/imgdata
@@ -235,8 +235,8 @@
wget
- http://surveyor.mydns.jp/data/separate.tar.gz
- false
+ http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/separate/1/separate-1.zip
+ true
${project.build.directory}/test-classes/imgdata
@@ -254,10 +254,6 @@
v@{project.version}
-
-
-
-
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 @@
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 @@
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 @@
}
}
+ /**
+ * 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 @@
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 @@
@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);