sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1768246 [2/2] - in /sis/branches/JDK8: core/sis-utility/src/main/java/org/apache/sis/internal/simple/ core/sis-utility/src/test/java/org/apache/sis/test/mock/ storage/sis-xmlstore/src/main/java/org/apache/sis/internal/gpx/ storage/sis-xmls...
Date Sat, 05 Nov 2016 16:51:40 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=1768246&r1=1768245&r2=1768246&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] Sat Nov  5 16:51:40 2016
@@ -68,7 +68,7 @@ public class GPXReaderTest extends TestC
     @Test
     public void testMetadataRead100() throws Exception {
         try (final GPXReader reader = create("/org/apache/sis/gpx/sample_metadata100.xml"))
{
-            final MetaData data = reader.getMetadata();
+            final Metadata data = reader.getMetadata();
 
             assertEquals("sample", data.name);
             assertEquals("sample gpx test file", data.description);
@@ -76,11 +76,11 @@ public class GPXReaderTest extends TestC
             assertEquals("sample,metadata", data.keywords);
             assertEquals(createEnvelope(-20, 30, 10, 40), data.bounds);
 
-            assertEquals("Jean-Pierre", data.person.name);
-            assertEquals("jean.pierre@test.com", data.person.email);
-            assertNull(data.person.link);
+            assertEquals("Jean-Pierre", data.author.name);
+            assertEquals("jean.pierre@test.com", data.author.email);
+            assertNull(data.author.link);
 
-            assertNull(data.copyRight);
+            assertNull(data.copyright);
 
             assertEquals(1, data.links.size());
             assertEquals("http://first-adress.org", data.links.get(0).toString());
@@ -95,7 +95,7 @@ public class GPXReaderTest extends TestC
     @Test
     public void testMetadataRead110() throws Exception {
         try (final GPXReader reader = create("/org/apache/sis/gpx/sample_metadata110.xml"))
{
-            final MetaData data = reader.getMetadata();
+            final Metadata data = reader.getMetadata();
 
             assertEquals("sample", data.name);
             assertEquals("sample gpx test file", data.description);
@@ -103,13 +103,13 @@ public class GPXReaderTest extends TestC
             assertEquals("sample,metadata", data.keywords);
             assertEquals(createEnvelope(-20, 30, 10, 40), data.bounds);
 
-            assertEquals("Jean-Pierre", data.person.name);
-            assertEquals("jean.pierre@test.com", data.person.email);
-            assertEquals("http://someone-site.org", data.person.link.toString());
-
-            assertEquals("gnu", data.copyRight.author);
-            assertEquals(2010, data.copyRight.year.intValue());
-            assertEquals("http://www.gnu.org/licenses/lgpl-3.0-standalone.html", data.copyRight.license.toString());
+            assertEquals("Jean-Pierre", data.author.name);
+            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", data.copyright.license.toString());
 
             assertEquals(3, data.links.size());
             assertEquals("http://first-adress.org", data.links.get(0).toString());
@@ -127,15 +127,15 @@ public class GPXReaderTest extends TestC
     @Test
     public void testWayPointRead100() throws Exception {
         try (final GPXReader reader = create("/org/apache/sis/gpx/sample_waypoint100.xml"))
{
-            final MetaData data = reader.getMetadata();
+            final Metadata data = reader.getMetadata();
 
             assertNull(data.name);
             assertNull(data.description);
             assertNull(data.time);
             assertNull(data.keywords);
             assertEquals(createEnvelope(-20, 30, 10, 40), data.bounds);
-            assertNull(data.person);
-            assertNull(data.copyRight);
+            assertNull(data.author);
+            assertNull(data.copyright);
             assertEquals(0, data.links.size());
 
             Feature f = reader.next();
@@ -156,15 +156,15 @@ public class GPXReaderTest extends TestC
     @Test
     public void testWayPointRead110() throws Exception {
         try (final GPXReader reader = create("/org/apache/sis/gpx/sample_waypoint110.xml"))
{
-            final MetaData data = reader.getMetadata();
+            final Metadata data = reader.getMetadata();
 
             assertNull(data.name);
             assertNull(data.description);
             assertNull(data.time);
             assertNull(data.keywords);
             assertEquals(createEnvelope(-20, 30, 10, 40), data.bounds);
-            assertNull(data.person);
-            assertNull(data.copyRight);
+            assertNull(data.author);
+            assertNull(data.copyright);
             assertEquals(0, data.links.size());
 
             Feature f = reader.next();
@@ -186,15 +186,15 @@ public class GPXReaderTest extends TestC
     @Test
     public void testRouteRead100() throws Exception {
         try (final GPXReader reader = create("/org/apache/sis/gpx/sample_route100.xml"))
{
-            final MetaData data = reader.getMetadata();
+            final Metadata data = reader.getMetadata();
 
             assertNull(data.name);
             assertNull(data.description);
             assertNull(data.time);
             assertNull(data.keywords);
             assertEquals(createEnvelope(-20, 30, 10, 40), data.bounds);
-            assertNull(data.person);
-            assertNull(data.copyRight);
+            assertNull(data.author);
+            assertNull(data.copyright);
             assertEquals(0, data.links.size());
 
             Feature f = reader.next();
@@ -251,15 +251,15 @@ public class GPXReaderTest extends TestC
     @Test
     public void testRouteRead110() throws Exception {
         try (final GPXReader reader = create("/org/apache/sis/gpx/sample_route110.xml"))
{
-            final MetaData data = reader.getMetadata();
+            final Metadata data = reader.getMetadata();
 
             assertNull(data.name);
             assertNull(data.description);
             assertNull(data.time);
             assertNull(data.keywords);
             assertEquals(createEnvelope(-20, 30, 10, 40), data.bounds);
-            assertNull(data.person);
-            assertNull(data.copyRight);
+            assertNull(data.author);
+            assertNull(data.copyright);
             assertEquals(0, data.links.size());
 
             Feature f = reader.next();
@@ -318,15 +318,15 @@ public class GPXReaderTest extends TestC
     @Test
     public void testTrackRead100() throws Exception {
         try (final GPXReader reader = create("/org/apache/sis/gpx/sample_track100.xml"))
{
-            final MetaData data = reader.getMetadata();
+            final Metadata data = reader.getMetadata();
 
             assertNull(data.name);
             assertNull(data.description);
             assertNull(data.time);
             assertNull(data.keywords);
             assertEquals(createEnvelope(-20, 30, 10, 40), data.bounds);
-            assertNull(data.person);
-            assertNull(data.copyRight);
+            assertNull(data.author);
+            assertNull(data.copyright);
             assertEquals(0, data.links.size());
 
             Feature f = reader.next();
@@ -388,15 +388,15 @@ public class GPXReaderTest extends TestC
     @Test
     public void testTrackRead110() throws Exception {
         try (final GPXReader reader = create("/org/apache/sis/gpx/sample_track110.xml"))
{
-            final MetaData data = reader.getMetadata();
+            final Metadata data = reader.getMetadata();
 
             assertNull(data.name);
             assertNull(data.description);
             assertNull(data.time);
             assertNull(data.keywords);
             assertEquals(createEnvelope(-20, 30, 10, 40), data.bounds);
-            assertNull(data.person);
-            assertNull(data.copyRight);
+            assertNull(data.author);
+            assertNull(data.copyright);
             assertEquals(0, data.links.size());
 
             Feature f = reader.next();

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=1768246&r1=1768245&r2=1768246&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] Sat Nov  5 16:51:40 2016
@@ -85,11 +85,11 @@ public final strictfp class GPXWriterTes
         bounds.setRange(0, -10, 20);
         bounds.setRange(1, -30, 40);
 
-        final MetaData metaData = new MetaData();
+        final Metadata metaData = new Metadata();
         metaData.name = "name";
         metaData.description = "description";
-        metaData.person = person;
-        metaData.copyRight = copyright;
+        metaData.author = person;
+        metaData.copyright = copyright;
         metaData.links.addAll(Arrays.asList(new URI("http://adress1.org"),new URI("http://adress2.org")));
         metaData.time = Instant.now();
         metaData.keywords = "test,sample";



Mime
View raw message