sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1776002 [2/2] - in /sis/branches/JDK8/storage: sis-storage/src/main/java/org/apache/sis/internal/storage/ sis-storage/src/main/java/org/apache/sis/storage/ sis-xmlstore/src/main/java/org/apache/sis/internal/gpx/ sis-xmlstore/src/main/java/...
Date Sun, 25 Dec 2016 10:54:41 GMT
Modified: sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXReaderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXReaderTest.java?rev=1776002&r1=1776001&r2=1776002&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXReaderTest.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXReaderTest.java [UTF-8] Sun Dec 25 10:54:40 2016
@@ -16,51 +16,50 @@
  */
 package org.apache.sis.internal.gpx;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.time.Instant;
 import com.esri.core.geometry.Point;
 import org.opengis.geometry.Envelope;
-import org.apache.sis.storage.StorageConnector;
 import org.apache.sis.storage.gps.Fix;
+import org.apache.sis.storage.StorageConnector;
+import org.apache.sis.storage.DataStoreException;
+import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.TestCase;
-import org.junit.After;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
 import static org.apache.sis.test.TestUtilities.date;
 
 // Branch-dependent imports
-import java.util.Spliterators;
-import org.apache.sis.storage.DataStoreException;
 import org.opengis.feature.Feature;
 
 
 /**
- * Tests the {@link GPXReader} class.
+ * Tests (indirectly) the {@link GPXReader} class.
+ * This class creates a {@link GPXStore} instance and uses it in read-only mode.
  *
  * @author  Johann Sorel (Geomatys)
+ * @author  Martin Desruisseaux (Geomatys)
  * @since   0.8
  * @version 0.8
  * @module
  */
 public final strictfp class GPXReaderTest extends TestCase {
-    private GPXStore store;
-
-    private GPXReader create(final String resource) throws Exception {
-        StorageConnector storage = new StorageConnector(GPXReaderTest.class.getResource(resource));
-        return new GPXReader(store = new GPXStore(storage));
-    }
-
-    @After
-    public void closeReader() throws DataStoreException {
-        if (store != null) {
-            store.close();
-        }
+    /**
+     * Creates a new GPX data store which will read the given test file.
+     *
+     * @param  resource  name of the test file in a directory relative to {@code "org/apache/sis/internal/gpx"}.
+     */
+    private static GPXStore create(final String resource) throws DataStoreException {
+        return new GPXStore(new StorageConnector(GPXReaderTest.class.getResourceAsStream(resource)));
     }
 
+    /**
+     * Verifies that the given {@code actual} bounding box has the expected values.
+     * A strict equality is requested.
+     */
     private static void assertBoundsEquals(final double westBoundLongitude,
                                            final double eastBoundLongitude,
                                            final double southBoundLatitude,
@@ -74,519 +73,401 @@ public final strictfp class GPXReaderTes
     }
 
     /**
-     * Tests GPX version 1.0.0 metadata tag parsing.
-     *
-     * @throws Exception if reader failed to be created or failed at reading.
+     * Verifies that the given {@code actual} envelope has the expected values.
+     * A strict equality is requested.
      */
-    @Test
-    public void testMetadataRead100() throws Exception {
-        try (final GPXReader reader = create("1.0/metadata.xml")) {
-            reader.initialize(true);
-            final Metadata data = reader.getMetadata();
-
-            assertEquals("Sample", data.name);
-            assertEquals("GPX test file", data.description);
-            assertEquals(date("2010-03-01 00:00:00"), data.time);
-            assertArrayEquals(new String[] {"sample", "metadata"}, data.keywords.toArray());
-            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
-
-            assertEquals("Jean-Pierre", data.author.name);
-            assertEquals("jean.pierre@test.com", data.author.email);
-            assertNull(data.author.link);
+    private static void assertEnvelopeEquals(final double xmin, final double xmax,
+                                             final double ymin, final double ymax,
+                                             final Envelope actual)
+    {
+        assertEquals("dimension", 2, actual.getDimension());
+        assertEquals("xmin", actual.getMinimum(0), xmin, STRICT);
+        assertEquals("xmax", actual.getMaximum(0), xmax, STRICT);
+        assertEquals("ymin", actual.getMinimum(1), ymin, STRICT);
+        assertEquals("ymax", actual.getMaximum(1), ymax, STRICT);
+    }
 
-            assertNull(data.copyright);
+    /**
+     * Asserts that the string value of {@code actual} is equals to the expected value.
+     *
+     * @param  expected  the expected value (can be {@code null}).
+     * @param  actual    the actual value (can be {@code null}).
+     */
+    private static void assertStringEquals(final String expected, final Object actual) {
+        assertEquals(expected, (actual != null) ? actual.toString() : null);
+    }
 
-            assertEquals(1, data.links.size());
-            assertEquals("http://first-adress.org", data.links.get(0).toString());
+    /**
+     * Tests parsing of GPX version 1.0.0 metadata.
+     *
+     * @throws DataStoreException if reader failed to be created or failed at reading.
+     */
+    @Test
+    public void testMetadata100() throws DataStoreException {
+        try (final GPXStore reader = create("1.0/metadata.xml")) {
+            final Metadata md = (Metadata) reader.getMetadata();
+            verifyMetadata(md, 1);
+            assertNull(md.author.link);
+            assertNull(md.copyright);
+            assertEquals("version", GPXStore.V1_0, reader.getVersion());
         }
     }
 
     /**
-     * Tests GPX version 1.1.0 metadata tag parsing.
+     * Tests parsing of GPX version 1.1.0 metadata.
      *
-     * @throws Exception if reader failed to be created or failed at reading.
+     * @throws DataStoreException if reader failed to be created or failed at reading.
      */
     @Test
-    public void testMetadataRead110() throws Exception {
-        try (final GPXReader reader = create("1.1/metadata.xml")) {
-            reader.initialize(true);
-            final Metadata data = reader.getMetadata();
-
-            assertEquals("Sample", data.name);
-            assertEquals("GPX test file", data.description);
-            assertEquals(date("2010-03-01 00:00:00"), data.time);
-            assertArrayEquals(new String[] {"sample", "metadata"}, data.keywords.toArray());
-            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
-
-            assertEquals("Jean-Pierre", data.author.name);
-            assertEquals("jean.pierre@test.com", data.author.email);
-            assertEquals("http://someone-site.org", data.author.link.toString());
-
-            assertEquals("Apache", data.copyright.author);
-            assertEquals(2004, data.copyright.year.intValue());
-            assertEquals("http://www.apache.org/licenses/LICENSE-2.0",
-                         data.copyright.license.toString());
+    public void testMetadata110() throws DataStoreException {
+        try (final GPXStore reader = create("1.1/metadata.xml")) {
+            final Metadata md = (Metadata) reader.getMetadata();
+            verifyMetadata(md, 3);
+            assertStringEquals("http://someone-site.org", md.author.link);
+            assertEquals("Apache", md.copyright.author);
+            assertEquals(2004, md.copyright.year.intValue());
+            assertStringEquals("http://www.apache.org/licenses/LICENSE-2.0", md.copyright.license);
+            assertEquals("version", GPXStore.V1_1, reader.getVersion());
+        }
+    }
 
-            assertEquals(3, data.links.size());
-            assertEquals("http://first-adress.org", data.links.get(0).toString());
-            assertEquals("http://second-adress.org", data.links.get(1).toString());
-            assertEquals("http://third-adress.org", data.links.get(2).toString());
+    /**
+     * Verifies that the given metadata have the expected values.
+     * This method verifies only the values that are common to both GPX 1.0 and GPX 1.1 test files.
+     */
+    @SuppressWarnings("fallthrough")
+    private static void verifyMetadata(final Metadata md, final int numLinks) {
+        assertEquals      ("name",         "Sample",                            md.name);
+        assertEquals      ("description",  "GPX test file",                     md.description);
+        assertEquals      ("time",         date("2010-03-01 00:00:00"),         md.time);
+        assertArrayEquals ("keywords",     new String[] {"sample", "metadata"}, md.keywords.toArray());
+        assertBoundsEquals(                -20, 30, 10, 40,                     md.bounds);
+        assertEquals      ("author.name",  "Jean-Pierre",                       md.author.name);
+        assertEquals      ("author.email", "jean.pierre@test.com",              md.author.email);
+        assertEquals      ("links.size()", numLinks,                            md.links.size());
+        switch (numLinks) {
+            default: // Fallthrough everywhere.
+            case 3:  assertStringEquals("http://third-address.org",  md.links.get(2));
+            case 2:  assertStringEquals("http://second-address.org", md.links.get(1));
+            case 1:  assertStringEquals("http://first-address.org",  md.links.get(0));
+            case 0:  break;
         }
     }
 
     /**
-     * Tests GPX version 1.0.0 way point tag parsing.
+     * Verifies that the given metadata contains only bounds information.
+     */
+    private static void verifyAlmostEmptyMetadata(final Metadata md) {
+        assertNull("name",                  md.name);
+        assertNull("description",           md.description);
+        assertNull("time",                  md.time);
+        assertNull("keywords",              md.keywords);
+        assertBoundsEquals(-20, 30, 10, 40, md.bounds);
+        assertNull("author",                md.author);
+        assertNull("copyright",             md.copyright);
+        assertTrue("links.isEmpty()",       md.links.isEmpty());
+    }
+
+    /**
+     * Tests parsing of GPX version 1.0.0 way point.
      *
-     * @throws Exception if reader failed to be created or failed at reading.
+     * @throws DataStoreException if reader failed to be created or failed at reading.
      */
     @Test
-    public void testWayPointRead100() throws Exception {
-        try (final GPXReader reader = create("1.0/waypoint.xml")) {
-            reader.initialize(true);
-            final Metadata data = reader.getMetadata();
-
-            assertNull(data.name);
-            assertNull(data.description);
-            assertNull(data.time);
-            assertNull(data.keywords);
-            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
-            assertNull(data.author);
-            assertNull(data.copyright);
-            assertEquals(0, data.links.size());
-
-            final Iterator<Feature> it = Spliterators.iterator(reader);
-            Feature f = it.next();
-            checkPoint(f, 0, false);
-            f = it.next();
-            checkPoint(f, 1, false);
-            f = it.next();
-            checkPoint(f, 2, false);
+    @DependsOnMethod("testMetadata100")
+    public void testWayPoint100() throws DataStoreException {
+        try (final GPXStore reader = create("1.0/waypoint.xml")) {
+            verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
+            assertEquals("version", GPXStore.V1_0, reader.getVersion());
+            final Iterator<Feature> it = reader.getFeatures().iterator();
+            verifyPoint(it.next(), 0, false);
+            verifyPoint(it.next(), 1, false);
+            verifyPoint(it.next(), 2, false);
             assertFalse(it.hasNext());
         }
     }
 
     /**
-     * Tests GPX version 1.1.0 way point tag parsing.
+     * Tests parsing of GPX version 1.1.0 way point.
      *
-     * @throws Exception if reader failed to be created or failed at reading.
+     * @throws DataStoreException if reader failed to be created or failed at reading.
      */
     @Test
-    public void testWayPointRead110() throws Exception {
-        try (final GPXReader reader = create("1.1/waypoint.xml")) {
-            assertEquals(GPXStore.V1_1, reader.initialize(true));
-            final Metadata data = reader.getMetadata();
-
-            assertNull(data.name);
-            assertNull(data.description);
-            assertNull(data.time);
-            assertNull(data.keywords);
-            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
-            assertNull(data.author);
-            assertNull(data.copyright);
-            assertEquals(0, data.links.size());
-
-            final Iterator<Feature> it = Spliterators.iterator(reader);
-            Feature f = it.next();
-            checkPoint(f, 0, true);
-            f = it.next();
-            checkPoint(f, 1 , true);
-            f = it.next();
-            checkPoint(f, 2, true);
+    @DependsOnMethod("testMetadata110")
+    public void testWayPoint110() throws DataStoreException {
+        try (final GPXStore reader = create("1.1/waypoint.xml")) {
+            verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
+            assertEquals("version", GPXStore.V1_1, reader.getVersion());
+            final Iterator<Feature> it = reader.getFeatures().iterator();
+            verifyPoint(it.next(), 0, true);
+            verifyPoint(it.next(), 1, true);
+            verifyPoint(it.next(), 2, true);
             assertFalse(it.hasNext());
         }
     }
 
     /**
-     * Tests GPX version v1.0.0 route tag parsing.
+     * Tests parsing of GPX version 1.0.0 route.
      *
-     * @throws Exception if reader failed to be created or failed at reading.
+     * @throws DataStoreException if reader failed to be created or failed at reading.
      */
     @Test
-    public void testRouteRead100() throws Exception {
-        try (final GPXReader reader = create("1.0/route.xml")) {
-            assertEquals(GPXStore.V1_0, reader.initialize(true));
-            final Metadata data = reader.getMetadata();
-
-            assertNull(data.name);
-            assertNull(data.description);
-            assertNull(data.time);
-            assertNull(data.keywords);
-            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
-            assertNull(data.author);
-            assertNull(data.copyright);
-            assertEquals(0, data.links.size());
-
-            final Iterator<Feature> it = Spliterators.iterator(reader);
-            Feature f = it.next();
-            assertEquals("Route name",          f.getPropertyValue("name"));
-            assertEquals("Route comment",       f.getPropertyValue("cmt"));
-            assertEquals("Route description",   f.getPropertyValue("desc"));
-            assertEquals("Route source",        f.getPropertyValue("src"));
-            assertNull  ("Route type",          f.getPropertyValue("type"));
-            assertEquals(7,                     f.getPropertyValue("number"));
-
-            List<Link> links = new ArrayList<>((Collection<Link>) f.getPropertyValue("link"));
-            assertEquals(1,links.size());
-            assertEquals("http://route-adress1.org", links.get(0).toString());
-
-            List<Feature> points = new ArrayList<>((Collection<Feature>) f.getPropertyValue("rtept"));
-            assertEquals(3, points.size());
-            checkPoint(points.get(0), 0, false);
-            checkPoint(points.get(1), 1, false);
-            checkPoint(points.get(2), 2, false);
-
-            Envelope bbox = (Envelope) f.getPropertyValue("@envelope");
-            assertEquals(bbox.getMinimum(0), 15.0d, STRICT);
-            assertEquals(bbox.getMaximum(0), 35.0d, STRICT);
-            assertEquals(bbox.getMinimum(1), 10.0d, STRICT);
-            assertEquals(bbox.getMaximum(1), 30.0d, STRICT);
-
-            f = it.next();
-            assertEquals(null,                  f.getPropertyValue("name"));
-            assertEquals(null,                  f.getPropertyValue("cmt"));
-            assertEquals(null,                  f.getPropertyValue("desc"));
-            assertEquals(null,                  f.getPropertyValue("src"));
-            assertEquals(null,                  f.getPropertyValue("type"));
-            assertEquals(null,                  f.getPropertyValue("number"));
-
-            links = new ArrayList<>((Collection<Link>) f.getPropertyValue("link"));
-            assertEquals(0,links.size());
-
-            points = new ArrayList<>((Collection<Feature>) f.getPropertyValue("rtept"));
-            assertEquals(0,points.size());
-
-            bbox = (Envelope) f.getPropertyValue("@envelope");
-            assertNull(bbox);
-
+    @DependsOnMethod("testWayPoint100")
+    public void testRoute100() throws DataStoreException {
+        try (final GPXStore reader = create("1.0/route.xml")) {
+            verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
+            assertEquals("version", GPXStore.V1_0, reader.getVersion());
+            final Iterator<Feature> it = reader.getFeatures().iterator();
+            verifyRoute(it.next(), false, 1);
+            verifyEmpty(it.next(), "rtept");
             assertFalse(it.hasNext());
         }
     }
 
     /**
-     * Tests GPX version 1.1.0 route tag parsing.
+     * Tests parsing of GPX version 1.1.0 route.
      *
-     * @throws Exception if reader failed to be created or failed at reading.
+     * @throws DataStoreException if reader failed to be created or failed at reading.
      */
     @Test
-    public void testRouteRead110() throws Exception {
-        try (final GPXReader reader = create("1.1/route.xml")) {
-            assertEquals(GPXStore.V1_1, reader.initialize(true));
-            final Metadata data = reader.getMetadata();
-
-            assertNull(data.name);
-            assertNull(data.description);
-            assertNull(data.time);
-            assertNull(data.keywords);
-            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
-            assertNull(data.author);
-            assertNull(data.copyright);
-            assertEquals(0, data.links.size());
-
-            final Iterator<Feature> it = Spliterators.iterator(reader);
-            Feature f = it.next();
-            assertEquals("Route name",          f.getPropertyValue("name"));
-            assertEquals("Route comment",       f.getPropertyValue("cmt"));
-            assertEquals("Route description",   f.getPropertyValue("desc"));
-            assertEquals("Route source",        f.getPropertyValue("src"));
-            assertEquals("Route type",          f.getPropertyValue("type"));
-            assertEquals(7,                     f.getPropertyValue("number"));
-
-            List<Link> links = new ArrayList<>((Collection<Link>) f.getPropertyValue("link"));
-            assertEquals(3,links.size());
-            assertEquals("http://route-adress1.org", links.get(0).toString());
-            assertEquals("http://route-adress2.org", links.get(1).toString());
-            assertEquals("http://route-adress3.org", links.get(2).toString());
-
-            List<Feature> points = new ArrayList<>((Collection<Feature>) f.getPropertyValue("rtept"));
-            assertEquals(3,points.size());
-            checkPoint(points.get(0), 0, true);
-            checkPoint(points.get(1), 1, true);
-            checkPoint(points.get(2), 2, true);
-
-            Envelope bbox = (Envelope) f.getPropertyValue("@envelope");
-            assertEquals(bbox.getMinimum(0), 15.0d, STRICT);
-            assertEquals(bbox.getMaximum(0), 35.0d, STRICT);
-            assertEquals(bbox.getMinimum(1), 10.0d, STRICT);
-            assertEquals(bbox.getMaximum(1), 30.0d, STRICT);
-
-            f = it.next();
-            assertEquals(null,                  f.getPropertyValue("name"));
-            assertEquals(null,                  f.getPropertyValue("cmt"));
-            assertEquals(null,                  f.getPropertyValue("desc"));
-            assertEquals(null,                  f.getPropertyValue("src"));
-            assertEquals(null,                  f.getPropertyValue("type"));
-            assertEquals(null,                  f.getPropertyValue("number"));
-
-            links = new ArrayList<>((Collection<Link>) f.getPropertyValue("link"));
-            assertEquals(0,links.size());
-
-            points = new ArrayList<>((Collection<Feature>) f.getPropertyValue("rtept"));
-            assertEquals(0,points.size());
-
-            bbox = (Envelope) f.getPropertyValue("@envelope");
-            assertNull(bbox);
-
+    @DependsOnMethod("testWayPoint110")
+    public void testRoute110() throws DataStoreException {
+        try (final GPXStore reader = create("1.1/route.xml")) {
+            verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
+            assertEquals("version", GPXStore.V1_1, reader.getVersion());
+            final Iterator<Feature> it = reader.getFeatures().iterator();
+            verifyRoute(it.next(), true, 3);
+            verifyEmpty(it.next(), "rtept");
             assertFalse(it.hasNext());
         }
     }
 
     /**
-     * Tests GPX version 1.0.0 track tag parsing.
+     * Verifies property values for the given route.
      *
-     * @throws Exception if reader failed to be created or failed at reading.
+     * @param  f         the route to verify.
+     * @param  v11       {@code true} for GPX 1.1, or {@code false} for GPX 1.0.
+     * @param  numLinks  expected number of links.
      */
-    @Test
-    public void testTrackRead100() throws Exception {
-        try (final GPXReader reader = create("1.0/track.xml")) {
-            assertEquals(GPXStore.V1_0, reader.initialize(true));
-            final Metadata data = reader.getMetadata();
-
-            assertNull(data.name);
-            assertNull(data.description);
-            assertNull(data.time);
-            assertNull(data.keywords);
-            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
-            assertNull(data.author);
-            assertNull(data.copyright);
-            assertEquals(0, data.links.size());
-
-            final Iterator<Feature> it = Spliterators.iterator(reader);
-            Feature f = it.next();
-            assertEquals("Track name",          f.getPropertyValue("name"));
-            assertEquals("Track comment",       f.getPropertyValue("cmt"));
-            assertEquals("Track description",   f.getPropertyValue("desc"));
-            assertEquals("Track source",        f.getPropertyValue("src"));
-            assertNull  ("Track type",          f.getPropertyValue("type"));
-            assertEquals(7,                     f.getPropertyValue("number"));
-
-            List<Link> links = new ArrayList<>((Collection<Link>) f.getPropertyValue("link"));
-            assertEquals(1,links.size());
-            assertEquals("http://track-adress1.org", links.get(0).toString());
-
-            List<Feature> segments = new ArrayList<>((Collection<Feature>) f.getPropertyValue("trkseg"));
-            assertEquals(2,segments.size());
-            Feature seg1 = segments.get(0);
-            Feature seg2 = segments.get(1);
-            List<Feature> points = new ArrayList<>((Collection<Feature>) seg1.getPropertyValue("trkpt"));
-            assertEquals(3, points.size());
-            checkPoint((Feature) points.get(0), 0, false);
-            checkPoint((Feature) points.get(1), 1, false);
-            checkPoint((Feature) points.get(2), 2, false);
-            points = new ArrayList<>((Collection<Feature>) seg2.getPropertyValue("trkpt"));
-            assertEquals(0, points.size());
-
-            Envelope bbox = (Envelope) f.getPropertyValue("@envelope");
-            assertEquals(bbox.getMinimum(0), 15.0d, STRICT);
-            assertEquals(bbox.getMaximum(0), 35.0d, STRICT);
-            assertEquals(bbox.getMinimum(1), 10.0d, STRICT);
-            assertEquals(bbox.getMaximum(1), 30.0d, STRICT);
-
-            f = it.next();
-            assertEquals(null,                  f.getPropertyValue("name"));
-            assertEquals(null,                  f.getPropertyValue("cmt"));
-            assertEquals(null,                  f.getPropertyValue("desc"));
-            assertEquals(null,                  f.getPropertyValue("src"));
-            assertEquals(null,                  f.getPropertyValue("type"));
-            assertEquals(null,                  f.getPropertyValue("number"));
+    @SuppressWarnings("fallthrough")
+    private static void verifyRoute(final Feature f, final boolean v11, final int numLinks) {
+        assertEquals("name",       "Route name",          f.getPropertyValue("name"));
+        assertEquals("cmt",        "Route comment",       f.getPropertyValue("cmt"));
+        assertEquals("desc",       "Route description",   f.getPropertyValue("desc"));
+        assertEquals("src",        "Route source",        f.getPropertyValue("src"));
+        assertEquals("type", v11 ? "Route type" : null,   f.getPropertyValue("type"));
+        assertEquals("number",      7,                    f.getPropertyValue("number"));
+
+        final List<?> links = (List<?>) f.getPropertyValue("link");
+        assertEquals("links.size()", numLinks, links.size());
+        switch (numLinks) {
+            default: // Fallthrough everywhere.
+            case 3:  assertStringEquals("http://route-address3.org", links.get(2));
+            case 2:  assertStringEquals("http://route-address2.org", links.get(1));
+            case 1:  assertStringEquals("http://route-address1.org", links.get(0));
+            case 0:  break;
+        }
 
-            links = new ArrayList<>((Collection<Link>) f.getPropertyValue("link"));
-            assertEquals(0,links.size());
+        final List<?> points = (List<?>) f.getPropertyValue("rtept");
+        assertEquals("points.size()", 3, points.size());
+        verifyPoint((Feature) points.get(0), 0, v11);
+        verifyPoint((Feature) points.get(1), 1, v11);
+        verifyPoint((Feature) points.get(2), 2, v11);
 
-            segments = new ArrayList<>((Collection<Feature>) f.getPropertyValue("trkseg"));
-            assertEquals(0,segments.size());
+        assertEnvelopeEquals(15, 35, 10, 30, (Envelope) f.getPropertyValue("@envelope"));
+    }
 
-            bbox = (Envelope) f.getPropertyValue("@envelope");
-            assertNull(bbox);
+    /**
+     * Verifies that all properties of the given route or track are null or empty.
+     *
+     * @param  f    the route or track to verify.
+     * @param  dep  {@code "rtept"} if verifying a route, or {@code "trkseg"} if verifying a track.
+     */
+    private static void verifyEmpty(final Feature f, final String dep) {
+        assertNull("name",   f.getPropertyValue("name"));
+        assertNull("cmt",    f.getPropertyValue("cmt"));
+        assertNull("desc",   f.getPropertyValue("desc"));
+        assertNull("src",    f.getPropertyValue("src"));
+        assertNull("type",   f.getPropertyValue("type"));
+        assertNull("number", f.getPropertyValue("number"));
+
+        assertTrue( "links.isEmpty()", ((Collection<?>) f.getPropertyValue("link" )).isEmpty());
+        assertTrue("points.isEmpty()", ((Collection<?>) f.getPropertyValue(dep)).isEmpty());
+        assertNull("@envelope",                         f.getPropertyValue("@envelope"));
+    }
 
+    /**
+     * Tests parsing of GPX version 1.0.0 track.
+     *
+     * @throws DataStoreException if reader failed to be created or failed at reading.
+     */
+    @Test
+    @DependsOnMethod("testRoute100")
+    public void testTrack100() throws DataStoreException {
+        try (final GPXStore reader = create("1.0/track.xml")) {
+            verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
+            assertEquals("version", GPXStore.V1_0, reader.getVersion());
+            final Iterator<Feature> it = reader.getFeatures().iterator();
+            verifyTrack(it.next(), false, 1);
+            verifyEmpty(it.next(), "trkseg");
             assertFalse(it.hasNext());
         }
     }
 
     /**
-     * Tests GPX version 1.1.0 track tag parsing.
+     * Tests parsing of GPX version 1.1.0 track.
      *
-     * @throws Exception if reader failed to be created or failed at reading
+     * @throws DataStoreException if reader failed to be created or failed at reading
      */
     @Test
-    public void testTrackRead110() throws Exception {
-        try (final GPXReader reader = create("1.1/track.xml")) {
-            assertEquals(GPXStore.V1_1, reader.initialize(true));
-            final Metadata data = reader.getMetadata();
-
-            assertNull(data.name);
-            assertNull(data.description);
-            assertNull(data.time);
-            assertNull(data.keywords);
-            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
-            assertNull(data.author);
-            assertNull(data.copyright);
-            assertEquals(0, data.links.size());
-
-            final Iterator<Feature> it = Spliterators.iterator(reader);
-            Feature f = it.next();
-            assertEquals("Track name",          f.getPropertyValue("name"));
-            assertEquals("Track comment",       f.getPropertyValue("cmt"));
-            assertEquals("Track description",   f.getPropertyValue("desc"));
-            assertEquals("Track source",        f.getPropertyValue("src"));
-            assertEquals("Track type",          f.getPropertyValue("type"));
-            assertEquals(7,                     f.getPropertyValue("number"));
-
-            List<Link> links = new ArrayList<>((Collection<Link>) f.getPropertyValue("link"));
-            assertEquals(3,links.size());
-            assertEquals("http://track-adress1.org", links.get(0).toString());
-            assertEquals("http://track-adress2.org", links.get(1).toString());
-            assertEquals("http://track-adress3.org", links.get(2).toString());
-
-            List<Feature> segments = new ArrayList<>((Collection<Feature>) f.getPropertyValue("trkseg"));
-            assertEquals(2,segments.size());
-            Feature seg1 = segments.get(0);
-            Feature seg2 = segments.get(1);
-            List<Feature> points = new ArrayList<>((Collection<Feature>) seg1.getPropertyValue("trkpt"));
-            assertEquals(3, points.size());
-            checkPoint(points.get(0), 0,true);
-            checkPoint(points.get(1), 1,true);
-            checkPoint(points.get(2), 2,true);
-            points = new ArrayList<>((Collection<Feature>) seg2.getPropertyValue("trkpt"));
-            assertEquals(0, points.size());
-
-            Envelope bbox = (Envelope) f.getPropertyValue("@envelope");
-            assertEquals(bbox.getMinimum(0), 15.0d, STRICT);
-            assertEquals(bbox.getMaximum(0), 35.0d, STRICT);
-            assertEquals(bbox.getMinimum(1), 10.0d, STRICT);
-            assertEquals(bbox.getMaximum(1), 30.0d, STRICT);
-
-            f = it.next();
-            assertEquals(null,                  f.getPropertyValue("name"));
-            assertEquals(null,                  f.getPropertyValue("cmt"));
-            assertEquals(null,                  f.getPropertyValue("desc"));
-            assertEquals(null,                  f.getPropertyValue("src"));
-            assertEquals(null,                  f.getPropertyValue("type"));
-            assertEquals(null,                  f.getPropertyValue("number"));
-
-            links = new ArrayList<>((Collection<Link>) f.getPropertyValue("link"));
-            assertEquals(0,links.size());
-
-            segments = new ArrayList<>((Collection<Feature>) f.getPropertyValue("trkseg"));
-            assertEquals(0,segments.size());
-
-            bbox = (Envelope) f.getPropertyValue("@envelope");
-            assertNull(bbox);
-
+    @DependsOnMethod("testRoute110")
+    public void testTrack110() throws DataStoreException {
+        try (final GPXStore reader = create("1.1/track.xml")) {
+            verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
+            assertEquals("version", GPXStore.V1_1, reader.getVersion());
+            final Iterator<Feature> it = reader.getFeatures().iterator();
+            verifyTrack(it.next(), true, 3);
+            verifyEmpty(it.next(), "trkseg");
             assertFalse(it.hasNext());
         }
     }
 
-    private void checkPoint(final Feature f, final int num, final boolean v11) throws Exception {
-        if (num == 0) {
-            assertEquals(1,                     f.getPropertyValue("@identifier"));
-            assertEquals(15.0,                  ((Point)f.getPropertyValue("@geometry")).getX(), STRICT);
-            assertEquals(10.0,                  ((Point)f.getPropertyValue("@geometry")).getY(), STRICT);
-            assertEquals(140.0,                 f.getPropertyValue("ele"));
-            assertEquals(Instant.parse("2010-01-10T00:00:00Z"), f.getPropertyValue("time"));
-            assertEquals(35.0,                  f.getPropertyValue("magvar"));
-            assertEquals(112.32,                f.getPropertyValue("geoidheight"));
-            assertEquals("first point",         f.getPropertyValue("name"));
-            assertEquals("first comment",       f.getPropertyValue("cmt"));
-            assertEquals("first description",   f.getPropertyValue("desc"));
-            assertEquals("first source",        f.getPropertyValue("src"));
-            assertEquals("first symbol",        f.getPropertyValue("sym"));
-            assertEquals("first type",          f.getPropertyValue("type"));
-            assertEquals(Fix.NONE,              f.getPropertyValue("fix"));
-            assertEquals(11,                    f.getPropertyValue("sat"));
-            assertEquals(15.15,                 f.getPropertyValue("hdop"));
-            assertEquals(14.14,                 f.getPropertyValue("vdop"));
-            assertEquals(13.13,                 f.getPropertyValue("pdop"));
-            assertEquals(55.55,                 f.getPropertyValue("ageofdgpsdata"));
-            assertEquals(256,                   f.getPropertyValue("dgpsid"));
-
-            final List<Link> links = new ArrayList<>((Collection<Link>) f.getPropertyValue("link"));
-            if (v11) {
-                assertEquals(3,links.size());
-                assertEquals("http://first-adress1.org", links.get(0).toString());
-                assertEquals("http://first-adress2.org", links.get(1).toString());
-                assertEquals("http://first-adress3.org", links.get(2).toString());
-            } else {
-                assertEquals(1,links.size());
-                assertEquals("http://first-adress1.org", links.get(0).toString());
-            }
-
-            final Envelope bbox = (Envelope) f.getPropertyValue("@envelope");
-            assertEquals(bbox.getMinimum(0), 15.0d, STRICT);
-            assertEquals(bbox.getMaximum(0), 15.0d, STRICT);
-            assertEquals(bbox.getMinimum(1), 10.0d, STRICT);
-            assertEquals(bbox.getMaximum(1), 10.0d, STRICT);
-
-        } else if (num == 1) {
-            assertEquals(2,                     f.getPropertyValue("@identifier"));
-            assertEquals(25.0,                  ((Point)f.getPropertyValue("@geometry")).getX(), STRICT);
-            assertEquals(20.0,                  ((Point)f.getPropertyValue("@geometry")).getY(), STRICT);
-            assertEquals(null,                  f.getPropertyValue("ele"));
-            assertEquals(null,                  f.getPropertyValue("time"));
-            assertEquals(null,                  f.getPropertyValue("magvar"));
-            assertEquals(null,                  f.getPropertyValue("geoidheight"));
-            assertEquals(null,                  f.getPropertyValue("name"));
-            assertEquals(null,                  f.getPropertyValue("cmt"));
-            assertEquals(null,                  f.getPropertyValue("desc"));
-            assertEquals(null,                  f.getPropertyValue("src"));
-            assertEquals(null,                  f.getPropertyValue("sym"));
-            assertEquals(null,                  f.getPropertyValue("type"));
-            assertEquals(null,                  f.getPropertyValue("fix"));
-            assertEquals(null,                  f.getPropertyValue("sat"));
-            assertEquals(null,                  f.getPropertyValue("hdop"));
-            assertEquals(null,                  f.getPropertyValue("vdop"));
-            assertEquals(null,                  f.getPropertyValue("pdop"));
-            assertEquals(null,                  f.getPropertyValue("ageofdgpsdata"));
-            assertEquals(null,                  f.getPropertyValue("dgpsid"));
-
-            final List<Link> links = new ArrayList<>((Collection<Link>) f.getPropertyValue("link"));
-            assertEquals(0,links.size());
-
-            final Envelope bbox = (Envelope) f.getPropertyValue("@envelope");
-            assertEquals(bbox.getMinimum(0), 25.0d, STRICT);
-            assertEquals(bbox.getMaximum(0), 25.0d, STRICT);
-            assertEquals(bbox.getMinimum(1), 20.0d, STRICT);
-            assertEquals(bbox.getMaximum(1), 20.0d, STRICT);
-
-        } else if (num == 2) {
-            assertEquals(3,                     f.getPropertyValue("@identifier"));
-            assertEquals(35.0,                  ((Point) f.getPropertyValue("@geometry")).getX(), STRICT);
-            assertEquals(30.0,                  ((Point) f.getPropertyValue("@geometry")).getY(), STRICT);
-            assertEquals(150.0,                 f.getPropertyValue("ele"));
-            assertEquals(Instant.parse("2010-01-30T00:00:00Z"), f.getPropertyValue("time"));
-            assertEquals(25.0,                  f.getPropertyValue("magvar"));
-            assertEquals(142.32,                f.getPropertyValue("geoidheight"));
-            assertEquals("third point",         f.getPropertyValue("name"));
-            assertEquals("third comment",       f.getPropertyValue("cmt"));
-            assertEquals("third description",   f.getPropertyValue("desc"));
-            assertEquals("third source",        f.getPropertyValue("src"));
-            assertEquals("third symbol",        f.getPropertyValue("sym"));
-            assertEquals("third type",          f.getPropertyValue("type"));
-            assertEquals(Fix.THREE_DIMENSIONAL, f.getPropertyValue("fix"));
-            assertEquals(35,                    f.getPropertyValue("sat"));
-            assertEquals(35.15,                 f.getPropertyValue("hdop"));
-            assertEquals(34.14,                 f.getPropertyValue("vdop"));
-            assertEquals(33.13,                 f.getPropertyValue("pdop"));
-            assertEquals(85.55,                 f.getPropertyValue("ageofdgpsdata"));
-            assertEquals(456,                   f.getPropertyValue("dgpsid"));
-
-            final List<Link> links = new ArrayList<>((Collection<Link>) f.getPropertyValue("link"));
-            if (v11) {
-                assertEquals(2,links.size());
-                assertEquals("http://third-adress1.org", links.get(0).toString());
-                assertEquals("http://third-adress2.org", links.get(1).toString());
-            } else {
-                assertEquals(1,links.size());
-                assertEquals("http://third-adress1.org", links.get(0).toString());
-            }
+    /**
+     * Verifies property values for the given track.
+     *
+     * @param  f         the track to verify.
+     * @param  v11       {@code true} for GPX 1.1, or {@code false} for GPX 1.0.
+     * @param  numLinks  expected number of links.
+     */
+    @SuppressWarnings("fallthrough")
+    private static void verifyTrack(final Feature f, final boolean v11, final int numLinks) {
+        assertEquals("name",       "Track name",          f.getPropertyValue("name"));
+        assertEquals("cmt",        "Track comment",       f.getPropertyValue("cmt"));
+        assertEquals("desc",       "Track description",   f.getPropertyValue("desc"));
+        assertEquals("src",        "Track source",        f.getPropertyValue("src"));
+        assertEquals("type", v11 ? "Track type" : null,   f.getPropertyValue("type"));
+        assertEquals("number",      7,                    f.getPropertyValue("number"));
+
+        final List<?> links = (List<?>) f.getPropertyValue("link");
+        assertEquals("links.size()", numLinks, links.size());
+        switch (numLinks) {
+            default: // Fallthrough everywhere.
+            case 3:  assertStringEquals("http://track-address3.org", links.get(2));
+            case 2:  assertStringEquals("http://track-address2.org", links.get(1));
+            case 1:  assertStringEquals("http://track-address1.org", links.get(0));
+            case 0:  break;
+        }
 
-            final Envelope bbox = (Envelope) f.getPropertyValue("@envelope");
-            assertEquals(bbox.getMinimum(0), 35.0d, STRICT);
-            assertEquals(bbox.getMaximum(0), 35.0d, STRICT);
-            assertEquals(bbox.getMinimum(1), 30.0d, STRICT);
-            assertEquals(bbox.getMaximum(1), 30.0d, STRICT);
+        final List<?> segments = (List<?>) f.getPropertyValue("trkseg");
+        assertEquals("segments.size()", 2, segments.size());
+        final Feature seg1 = (Feature) segments.get(0);
+        final Feature seg2 = (Feature) segments.get(1);
+        final List<?> points = (List<?>) seg1.getPropertyValue("trkpt");
+        assertEquals("points.size()", 3, points.size());
+        verifyPoint((Feature) points.get(0), 0, v11);
+        verifyPoint((Feature) points.get(1), 1, v11);
+        verifyPoint((Feature) points.get(2), 2, v11);
+        assertTrue(((Collection<?>) seg2.getPropertyValue("trkpt")).isEmpty());
+        assertEnvelopeEquals(15, 35, 10, 30, (Envelope) f.getPropertyValue("@envelope"));
+    }
 
-        } else {
-            fail("unexpected point number :" + num);
+    /**
+     * Verifies values of the given point.
+     *
+     * @param  f      the point to verify.
+     * @param  index  index of the point being verified: 0, 1 or 2.
+     * @param  v11    {@code true} for GPX 1.1, or {@code false} for GPX 1.0.
+     */
+    private static void verifyPoint(final Feature f, final int index, final boolean v11) {
+        assertEquals("@identifier", index + 1, f.getPropertyValue("@identifier"));
+        switch (index) {
+            case 0: {
+                assertEquals(Instant.parse("2010-01-10T00:00:00Z"), f.getPropertyValue("time"));
+                assertEquals("x",               15.0,      ((Point) f.getPropertyValue("@geometry")).getX(), STRICT);
+                assertEquals("y",               10.0,      ((Point) f.getPropertyValue("@geometry")).getY(), STRICT);
+                assertEquals("ele",            140.0,               f.getPropertyValue("ele"));
+                assertEquals("magvar",          35.0,               f.getPropertyValue("magvar"));
+                assertEquals("geoidheight",    112.32,              f.getPropertyValue("geoidheight"));
+                assertEquals("name",           "first point",       f.getPropertyValue("name"));
+                assertEquals("cmt",            "first comment",     f.getPropertyValue("cmt"));
+                assertEquals("desc",           "first description", f.getPropertyValue("desc"));
+                assertEquals("src",            "first source",      f.getPropertyValue("src"));
+                assertEquals("sym",            "first symbol",      f.getPropertyValue("sym"));
+                assertEquals("type",           "first type",        f.getPropertyValue("type"));
+                assertEquals("fix",            Fix.NONE,            f.getPropertyValue("fix"));
+                assertEquals("sat",            11,                  f.getPropertyValue("sat"));
+                assertEquals("hdop",           15.15,               f.getPropertyValue("hdop"));
+                assertEquals("vdop",           14.14,               f.getPropertyValue("vdop"));
+                assertEquals("pdop",           13.13,               f.getPropertyValue("pdop"));
+                assertEquals("ageofdgpsdata",  55.55,               f.getPropertyValue("ageofdgpsdata"));
+                assertEquals("dgpsid",        256,                  f.getPropertyValue("dgpsid"));
+                final List<?> links = (List<?>) f.getPropertyValue("link");
+                assertEquals("links.size()", v11 ? 3 : 1, links.size());
+                assertStringEquals("http://first-address1.org", links.get(0));
+                if (v11) {
+                    assertStringEquals("http://first-address2.org", links.get(1));
+                    assertStringEquals("http://first-address3.org", links.get(2));
+                }
+                assertEnvelopeEquals(15, 15, 10, 10, (Envelope) f.getPropertyValue("@envelope"));
+                break;
+            }
+            case 1: {
+                assertEquals("x", 25, ((Point)f.getPropertyValue("@geometry")).getX(), STRICT);
+                assertEquals("y", 20, ((Point)f.getPropertyValue("@geometry")).getY(), STRICT);
+                assertNull("ele",             f.getPropertyValue("ele"));
+                assertNull("time",            f.getPropertyValue("time"));
+                assertNull("magvar",          f.getPropertyValue("magvar"));
+                assertNull("geoidheight",     f.getPropertyValue("geoidheight"));
+                assertNull("name",            f.getPropertyValue("name"));
+                assertNull("cmt",             f.getPropertyValue("cmt"));
+                assertNull("desc",            f.getPropertyValue("desc"));
+                assertNull("src",             f.getPropertyValue("src"));
+                assertNull("sym",             f.getPropertyValue("sym"));
+                assertNull("type",            f.getPropertyValue("type"));
+                assertNull("fix",             f.getPropertyValue("fix"));
+                assertNull("sat",             f.getPropertyValue("sat"));
+                assertNull("hdop",            f.getPropertyValue("hdop"));
+                assertNull("vdop",            f.getPropertyValue("vdop"));
+                assertNull("pdop",            f.getPropertyValue("pdop"));
+                assertNull("ageofdgpsdata",   f.getPropertyValue("ageofdgpsdata"));
+                assertNull("dgpsid",          f.getPropertyValue("dgpsid"));
+                assertTrue("links.isEmpty()", ((List<?>) f.getPropertyValue("link")).isEmpty());
+                assertEnvelopeEquals(25, 25, 20, 20, (Envelope) f.getPropertyValue("@envelope"));
+                break;
+            }
+            case 2: {
+                assertEquals(Instant.parse("2010-01-30T00:00:00Z"),  f.getPropertyValue("time"));
+                assertEquals("x",               35.0,       ((Point) f.getPropertyValue("@geometry")).getX(), STRICT);
+                assertEquals("y",               30.0,       ((Point) f.getPropertyValue("@geometry")).getY(), STRICT);
+                assertEquals("ele",            150.0,                f.getPropertyValue("ele"));
+                assertEquals("magvar",          25.0,                f.getPropertyValue("magvar"));
+                assertEquals("geoidheight",    142.32,               f.getPropertyValue("geoidheight"));
+                assertEquals("name",          "third point",         f.getPropertyValue("name"));
+                assertEquals("cmt",           "third comment",       f.getPropertyValue("cmt"));
+                assertEquals("desc",          "third description",   f.getPropertyValue("desc"));
+                assertEquals("src",           "third source",        f.getPropertyValue("src"));
+                assertEquals("sym",           "third symbol",        f.getPropertyValue("sym"));
+                assertEquals("type",          "third type",          f.getPropertyValue("type"));
+                assertEquals("fix",           Fix.THREE_DIMENSIONAL, f.getPropertyValue("fix"));
+                assertEquals("sat",            35,                   f.getPropertyValue("sat"));
+                assertEquals("hdop",           35.15,                f.getPropertyValue("hdop"));
+                assertEquals("vdop",           34.14,                f.getPropertyValue("vdop"));
+                assertEquals("pdop",           33.13,                f.getPropertyValue("pdop"));
+                assertEquals("ageofdgpsdata",  85.55,                f.getPropertyValue("ageofdgpsdata"));
+                assertEquals("dgpsid",        456,                   f.getPropertyValue("dgpsid"));
+                final List<?> links = (List<?>) f.getPropertyValue("link");
+                assertEquals("links.size()", v11 ? 2 : 1, links.size());
+                assertStringEquals("http://third-address1.org", links.get(0));
+                if (v11) {
+                    assertStringEquals("http://third-address2.org", links.get(1));
+                }
+                assertEnvelopeEquals(35, 35, 30, 30, (Envelope) f.getPropertyValue("@envelope"));
+                break;
+            }
+            default: {
+                fail("unexpected index:" + index);
+                break;
+            }
         }
     }
 }

Modified: sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXWriterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXWriterTest.java?rev=1776002&r1=1776001&r2=1776002&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXWriterTest.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXWriterTest.java [UTF-8] Sun Dec 25 10:54:40 2016
@@ -105,7 +105,7 @@ public final strictfp class GPXWriterTes
         metaData.description = "description";
         metaData.author = person;
         metaData.copyright = copyright;
-        metaData.links.addAll(Arrays.asList(new Link(new URI("http://adress1.org")), new Link(new URI("http://adress2.org"))));
+        metaData.links.addAll(Arrays.asList(new Link(new URI("http://address1.org")), new Link(new URI("http://address2.org"))));
         metaData.time = new Date();
         metaData.keywords = Arrays.asList("test", "sample");
         metaData.bounds = bounds;

Modified: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/metadata.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/metadata.xml?rev=1776002&r1=1776001&r2=1776002&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/metadata.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/metadata.xml Sun Dec 25 10:54:40 2016
@@ -27,7 +27,7 @@
   <author>Jean-Pierre</author>
   <email>jean.pierre@test.com</email>
 
-  <url>http://first-adress.org</url>
+  <url>http://first-address.org</url>
   <urlname>first</urlname>
 
   <time>2010-03-01T00:00:00Z</time>

Modified: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/route.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/route.xml?rev=1776002&r1=1776001&r2=1776002&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/route.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/route.xml Sun Dec 25 10:54:40 2016
@@ -28,7 +28,7 @@
     <cmt>Route comment</cmt>
     <desc>Route description</desc>
     <src>Route source</src>
-    <url>http://route-adress1.org</url>
+    <url>http://route-address1.org</url>
     <number>7</number>
 
     <rtept lat="10" lon="15">
@@ -40,7 +40,7 @@
       <cmt>first comment</cmt>
       <desc>first description</desc>
       <src>first source</src>
-      <url>http://first-adress1.org</url>
+      <url>http://first-address1.org</url>
       <sym>first symbol</sym>
       <type>first type</type>
       <fix>none</fix>
@@ -61,7 +61,7 @@
       <cmt>third comment</cmt>
       <desc>third description</desc>
       <src>third source</src>
-      <url>http://third-adress1.org</url>
+      <url>http://third-address1.org</url>
       <sym>third symbol</sym>
       <type>third type</type>
       <fix>3d</fix>

Modified: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/track.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/track.xml?rev=1776002&r1=1776001&r2=1776002&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/track.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/track.xml Sun Dec 25 10:54:40 2016
@@ -29,7 +29,7 @@
     <cmt>Track comment</cmt>
     <desc>Track description</desc>
     <src>Track source</src>
-    <url>http://track-adress1.org</url>
+    <url>http://track-address1.org</url>
     <number>7</number>
 
     <trkseg>
@@ -42,7 +42,7 @@
         <cmt>first comment</cmt>
         <desc>first description</desc>
         <src>first source</src>
-        <url>http://first-adress1.org</url>
+        <url>http://first-address1.org</url>
         <sym>first symbol</sym>
         <type>first type</type>
         <fix>none</fix>
@@ -63,7 +63,7 @@
         <cmt>third comment</cmt>
         <desc>third description</desc>
         <src>third source</src>
-        <url>http://third-adress1.org</url>
+        <url>http://third-address1.org</url>
         <sym>third symbol</sym>
         <type>third type</type>
         <fix>3d</fix>

Modified: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/waypoint.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/waypoint.xml?rev=1776002&r1=1776001&r2=1776002&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/waypoint.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/waypoint.xml Sun Dec 25 10:54:40 2016
@@ -33,7 +33,7 @@
     <cmt>first comment</cmt>
     <desc>first description</desc>
     <src>first source</src>
-    <url>http://first-adress1.org</url>
+    <url>http://first-address1.org</url>
     <sym>first symbol</sym>
     <type>first type</type>
     <fix>none</fix>
@@ -54,7 +54,7 @@
     <cmt>third comment</cmt>
     <desc>third description</desc>
     <src>third source</src>
-    <url>http://third-adress1.org</url>
+    <url>http://third-address1.org</url>
     <sym>third symbol</sym>
     <type>third type</type>
     <fix>3d</fix>

Modified: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/metadata.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/metadata.xml?rev=1776002&r1=1776001&r2=1776002&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/metadata.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/metadata.xml Sun Dec 25 10:54:40 2016
@@ -34,9 +34,9 @@
       <year>2004</year>
       <license>http://www.apache.org/licenses/LICENSE-2.0</license>
     </copyright>
-    <link href="http://first-adress.org"/>
-    <link href="http://second-adress.org"/>
-    <link href="http://third-adress.org">
+    <link href="http://first-address.org"/>
+    <link href="http://second-address.org"/>
+    <link href="http://third-address.org">
       <type>website</type>
     </link>
     <time>2010-03-01T00:00:00Z</time>

Modified: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/route.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/route.xml?rev=1776002&r1=1776001&r2=1776002&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/route.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/route.xml Sun Dec 25 10:54:40 2016
@@ -31,9 +31,9 @@
     <cmt>Route comment</cmt>
     <desc>Route description</desc>
     <src>Route source</src>
-    <link href="http://route-adress1.org"/>
-    <link href="http://route-adress2.org"/>
-    <link href="http://route-adress3.org"/>
+    <link href="http://route-address1.org"/>
+    <link href="http://route-address2.org"/>
+    <link href="http://route-address3.org"/>
     <number>7</number>
     <type>Route type</type>
 
@@ -46,9 +46,9 @@
       <cmt>first comment</cmt>
       <desc>first description</desc>
       <src>first source</src>
-      <link href="http://first-adress1.org"/>
-      <link href="http://first-adress2.org"/>
-      <link href="http://first-adress3.org"/>
+      <link href="http://first-address1.org"/>
+      <link href="http://first-address2.org"/>
+      <link href="http://first-address3.org"/>
       <sym>first symbol</sym>
       <type>first type</type>
       <fix>none</fix>
@@ -69,8 +69,8 @@
        <cmt>third comment</cmt>
        <desc>third description</desc>
        <src>third source</src>
-       <link href="http://third-adress1.org"/>
-       <link href="http://third-adress2.org"/>
+       <link href="http://third-address1.org"/>
+       <link href="http://third-address2.org"/>
        <sym>third symbol</sym>
        <type>third type</type>
        <fix>3d</fix>

Modified: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/track.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/track.xml?rev=1776002&r1=1776001&r2=1776002&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/track.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/track.xml Sun Dec 25 10:54:40 2016
@@ -31,9 +31,9 @@
     <cmt>Track comment</cmt>
     <desc>Track description</desc>
     <src>Track source</src>
-    <link href="http://track-adress1.org"/>
-    <link href="http://track-adress2.org"/>
-    <link href="http://track-adress3.org"/>
+    <link href="http://track-address1.org"/>
+    <link href="http://track-address2.org"/>
+    <link href="http://track-address3.org"/>
     <number>7</number>
     <type>Track type</type>
 
@@ -47,9 +47,9 @@
         <cmt>first comment</cmt>
         <desc>first description</desc>
         <src>first source</src>
-        <link href="http://first-adress1.org"/>
-        <link href="http://first-adress2.org"/>
-        <link href="http://first-adress3.org"/>
+        <link href="http://first-address1.org"/>
+        <link href="http://first-address2.org"/>
+        <link href="http://first-address3.org"/>
         <sym>first symbol</sym>
         <type>first type</type>
         <fix>none</fix>
@@ -70,8 +70,8 @@
         <cmt>third comment</cmt>
         <desc>third description</desc>
         <src>third source</src>
-        <link href="http://third-adress1.org"/>
-        <link href="http://third-adress2.org"/>
+        <link href="http://third-address1.org"/>
+        <link href="http://third-address2.org"/>
         <sym>third symbol</sym>
         <type>third type</type>
         <fix>3d</fix>

Modified: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/waypoint.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/waypoint.xml?rev=1776002&r1=1776001&r2=1776002&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/waypoint.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/waypoint.xml Sun Dec 25 10:54:40 2016
@@ -35,9 +35,9 @@
     <cmt>first comment</cmt>
     <desc>first description</desc>
     <src>first source</src>
-    <link href="http://first-adress1.org"/>
-    <link href="http://first-adress2.org"/>
-    <link href="http://first-adress3.org"/>
+    <link href="http://first-address1.org"/>
+    <link href="http://first-address2.org"/>
+    <link href="http://first-address3.org"/>
     <sym>first symbol</sym>
     <type>first type</type>
     <fix>none</fix>
@@ -58,8 +58,8 @@
     <cmt>third comment</cmt>
     <desc>third description</desc>
     <src>third source</src>
-    <link href="http://third-adress1.org"/>
-    <link href="http://third-adress2.org"/>
+    <link href="http://third-address1.org"/>
+    <link href="http://third-address2.org"/>
     <sym>third symbol</sym>
     <type>third type</type>
     <fix>3d</fix>



Mime
View raw message