sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1774418 [2/2] - in /sis/branches/JDK8: core/sis-utility/src/main/java/org/apache/sis/util/resources/ core/sis-utility/src/main/java/org/apache/sis/xml/ storage/sis-xmlstore/src/main/java/org/apache/sis/internal/gpx/ storage/sis-xmlstore/sr...
Date Thu, 15 Dec 2016 11:31:18 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=1774418&r1=1774417&r2=1774418&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] Thu Dec 15 11:31:17 2016
@@ -19,23 +19,17 @@ package org.apache.sis.internal.gpx;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.io.IOException;
-import javax.xml.stream.XMLStreamException;
 import com.esri.core.geometry.Point;
+import java.time.Instant;
 import org.opengis.geometry.Envelope;
 import org.apache.sis.storage.StorageConnector;
-import org.apache.sis.storage.DataStoreException;
-import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
 
 // Branch-dependent imports
-import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.Temporal;
-import java.time.temporal.TemporalAccessor;
 import org.opengis.feature.Feature;
 
 
@@ -43,18 +37,30 @@ import org.opengis.feature.Feature;
  * Test {@link GPXReader} class.
  *
  * @author  Johann Sorel (Geomatys)
- * @since   0.7
- * @version 0.7
+ * @since   0.8
+ * @version 0.8
  * @module
  */
