sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1826250 - in /sis/branches/JDK8/core: sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/ sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/ sis-utility/src/main/java/org/apache/sis/internal/util/ sis-utility/src/test/ja...
Date Thu, 08 Mar 2018 15:50:52 GMT
Author: desruisseaux
Date: Thu Mar  8 15:50:51 2018
New Revision: 1826250

URL: http://svn.apache.org/viewvc?rev=1826250&view=rev
Log:
Minor post-merge cleanup.

Modified:
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/CodeLists.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java
    sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java?rev=1826250&r1=1826249&r2=1826250&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
[UTF-8] Thu Mar  8 15:50:51 2018
@@ -105,7 +105,7 @@ public final strictfp class CodeListMars
     @Test
     public void testDefaultURL() throws JAXBException {
         final String expected = getResponsiblePartyXML(Schemas.METADATA_ROOT_LEGACY);
-        final Responsibility rp = (Responsibility) XML.unmarshal(expected);
+        final Responsibility rp = unmarshal(Responsibility.class, expected);
         assertEquals(Role.PRINCIPAL_INVESTIGATOR, rp.getRole());
         /*
          * Use the convenience method in order to avoid the effort of creating
@@ -123,7 +123,7 @@ public final strictfp class CodeListMars
     @Test
     public void testISO_URL() throws JAXBException {
         final String expected = getResponsiblePartyXML("http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/");
-        final Responsibility rp = (Responsibility) XML.unmarshal(expected);
+        final Responsibility rp = unmarshal(Responsibility.class, expected);
         assertEquals(Role.PRINCIPAL_INVESTIGATOR, rp.getRole());
 
         final MarshallerPool pool = getMarshallerPool();
@@ -173,7 +173,7 @@ public final strictfp class CodeListMars
          */
         marshaller.setProperty(XML.LOCALE, Locale.FRENCH);
         String expected = getCitationXML("fra", "Création", legacy);
-        CitationDate ci = (CitationDate) XML.unmarshal(expected);
+        CitationDate ci = unmarshal(CitationDate.class, expected);
         assertEquals(DateType.CREATION, ci.getDateType());
         String actual = marshal(marshaller, ci);
         assertXmlEquals(expected, actual, "xmlns:*");
@@ -182,7 +182,7 @@ public final strictfp class CodeListMars
          */
         marshaller.setProperty(XML.LOCALE, Locale.ENGLISH);
         expected = getCitationXML("eng", "Creation", legacy);
-        ci = (CitationDate) XML.unmarshal(expected);
+        ci = unmarshal(CitationDate.class, expected);
         assertEquals(DateType.CREATION, ci.getDateType());
         actual = marshal(marshaller, ci);
         assertXmlEquals(expected, actual, "xmlns:*");

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java?rev=1826250&r1=1826249&r2=1826250&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
[UTF-8] Thu Mar  8 15:50:51 2018
@@ -16,7 +16,6 @@
  */
 package org.apache.sis.internal.jaxb.lan;
 
-import org.apache.sis.test.mock.MetadataMock;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Locale;
@@ -29,8 +28,9 @@ import org.apache.sis.xml.XML;
 import org.apache.sis.xml.MarshallerPool;
 import org.apache.sis.internal.jaxb.Schemas;
 import org.apache.sis.internal.jaxb.LegacyNamespaces;
-import org.apache.sis.test.XMLTestCase;
+import org.apache.sis.test.mock.MetadataMock;
 import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.test.XMLTestCase;
 import org.junit.BeforeClass;
 import org.junit.AfterClass;
 import org.junit.Test;

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/CodeLists.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/CodeLists.java?rev=1826250&r1=1826249&r2=1826250&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/CodeLists.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/CodeLists.java
[UTF-8] Thu Mar  8 15:50:51 2018
@@ -20,10 +20,12 @@ import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.UndeclaredThrowableException;
 import org.opengis.util.CodeList;
-import org.opengis.util.ControlledVocabulary;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.Characters.Filter;
 
+// Branch-dependent imports
+import org.opengis.util.ControlledVocabulary;
+
 
 /**
  * Implementation of some {@link org.apache.sis.util.iso.Types} methods needed by {@code
sis-utility} module.

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java?rev=1826250&r1=1826249&r2=1826250&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java
[UTF-8] Thu Mar  8 15:50:51 2018
@@ -22,11 +22,13 @@ import java.util.TimeZone;
 import java.util.ResourceBundle;
 import java.util.MissingResourceException;
 import org.opengis.annotation.UML;
-import org.opengis.util.ControlledVocabulary;
 import org.apache.sis.internal.system.Modules;
 import org.apache.sis.internal.system.OptionalDependency;
 import org.apache.sis.util.CharSequences;
 
+// Branch-dependent imports
+import org.opengis.util.ControlledVocabulary;
+
 
 /**
  * Provides access to services defined in the {@code "sis-metadata"} module.

Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java?rev=1826250&r1=1826249&r2=1826250&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
[UTF-8] Thu Mar  8 15:50:51 2018
@@ -25,7 +25,7 @@ import org.junit.BeforeClass;
  * All tests from the {@code sis-utility} module, in approximative dependency order.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.0
  * @since   0.3
  * @module
  */



Mime
View raw message