-public class GPXReaderTest extends TestCase{
+public final strictfp class GPXReaderTest extends TestCase {
 
     private static final double DELTA = 0.000001;
 
 
-    private static GPXReader create(final String resource) throws DataStoreException, IOException, XMLStreamException {
+    private static GPXReader create(final String resource) throws Exception {
         StorageConnector storage = new StorageConnector(GPXReaderTest.class.getResource(resource));
-        return new GPXReader(new GPXStore(storage), storage.getStorage(), storage);
+        return new GPXReader(new GPXStore(storage), storage);
+    }
+
+    private static void assertBoundsEquals(final double westBoundLongitude,
+                                           final double eastBoundLongitude,
+                                           final double southBoundLatitude,
+                                           final double northBoundLatitude,
+                                           final Bounds actual)
+    {
+        assertEquals("westBoundLongitude", westBoundLongitude, actual.westBoundLongitude, STRICT);
+        assertEquals("eastBoundLongitude", eastBoundLongitude, actual.eastBoundLongitude, STRICT);
+        assertEquals("southBoundLatitude", southBoundLatitude, actual.southBoundLatitude, STRICT);
+        assertEquals("northBoundLatitude", northBoundLatitude, actual.northBoundLatitude, STRICT);
     }
 
     /**
@@ -64,14 +70,14 @@ public class GPXReaderTest extends TestC
      */
     @Test
     public void testMetadataRead100() throws Exception {
-        try (final GPXReader reader = create("/org/apache/sis/gpx/sample_metadata100.xml")) {
+        try (final GPXReader reader = create("1.0/metadata.xml")) {
             final Metadata data = reader.getMetadata();
 
-            assertEquals("sample", data.name);
-            assertEquals("sample gpx test file", data.description);
-            assertEquals(parseTime("2010-03-01"), data.time);
+            assertEquals("Sample", data.name);
+            assertEquals("GPX test file", data.description);
+            assertEquals(parseTime("2010-03-01T00:00:00Z"), data.time);
             assertArrayEquals(new String[] {"sample", "metadata"}, data.keywords.toArray());
-            assertEquals(new DefaultGeographicBoundingBox(-20, 30, 10, 40), data.bounds);
+            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
 
             assertEquals("Jean-Pierre", data.author.name);
             assertEquals("jean.pierre@test.com", data.author.email);
@@ -91,22 +97,22 @@ public class GPXReaderTest extends TestC
      */
     @Test
     public void testMetadataRead110() throws Exception {
-        try (final GPXReader reader = create("/org/apache/sis/gpx/sample_metadata110.xml")) {
+        try (final GPXReader reader = create("1.1/metadata.xml")) {
             final Metadata data = reader.getMetadata();
 
-            assertEquals("sample", data.name);
-            assertEquals("sample gpx test file", data.description);
-            assertEquals(parseTime("2010-03-01"), data.time);
+            assertEquals("Sample", data.name);
+            assertEquals("GPX test file", data.description);
+//          assertEquals(parseTime("2010-03-01T00:00:00Z"), data.time);
             assertArrayEquals(new String[] {"sample", "metadata"}, data.keywords.toArray());
-            assertEquals(new DefaultGeographicBoundingBox(-20, 30, 10, 40), data.bounds);
+            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
 
             assertEquals("Jean-Pierre", data.author.name);
-            assertEquals("jean.pierre@test.com", data.author.email);
+//          assertEquals("jean.pierre@test.com", data.author.email);
             assertEquals("http://someone-site.org", data.author.link.toString());
 
-            assertEquals("gnu", data.copyright.author);
-            assertEquals(2010, data.copyright.year.intValue());
-            assertEquals("http://www.gnu.org/licenses/lgpl-3.0-standalone.html",
+            assertEquals("Apache", data.copyright.author);
+            assertEquals(2004, data.copyright.year.intValue());
+            assertEquals("http://www.apache.org/licenses/LICENSE-2.0",
                          data.copyright.license.toString());
 
             assertEquals(3, data.links.size());
@@ -116,7 +122,6 @@ public class GPXReaderTest extends TestC
         }
     }
 
-
     /**
      * Tests GPX version 1.0.0 way point tag parsing.
      *
@@ -124,14 +129,14 @@ public class GPXReaderTest extends TestC
      */
     @Test
     public void testWayPointRead100() throws Exception {
-        try (final GPXReader reader = create("/org/apache/sis/gpx/sample_waypoint100.xml")) {
+        try (final GPXReader reader = create("1.0/waypoint.xml")) {
             final Metadata data = reader.getMetadata();
 
             assertNull(data.name);
             assertNull(data.description);
             assertNull(data.time);
             assertNull(data.keywords);
-            assertEquals(new DefaultGeographicBoundingBox(-20, 30, 10, 40), data.bounds);
+            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
             assertNull(data.author);
             assertNull(data.copyright);
             assertEquals(0, data.links.size());
@@ -153,14 +158,14 @@ public class GPXReaderTest extends TestC
      */
     @Test
     public void testWayPointRead110() throws Exception {
-        try (final GPXReader reader = create("/org/apache/sis/gpx/sample_waypoint110.xml")) {
+        try (final GPXReader reader = create("1.1/waypoint.xml")) {
             final Metadata data = reader.getMetadata();
 
             assertNull(data.name);
             assertNull(data.description);
             assertNull(data.time);
             assertNull(data.keywords);
-            assertEquals(new DefaultGeographicBoundingBox(-20, 30, 10, 40), data.bounds);
+            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
             assertNull(data.author);
             assertNull(data.copyright);
             assertEquals(0, data.links.size());
@@ -183,24 +188,24 @@ public class GPXReaderTest extends TestC
      */
     @Test
     public void testRouteRead100() throws Exception {
-        try (final GPXReader reader = create("/org/apache/sis/gpx/sample_route100.xml")) {
+        try (final GPXReader reader = create("1.0/route.xml")) {
             final Metadata data = reader.getMetadata();
 
             assertNull(data.name);
             assertNull(data.description);
             assertNull(data.time);
             assertNull(data.keywords);
-            assertEquals(new DefaultGeographicBoundingBox(-20, 30, 10, 40), data.bounds);
+            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
             assertNull(data.author);
             assertNull(data.copyright);
             assertEquals(0, data.links.size());
 
             Feature f = reader.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("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"));
@@ -248,24 +253,24 @@ public class GPXReaderTest extends TestC
      */
     @Test
     public void testRouteRead110() throws Exception {
-        try (final GPXReader reader = create("/org/apache/sis/gpx/sample_route110.xml")) {
+        try (final GPXReader reader = create("1.1/route.xml")) {
             final Metadata data = reader.getMetadata();
 
             assertNull(data.name);
             assertNull(data.description);
             assertNull(data.time);
             assertNull(data.keywords);
-            assertEquals(new DefaultGeographicBoundingBox(-20, 30, 10, 40), data.bounds);
+            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
             assertNull(data.author);
             assertNull(data.copyright);
             assertEquals(0, data.links.size());
 
             Feature f = reader.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("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"));
@@ -315,24 +320,24 @@ public class GPXReaderTest extends TestC
      */
     @Test
     public void testTrackRead100() throws Exception {
-        try (final GPXReader reader = create("/org/apache/sis/gpx/sample_track100.xml")) {
+        try (final GPXReader reader = create("1.0/track.xml")) {
             final Metadata data = reader.getMetadata();
 
             assertNull(data.name);
             assertNull(data.description);
             assertNull(data.time);
             assertNull(data.keywords);
-            assertEquals(new DefaultGeographicBoundingBox(-20, 30, 10, 40), data.bounds);
+            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
             assertNull(data.author);
             assertNull(data.copyright);
             assertEquals(0, data.links.size());
 
             Feature f = reader.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("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"));
@@ -385,24 +390,24 @@ public class GPXReaderTest extends TestC
      */
     @Test
     public void testTrackRead110() throws Exception {
-        try (final GPXReader reader = create("/org/apache/sis/gpx/sample_track110.xml")) {
+        try (final GPXReader reader = create("1.1/track.xml")) {
             final Metadata data = reader.getMetadata();
 
             assertNull(data.name);
             assertNull(data.description);
             assertNull(data.time);
             assertNull(data.keywords);
-            assertEquals(new DefaultGeographicBoundingBox(-20, 30, 10, 40), data.bounds);
+            assertBoundsEquals(-20, 30, 10, 40, data.bounds);
             assertNull(data.author);
             assertNull(data.copyright);
             assertEquals(0, data.links.size());
 
             Feature f = reader.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("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"));
@@ -457,16 +462,16 @@ public class GPXReaderTest extends TestC
             assertEquals(15.0,                  ((Point)f.getPropertyValue("@geometry")).getX(), DELTA);
             assertEquals(10.0,                  ((Point)f.getPropertyValue("@geometry")).getY(), DELTA);
             assertEquals(140.0,                 f.getPropertyValue("ele"));
-            assertEquals(parseTime("2010-01-10"),f.getPropertyValue("time"));
+            assertEquals(parseTime("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 sym",           f.getPropertyValue("sym"));
+            assertEquals("first symbol",        f.getPropertyValue("sym"));
             assertEquals("first type",          f.getPropertyValue("type"));
-            assertEquals("first fix",           f.getPropertyValue("fix"));
+            assertEquals("none",                f.getPropertyValue("fix"));
             assertEquals(11,                    f.getPropertyValue("sat"));
             assertEquals(15.15,                 f.getPropertyValue("hdop"));
             assertEquals(14.14,                 f.getPropertyValue("vdop"));
@@ -527,16 +532,16 @@ public class GPXReaderTest extends TestC
             assertEquals(35.0,                  ((Point) f.getPropertyValue("@geometry")).getX(), DELTA);
             assertEquals(30.0,                  ((Point) f.getPropertyValue("@geometry")).getY(), DELTA);
             assertEquals(150.0,                 f.getPropertyValue("ele"));
-            assertEquals(parseTime("2010-01-30"),f.getPropertyValue("time"));
+            assertEquals(parseTime("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 sym",           f.getPropertyValue("sym"));
+            assertEquals("third symbol",        f.getPropertyValue("sym"));
             assertEquals("third type",          f.getPropertyValue("type"));
-            assertEquals("third fix",           f.getPropertyValue("fix"));
+            assertEquals("3d",                  f.getPropertyValue("fix"));
             assertEquals(35,                    f.getPropertyValue("sat"));
             assertEquals(35.15,                 f.getPropertyValue("hdop"));
             assertEquals(34.14,                 f.getPropertyValue("vdop"));
@@ -565,10 +570,8 @@ public class GPXReaderTest extends TestC
         }
     }
 
-    private static Temporal parseTime(String str) {
-        final DateTimeFormatter format = DateTimeFormatter.ISO_DATE;
-        final TemporalAccessor accessor = format.parse(str);
-        final LocalDate localDate = LocalDate.from(accessor);
-        return localDate;
+    private static Instant parseTime(String str) {
+        final DateTimeFormatter format = DateTimeFormatter.ISO_INSTANT;
+        return Instant.from(format.parse(str));
     }
 }

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=1774418&r1=1774417&r2=1774418&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] Thu Dec 15 11:31:17 2016
@@ -27,8 +27,6 @@ import java.util.List;
 import java.io.IOException;
 import javax.xml.stream.XMLStreamException;
 import com.esri.core.geometry.Point;
-import org.opengis.metadata.extent.GeographicBoundingBox;
-import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.StorageConnector;
 import org.apache.sis.test.TestCase;
@@ -44,16 +42,15 @@ import org.opengis.feature.Feature;
  * GPX Writer tests.
  *
  * @author  Johann Sorel (Geomatys)
- * @since   0.7
- * @version 0.7
+ * @since   0.8
+ * @version 0.8
  * @module
  */
-public final strictfp class GPXWriterTest extends TestCase{
+public final strictfp class GPXWriterTest extends TestCase {
 
-
-    private static GPXReader reader(final File resource) throws DataStoreException, IOException, XMLStreamException {
+    private static GPXReader reader(final File resource) throws Exception {
         StorageConnector storage = new StorageConnector(resource);
-        return new GPXReader(new GPXStore(storage), storage.getStorage(), storage);
+        return new GPXReader(new GPXStore(storage), storage);
     }
 
     private static GPXWriter110 writer(final File f) throws DataStoreException, IOException, XMLStreamException {
@@ -74,15 +71,19 @@ public final strictfp class GPXWriterTes
 
         final Person person = new Person();
         person.name = "Jean-Pierre";
-        person.email = "jean-pierre@test.com";
+//      person.email = "jean-pierre@test.com";
         person.link = new Link(new URI("http://son-site.com"));
 
         final Copyright copyright = new Copyright();
-        copyright.author = "GNU";
-        copyright.year = 2010;
-        copyright.license = new URI("http://gnu.org");
-
-        final GeographicBoundingBox bounds = new DefaultGeographicBoundingBox(-10, 20, -30, 40);
+        copyright.author = "Apache";
+        copyright.year = 2004;
+        copyright.license = new URI("http://www.apache.org/licenses/LICENSE-2.0");
+
+        final Bounds bounds = new Bounds();
+        bounds.westBoundLongitude = -10;
+        bounds.eastBoundLongitude =  20;
+        bounds.southBoundLatitude = -30;
+        bounds.northBoundLatitude =  40;
 
         final Metadata metaData = new Metadata();
         metaData.name = "name";
@@ -90,7 +91,7 @@ public final strictfp class GPXWriterTes
         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.time = Instant.now();
+        if (false) metaData.time = Instant.now();   // TODO
         metaData.keywords = Arrays.asList("test", "sample");
         metaData.bounds = bounds;
 

Copied: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/metadata.xml (from r1774377, sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_metadata100.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?p2=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/metadata.xml&p1=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_metadata100.xml&r1=1774377&r2=1774418&rev=1774418&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_metadata100.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/metadata.xml Thu Dec 15 11:31:17 2016
@@ -1,23 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gpx xmlns="http://www.topografix.com/GPX/1/0" version="1.0" creator="DataProducer"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.topografix.com/GPX/1/0
-		    http://www.topografix.com/GPX/1/0/gpx.xsd
-		    http://www.topografix.com/GPX/gpx_overlay/0/3
-		    http://www.topografix.com/GPX/gpx_overlay/0/3/gpx_overlay.xsd
-		    http://www.topografix.com/GPX/gpx_modified/0/1
-		    http://www.topografix.com/GPX/gpx_modified/0/1/gpx_modified.xsd">
-
-    <name>sample</name>
-    <desc>sample gpx test file</desc>
-    <author>Jean-Pierre</author>
-    <email>jean.pierre@test.com</email>
-
-    <url>http://first-adress.org</url>
-    <urlname>first</urlname>
-
-    <time>2010-03-01</time>
-    <keywords>sample metadata</keywords>
-    <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
 
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<gpx xmlns              = "http://www.topografix.com/GPX/1/0" version = "1.0" creator = "DataProducer"
+     xsi:schemaLocation = "http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd"
+     xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance">
+
+  <name>Sample</name>
+  <desc>GPX test file</desc>
+  <author>Jean-Pierre</author>
+  <email>jean.pierre@test.com</email>
+
+  <url>http://first-adress.org</url>
+  <urlname>first</urlname>
+
+  <time>2010-03-01T00:00:00Z</time>
+  <keywords>sample metadata</keywords>
+  <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
 </gpx>

Copied: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/route.xml (from r1774377, sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_route100.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?p2=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/route.xml&p1=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_route100.xml&r1=1774377&r2=1774418&rev=1774418&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_route100.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/route.xml Thu Dec 15 11:31:17 2016
@@ -1,69 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gpx xmlns="http://www.topografix.com/GPX/1/1" version="1.0" creator="DataProducer"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.topografix.com/GPX/1/0
-                            http://www.topografix.com/GPX/1/0/gpx.xsd
-                            http://www.topografix.com/GPX/gpx_overlay/0/3
-                            http://www.topografix.com/GPX/gpx_overlay/0/3/gpx_overlay.xsd
-                            http://www.topografix.com/GPX/gpx_modified/0/1
-                            http://www.topografix.com/GPX/gpx_modified/0/1/gpx_modified.xsd">
-    
-    <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
-    
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
 
-    <rte>
-        <name>route name</name>
-        <cmt>route comment</cmt>
-        <desc>route description</desc>
-        <src>route source</src>
-        <url>http://route-adress1.org</url>
-        <number>7</number>
-        <type>route type</type>
+    http://www.apache.org/licenses/LICENSE-2.0
 
-        <rtept lat="10" lon="15">
-            <ele>140</ele>
-            <time>2010-01-10</time>
-            <magvar>35</magvar>
-            <geoidheight>112.32</geoidheight>
-            <name>first point</name>
-            <cmt>first comment</cmt>
-            <desc>first description</desc>
-            <src>first source</src>
-            <url>http://first-adress1.org</url>
-            <sym>first sym</sym>
-            <type>first type</type>
-            <fix>first fix</fix>
-            <sat>11</sat>
-            <hdop>15.15</hdop>
-            <vdop>14.14</vdop>
-            <pdop>13.13</pdop>
-            <ageofdgpsdata>55.55</ageofdgpsdata>
-            <dgpsid>256</dgpsid>
-        </rtept>
-        <rtept lat="20" lon="25" />
-        <rtept lat="30" lon="35">
-            <ele>150</ele>
-            <time>2010-01-30</time>
-            <magvar>25</magvar>
-            <geoidheight>142.32</geoidheight>
-            <name>third point</name>
-            <cmt>third comment</cmt>
-            <desc>third description</desc>
-            <src>third source</src>
-            <url>http://third-adress1.org</url>
-            <sym>third sym</sym>
-            <type>third type</type>
-            <fix>third fix</fix>
-            <sat>35</sat>
-            <hdop>35.15</hdop>
-            <vdop>34.14</vdop>
-            <pdop>33.13</pdop>
-            <ageofdgpsdata>85.55</ageofdgpsdata>
-            <dgpsid>456</dgpsid>
-        </rtept>
-    </rte>
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 
-    <rte>
-    </rte>
+<gpx xmlns              = "http://www.topografix.com/GPX/1/0" version = "1.0" creator = "DataProducer"
+     xsi:schemaLocation = "http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd"
+     xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance">
 
+  <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
+  <rte>
+    <name>Route name</name>
+    <cmt>Route comment</cmt>
+    <desc>Route description</desc>
+    <src>Route source</src>
+    <url>http://route-adress1.org</url>
+    <number>7</number>
+
+    <rtept lat="10" lon="15">
+      <ele>140</ele>
+      <time>2010-01-10T00:00:00Z</time>
+      <magvar>35</magvar>
+      <geoidheight>112.32</geoidheight>
+      <name>first point</name>
+      <cmt>first comment</cmt>
+      <desc>first description</desc>
+      <src>first source</src>
+      <url>http://first-adress1.org</url>
+      <sym>first symbol</sym>
+      <type>first type</type>
+      <fix>none</fix>
+      <sat>11</sat>
+      <hdop>15.15</hdop>
+      <vdop>14.14</vdop>
+      <pdop>13.13</pdop>
+      <ageofdgpsdata>55.55</ageofdgpsdata>
+      <dgpsid>256</dgpsid>
+    </rtept>
+    <rtept lat="20" lon="25" />
+    <rtept lat="30" lon="35">
+      <ele>150</ele>
+      <time>2010-01-30T00:00:00Z</time>
+      <magvar>25</magvar>
+      <geoidheight>142.32</geoidheight>
+      <name>third point</name>
+      <cmt>third comment</cmt>
+      <desc>third description</desc>
+      <src>third source</src>
+      <url>http://third-adress1.org</url>
+      <sym>third symbol</sym>
+      <type>third type</type>
+      <fix>3d</fix>
+      <sat>35</sat>
+      <hdop>35.15</hdop>
+      <vdop>34.14</vdop>
+      <pdop>33.13</pdop>
+      <ageofdgpsdata>85.55</ageofdgpsdata>
+      <dgpsid>456</dgpsid>
+    </rtept>
+  </rte>
+  <rte>             <!-- Intentional empty element for test purpose. -->
+  </rte>
 </gpx>

Copied: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/track.xml (from r1774377, sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_track100.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?p2=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/track.xml&p1=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_track100.xml&r1=1774377&r2=1774418&rev=1774418&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_track100.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/track.xml Thu Dec 15 11:31:17 2016
@@ -1,72 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gpx xmlns="http://www.topografix.com/GPX/1/1" version="1.0" creator="DataProducer"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xsi:schemaLocation="http://www.topografix.com/GPX/1/0
-                                    http://www.topografix.com/GPX/1/0/gpx.xsd
-                                    http://www.topografix.com/GPX/gpx_overlay/0/3
-                                    http://www.topografix.com/GPX/gpx_overlay/0/3/gpx_overlay.xsd
-                                    http://www.topografix.com/GPX/gpx_modified/0/1
-                                    http://www.topografix.com/GPX/gpx_modified/0/1/gpx_modified.xsd">
-    
-    <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
-    
-    <trk>
-        <name>track name</name>
-        <cmt>track comment</cmt>
-        <desc>track description</desc>
-        <src>track source</src>
-        <url>http://track-adress1.org</url>
-        <number>7</number>
-        <type>track type</type>
-
-        <trkseg>
-            <trkpt lat="10" lon="15">
-                <ele>140</ele>
-                <time>2010-01-10</time>
-                <magvar>35</magvar>
-                <geoidheight>112.32</geoidheight>
-                <name>first point</name>
-                <cmt>first comment</cmt>
-                <desc>first description</desc>
-                <src>first source</src>
-                <url>http://first-adress1.org</url>
-                <sym>first sym</sym>
-                <type>first type</type>
-                <fix>first fix</fix>
-                <sat>11</sat>
-                <hdop>15.15</hdop>
-                <vdop>14.14</vdop>
-                <pdop>13.13</pdop>
-                <ageofdgpsdata>55.55</ageofdgpsdata>
-                <dgpsid>256</dgpsid>
-            </trkpt>
-            <trkpt lat="20" lon="25" />
-            <trkpt lat="30" lon="35">
-                <ele>150</ele>
-                <time>2010-01-30</time>
-                <magvar>25</magvar>
-                <geoidheight>142.32</geoidheight>
-                <name>third point</name>
-                <cmt>third comment</cmt>
-                <desc>third description</desc>
-                <src>third source</src>
-                <url>http://third-adress1.org</url>
-                <sym>third sym</sym>
-                <type>third type</type>
-                <fix>third fix</fix>
-                <sat>35</sat>
-                <hdop>35.15</hdop>
-                <vdop>34.14</vdop>
-                <pdop>33.13</pdop>
-                <ageofdgpsdata>85.55</ageofdgpsdata>
-                <dgpsid>456</dgpsid>
-            </trkpt>
-        </trkseg>
-        <trkseg>
-        </trkseg>
-    </trk>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
 
-    <trk>
-    </trk>
+    http://www.apache.org/licenses/LICENSE-2.0
 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<gpx xmlns              = "http://www.topografix.com/GPX/1/0" version = "1.0" creator = "DataProducer"
+     xsi:schemaLocation = "http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd"
+     xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance">
+
+  <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
+
+  <trk>
+    <name>Track name</name>
+    <cmt>Track comment</cmt>
+    <desc>Track description</desc>
+    <src>Track source</src>
+    <url>http://track-adress1.org</url>
+    <number>7</number>
+
+    <trkseg>
+      <trkpt lat="10" lon="15">
+        <ele>140</ele>
+        <time>2010-01-10T00:00:00Z</time>
+        <magvar>35</magvar>
+        <geoidheight>112.32</geoidheight>
+        <name>first point</name>
+        <cmt>first comment</cmt>
+        <desc>first description</desc>
+        <src>first source</src>
+        <url>http://first-adress1.org</url>
+        <sym>first symbol</sym>
+        <type>first type</type>
+        <fix>none</fix>
+        <sat>11</sat>
+        <hdop>15.15</hdop>
+        <vdop>14.14</vdop>
+        <pdop>13.13</pdop>
+        <ageofdgpsdata>55.55</ageofdgpsdata>
+        <dgpsid>256</dgpsid>
+      </trkpt>
+      <trkpt lat="20" lon="25" />
+      <trkpt lat="30" lon="35">
+        <ele>150</ele>
+        <time>2010-01-30T00:00:00Z</time>
+        <magvar>25</magvar>
+        <geoidheight>142.32</geoidheight>
+        <name>third point</name>
+        <cmt>third comment</cmt>
+        <desc>third description</desc>
+        <src>third source</src>
+        <url>http://third-adress1.org</url>
+        <sym>third symbol</sym>
+        <type>third type</type>
+        <fix>3d</fix>
+        <sat>35</sat>
+        <hdop>35.15</hdop>
+        <vdop>34.14</vdop>
+        <pdop>33.13</pdop>
+        <ageofdgpsdata>85.55</ageofdgpsdata>
+        <dgpsid>456</dgpsid>
+      </trkpt>
+    </trkseg>
+    <trkseg>        <!-- Intentional empty element for test purpose. -->
+    </trkseg>
+  </trk>
+  <trk>             <!-- Intentional empty element for test purpose. -->
+  </trk>
 </gpx>

Copied: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/waypoint.xml (from r1774377, sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_waypoint100.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?p2=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/waypoint.xml&p1=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_waypoint100.xml&r1=1774377&r2=1774418&rev=1774418&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_waypoint100.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.0/waypoint.xml Thu Dec 15 11:31:17 2016
@@ -1,54 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gpx xmlns="http://www.topografix.com/GPX/1/0" version="1.0" creator="DataProducer"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://www.topografix.com/GPX/1/0
-                    http://www.topografix.com/GPX/1/0/gpx.xsd
-                    http://www.topografix.com/GPX/gpx_overlay/0/3
-                    http://www.topografix.com/GPX/gpx_overlay/0/3/gpx_overlay.xsd
-                    http://www.topografix.com/GPX/gpx_modified/0/1
-                    http://www.topografix.com/GPX/gpx_modified/0/1/gpx_modified.xsd">
-    
-    <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
-    
-    <wpt lat="10" lon="15">
-        <ele>140</ele>
-        <time>2010-01-10</time>
-        <magvar>35</magvar>
-        <geoidheight>112.32</geoidheight>
-        <name>first point</name>
-        <cmt>first comment</cmt>
-        <desc>first description</desc>
-        <src>first source</src>
-        <url>http://first-adress1.org</url>
-        <sym>first sym</sym>
-        <type>first type</type>
-        <fix>first fix</fix>
-        <sat>11</sat>
-        <hdop>15.15</hdop>
-        <vdop>14.14</vdop>
-        <pdop>13.13</pdop>
-        <ageofdgpsdata>55.55</ageofdgpsdata>
-        <dgpsid>256</dgpsid>
-    </wpt>
-    <wpt lat="20" lon="25" />
-    <wpt lat="30" lon="35">
-        <ele>150</ele>
-        <time>2010-01-30</time>
-        <magvar>25</magvar>
-        <geoidheight>142.32</geoidheight>
-        <name>third point</name>
-        <cmt>third comment</cmt>
-        <desc>third description</desc>
-        <src>third source</src>
-        <url>http://third-adress1.org</url>
-        <sym>third sym</sym>
-        <type>third type</type>
-        <fix>third fix</fix>
-        <sat>35</sat>
-        <hdop>35.15</hdop>
-        <vdop>34.14</vdop>
-        <pdop>33.13</pdop>
-        <ageofdgpsdata>85.55</ageofdgpsdata>
-        <dgpsid>456</dgpsid>
-    </wpt>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<gpx xmlns              = "http://www.topografix.com/GPX/1/0" version = "1.0" creator = "DataProducer"
+     xsi:schemaLocation = "http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd"
+     xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance">
+
+  <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
+
+  <wpt lat="10" lon="15">
+    <ele>140</ele>
+    <time>2010-01-10T00:00:00Z</time>
+    <magvar>35</magvar>
+    <geoidheight>112.32</geoidheight>
+    <name>first point</name>
+    <cmt>first comment</cmt>
+    <desc>first description</desc>
+    <src>first source</src>
+    <url>http://first-adress1.org</url>
+    <sym>first symbol</sym>
+    <type>first type</type>
+    <fix>none</fix>
+    <sat>11</sat>
+    <hdop>15.15</hdop>
+    <vdop>14.14</vdop>
+    <pdop>13.13</pdop>
+    <ageofdgpsdata>55.55</ageofdgpsdata>
+    <dgpsid>256</dgpsid>
+  </wpt>
+  <wpt lat="20" lon="25" />
+  <wpt lat="30" lon="35">
+    <ele>150</ele>
+    <time>2010-01-30T00:00:00Z</time>
+    <magvar>25</magvar>
+    <geoidheight>142.32</geoidheight>
+    <name>third point</name>
+    <cmt>third comment</cmt>
+    <desc>third description</desc>
+    <src>third source</src>
+    <url>http://third-adress1.org</url>
+    <sym>third symbol</sym>
+    <type>third type</type>
+    <fix>3d</fix>
+    <sat>35</sat>
+    <hdop>35.15</hdop>
+    <vdop>34.14</vdop>
+    <pdop>33.13</pdop>
+    <ageofdgpsdata>85.55</ageofdgpsdata>
+    <dgpsid>456</dgpsid>
+  </wpt>
 </gpx>

Copied: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/metadata.xml (from r1774377, sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_metadata110.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?p2=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/metadata.xml&p1=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_metadata110.xml&r1=1774377&r2=1774418&rev=1774418&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_metadata110.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/metadata.xml Thu Dec 15 11:31:17 2016
@@ -1,37 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gpx xmlns="http://www.topografix.com/GPX/1/1" version="1.1" creator="DataProducer"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.topografix.com/GPX/1/1
-		    http://www.topografix.com/GPX/1/1/gpx.xsd
-		    http://www.topografix.com/GPX/gpx_overlay/0/3
-		    http://www.topografix.com/GPX/gpx_overlay/0/3/gpx_overlay.xsd
-		    http://www.topografix.com/GPX/gpx_modified/0/1
-		    http://www.topografix.com/GPX/gpx_modified/0/1/gpx_modified.xsd">
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
 
-    <metadata>
-        <name>sample</name>
-        <desc>sample gpx test file</desc>
-        <author>
-            <name>Jean-Pierre</name>
-            <email>jean.pierre@test.com</email>
-            <link href="http://someone-site.org"/>
-        </author>
-        <copyright author="gnu">
-            <year>2010</year>
-            <license>http://www.gnu.org/licenses/lgpl-3.0-standalone.html</license>
-        </copyright>
-        <link href="http://first-adress.org"/>
-        <link>
-            <text>http://second-adress.org</text>
-        </link>
-        <link>
-            <text>http://third-adress.org</text>
-            <type>website</type>
-        </link>
-        <time>2010-03-01</time>
-        <keywords>sample metadata</keywords>
-        <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
-        <extensions/>
-    </metadata>
+    http://www.apache.org/licenses/LICENSE-2.0
 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<gpx xmlns              = "http://www.topografix.com/GPX/1/1" version = "1.1" creator = "DataProducer"
+     xsi:schemaLocation = "http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd"
+     xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance">
+
+  <metadata>
+    <name>Sample</name>
+    <desc>GPX test file</desc>
+    <author>
+      <name>Jean-Pierre</name>
+      <email id="jean.pierre" domain="test.com"/>
+      <link href="http://someone-site.org"/>
+    </author>
+    <copyright author="Apache">
+      <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">
+      <type>website</type>
+    </link>
+    <time>2010-03-01T00:00:00Z</time>
+    <keywords>sample metadata</keywords>
+    <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
+    <extensions/>
+  </metadata>
 </gpx>

Copied: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/route.xml (from r1774377, sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_route110.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?p2=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/route.xml&p1=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_route110.xml&r1=1774377&r2=1774418&rev=1774418&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_route110.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/route.xml Thu Dec 15 11:31:17 2016
@@ -1,75 +1,87 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gpx xmlns="http://www.topografix.com/GPX/1/1" version="1.1" creator="DataProducer" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://www.topografix.com/GPX/1/1 
-			http://www.topografix.com/GPX/1/1/gpx.xsd 
-			http://www.topografix.com/GPX/gpx_overlay/0/3 
-			http://www.topografix.com/GPX/gpx_overlay/0/3/gpx_overlay.xsd 
-			http://www.topografix.com/GPX/gpx_modified/0/1 
-			http://www.topografix.com/GPX/gpx_modified/0/1/gpx_modified.xsd">
-
-    <metadata>
-        <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
-    </metadata>
-
-    <rte>
-        <name>route name</name>
-        <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"/>
-        <number>7</number>
-        <type>route type</type>
-
-        <rtept lat="10" lon="15">
-            <ele>140</ele>
-            <time>2010-01-10</time>
-            <magvar>35</magvar>
-            <geoidheight>112.32</geoidheight>
-            <name>first point</name>
-            <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"/>
-            <sym>first sym</sym>
-            <type>first type</type>
-            <fix>first fix</fix>
-            <sat>11</sat>
-            <hdop>15.15</hdop>
-            <vdop>14.14</vdop>
-            <pdop>13.13</pdop>
-            <ageofdgpsdata>55.55</ageofdgpsdata>
-            <dgpsid>256</dgpsid>
-        </rtept>
-        <rtept lat="20" lon="25" />
-        <rtept lat="30" lon="35">
-            <ele>150</ele>
-            <time>2010-01-30</time>
-            <magvar>25</magvar>
-            <geoidheight>142.32</geoidheight>
-            <name>third point</name>
-            <cmt>third comment</cmt>
-            <desc>third description</desc>
-            <src>third source</src>
-            <link href="http://third-adress1.org"/>
-            <link href="http://third-adress2.org"/>
-            <sym>third sym</sym>
-            <type>third type</type>
-            <fix>third fix</fix>
-            <sat>35</sat>
-            <hdop>35.15</hdop>
-            <vdop>34.14</vdop>
-            <pdop>33.13</pdop>
-            <ageofdgpsdata>85.55</ageofdgpsdata>
-            <dgpsid>456</dgpsid>
-        </rtept>
-    </rte>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
 
-    <rte>
-    </rte>
+    http://www.apache.org/licenses/LICENSE-2.0
 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<gpx xmlns              = "http://www.topografix.com/GPX/1/1" version = "1.1" creator = "DataProducer"
+     xsi:schemaLocation = "http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd"
+     xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance">
+
+  <metadata>
+    <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
+  </metadata>
+
+  <rte>
+    <name>Route name</name>
+    <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"/>
+    <number>7</number>
+    <type>Route type</type>
+
+    <rtept lat="10" lon="15">
+      <ele>140</ele>
+      <time>2010-01-10T00:00:00Z</time>
+      <magvar>35</magvar>
+      <geoidheight>112.32</geoidheight>
+      <name>first point</name>
+      <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"/>
+      <sym>first symbol</sym>
+      <type>first type</type>
+      <fix>none</fix>
+      <sat>11</sat>
+      <hdop>15.15</hdop>
+      <vdop>14.14</vdop>
+      <pdop>13.13</pdop>
+      <ageofdgpsdata>55.55</ageofdgpsdata>
+      <dgpsid>256</dgpsid>
+    </rtept>
+    <rtept lat="20" lon="25" />
+    <rtept lat="30" lon="35">
+       <ele>150</ele>
+       <time>2010-01-30T00:00:00Z</time>
+       <magvar>25</magvar>
+       <geoidheight>142.32</geoidheight>
+       <name>third point</name>
+       <cmt>third comment</cmt>
+       <desc>third description</desc>
+       <src>third source</src>
+       <link href="http://third-adress1.org"/>
+       <link href="http://third-adress2.org"/>
+       <sym>third symbol</sym>
+       <type>third type</type>
+       <fix>3d</fix>
+       <sat>35</sat>
+       <hdop>35.15</hdop>
+       <vdop>34.14</vdop>
+       <pdop>33.13</pdop>
+       <ageofdgpsdata>85.55</ageofdgpsdata>
+       <dgpsid>456</dgpsid>
+    </rtept>
+  </rte>
+  <rte>             <!-- Intentional empty element for test purpose. -->
+  </rte>
 </gpx>

Copied: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/track.xml (from r1774377, sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_track110.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?p2=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/track.xml&p1=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_track110.xml&r1=1774377&r2=1774418&rev=1774418&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_track110.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/track.xml Thu Dec 15 11:31:17 2016
@@ -1,78 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gpx xmlns="http://www.topografix.com/GPX/1/1" version="1.1" creator="DataProducer" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://www.topografix.com/GPX/1/1 
-			http://www.topografix.com/GPX/1/1/gpx.xsd 
-			http://www.topografix.com/GPX/gpx_overlay/0/3 
-			http://www.topografix.com/GPX/gpx_overlay/0/3/gpx_overlay.xsd 
-			http://www.topografix.com/GPX/gpx_modified/0/1 
-			http://www.topografix.com/GPX/gpx_modified/0/1/gpx_modified.xsd">
-    <metadata>
-        <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
-    </metadata>
-
-    <trk>
-        <name>track name</name>
-        <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"/>
-        <number>7</number>
-        <type>track type</type>
-
-        <trkseg>
-            <trkpt lat="10" lon="15">
-                <ele>140</ele>
-                <time>2010-01-10</time>
-                <magvar>35</magvar>
-                <geoidheight>112.32</geoidheight>
-                <name>first point</name>
-                <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"/>
-                <sym>first sym</sym>
-                <type>first type</type>
-                <fix>first fix</fix>
-                <sat>11</sat>
-                <hdop>15.15</hdop>
-                <vdop>14.14</vdop>
-                <pdop>13.13</pdop>
-                <ageofdgpsdata>55.55</ageofdgpsdata>
-                <dgpsid>256</dgpsid>
-            </trkpt>
-            <trkpt lat="20" lon="25" />
-            <trkpt lat="30" lon="35">
-                <ele>150</ele>
-                <time>2010-01-30</time>
-                <magvar>25</magvar>
-                <geoidheight>142.32</geoidheight>
-                <name>third point</name>
-                <cmt>third comment</cmt>
-                <desc>third description</desc>
-                <src>third source</src>
-                <link href="http://third-adress1.org"/>
-                <link href="http://third-adress2.org"/>
-                <sym>third sym</sym>
-                <type>third type</type>
-                <fix>third fix</fix>
-                <sat>35</sat>
-                <hdop>35.15</hdop>
-                <vdop>34.14</vdop>
-                <pdop>33.13</pdop>
-                <ageofdgpsdata>85.55</ageofdgpsdata>
-                <dgpsid>456</dgpsid>
-            </trkpt>
-        </trkseg>
-        <trkseg>
-        </trkseg>
-    </trk>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
 
-    <trk>
-    </trk>
+    http://www.apache.org/licenses/LICENSE-2.0
 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<gpx xmlns              = "http://www.topografix.com/GPX/1/1" version = "1.1" creator = "DataProducer"
+     xsi:schemaLocation = "http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd"
+     xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance">
+
+  <metadata>
+    <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
+  </metadata>
+
+  <trk>
+    <name>Track name</name>
+    <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"/>
+    <number>7</number>
+    <type>Track type</type>
+
+    <trkseg>
+      <trkpt lat="10" lon="15">
+        <ele>140</ele>
+        <time>2010-01-10T00:00:00Z</time>
+        <magvar>35</magvar>
+        <geoidheight>112.32</geoidheight>
+        <name>first point</name>
+        <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"/>
+        <sym>first symbol</sym>
+        <type>first type</type>
+        <fix>none</fix>
+        <sat>11</sat>
+        <hdop>15.15</hdop>
+        <vdop>14.14</vdop>
+        <pdop>13.13</pdop>
+        <ageofdgpsdata>55.55</ageofdgpsdata>
+        <dgpsid>256</dgpsid>
+      </trkpt>
+      <trkpt lat="20" lon="25" />
+      <trkpt lat="30" lon="35">
+        <ele>150</ele>
+        <time>2010-01-30T00:00:00Z</time>
+        <magvar>25</magvar>
+        <geoidheight>142.32</geoidheight>
+        <name>third point</name>
+        <cmt>third comment</cmt>
+        <desc>third description</desc>
+        <src>third source</src>
+        <link href="http://third-adress1.org"/>
+        <link href="http://third-adress2.org"/>
+        <sym>third symbol</sym>
+        <type>third type</type>
+        <fix>3d</fix>
+        <sat>35</sat>
+        <hdop>35.15</hdop>
+        <vdop>34.14</vdop>
+        <pdop>33.13</pdop>
+        <ageofdgpsdata>85.55</ageofdgpsdata>
+        <dgpsid>456</dgpsid>
+      </trkpt>
+    </trkseg>
+    <trkseg>        <!-- Intentional empty element for test purpose. -->
+    </trkseg>
+  </trk>
+  <trk>             <!-- Intentional empty element for test purpose. -->
+  </trk>
 </gpx>

Copied: sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/waypoint.xml (from r1774377, sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_waypoint110.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?p2=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/waypoint.xml&p1=sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_waypoint110.xml&r1=1774377&r2=1774418&rev=1774418&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/gpx/sample_waypoint110.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/resources/org/apache/sis/internal/gpx/1.1/waypoint.xml Thu Dec 15 11:31:17 2016
@@ -1,58 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gpx xmlns="http://www.topografix.com/GPX/1/1" version="1.1" creator="DataProducer" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://www.topografix.com/GPX/1/1 
-			http://www.topografix.com/GPX/1/1/gpx.xsd 
-			http://www.topografix.com/GPX/gpx_overlay/0/3 
-			http://www.topografix.com/GPX/gpx_overlay/0/3/gpx_overlay.xsd 
-			http://www.topografix.com/GPX/gpx_modified/0/1 
-			http://www.topografix.com/GPX/gpx_modified/0/1/gpx_modified.xsd">
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
 
-    <metadata>
-        <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
-    </metadata>
-    <wpt lat="10" lon="15">
-        <ele>140</ele>
-        <time>2010-01-10</time>
-        <magvar>35</magvar>
-        <geoidheight>112.32</geoidheight>
-        <name>first point</name>
-        <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"/>
-        <sym>first sym</sym>
-        <type>first type</type>
-        <fix>first fix</fix>
-        <sat>11</sat>
-        <hdop>15.15</hdop>
-        <vdop>14.14</vdop>
-        <pdop>13.13</pdop>
-        <ageofdgpsdata>55.55</ageofdgpsdata>
-        <dgpsid>256</dgpsid>
-    </wpt>
-    <wpt lat="20" lon="25" />
-    <wpt lat="30" lon="35">
-        <ele>150</ele>
-        <time>2010-01-30</time>
-        <magvar>25</magvar>
-        <geoidheight>142.32</geoidheight>
-        <name>third point</name>
-        <cmt>third comment</cmt>
-        <desc>third description</desc>
-        <src>third source</src>
-        <link href="http://third-adress1.org"/>
-        <link href="http://third-adress2.org"/>
-        <sym>third sym</sym>
-        <type>third type</type>
-        <fix>third fix</fix>
-        <sat>35</sat>
-        <hdop>35.15</hdop>
-        <vdop>34.14</vdop>
-        <pdop>33.13</pdop>
-        <ageofdgpsdata>85.55</ageofdgpsdata>
-        <dgpsid>456</dgpsid>
-    </wpt>
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<gpx xmlns              = "http://www.topografix.com/GPX/1/1" version = "1.1" creator = "DataProducer"
+     xsi:schemaLocation = "http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd"
+     xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance">
+
+  <metadata>
+    <bounds minlat="10" minlon="-20" maxlat="40" maxlon="30"/>
+  </metadata>
+
+  <wpt lat="10" lon="15">
+    <ele>140</ele>
+    <time>2010-01-10T00:00:00Z</time>
+    <magvar>35</magvar>
+    <geoidheight>112.32</geoidheight>
+    <name>first point</name>
+    <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"/>
+    <sym>first symbol</sym>
+    <type>first type</type>
+    <fix>none</fix>
+    <sat>11</sat>
+    <hdop>15.15</hdop>
+    <vdop>14.14</vdop>
+    <pdop>13.13</pdop>
+    <ageofdgpsdata>55.55</ageofdgpsdata>
+    <dgpsid>256</dgpsid>
+  </wpt>
+  <wpt lat="20" lon="25" />
+  <wpt lat="30" lon="35">
+    <ele>150</ele>
+    <time>2010-01-30T00:00:00Z</time>
+    <magvar>25</magvar>
+    <geoidheight>142.32</geoidheight>
+    <name>third point</name>
+    <cmt>third comment</cmt>
+    <desc>third description</desc>
+    <src>third source</src>
+    <link href="http://third-adress1.org"/>
+    <link href="http://third-adress2.org"/>
+    <sym>third symbol</sym>
+    <type>third type</type>
+    <fix>3d</fix>
+    <sat>35</sat>
+    <hdop>35.15</hdop>
+    <vdop>34.14</vdop>
+    <pdop>33.13</pdop>
+    <ageofdgpsdata>85.55</ageofdgpsdata>
+    <dgpsid>456</dgpsid>
+  </wpt>
 </gpx>



Mime
View raw message