sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1823544 - in /sis/branches/ISO-19115-3/core/sis-utility/src: main/java/org/apache/sis/xml/ test/java/org/apache/sis/internal/jaxb/gmd/ test/java/org/apache/sis/xml/
Date Thu, 08 Feb 2018 09:48:56 GMT
Author: desruisseaux
Date: Thu Feb  8 09:48:56 2018
New Revision: 1823544

URL: http://svn.apache.org/viewvc?rev=1823544&view=rev
Log:
Minor clarifications in test documentation. Starting from this commit, sis-utility module
is back in buildable state with tests enabled. There is know test failures in sis-metadata
to be fixed in next commits.

Modified:
    sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredEvent.java
    sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/LanguageCodeTest.java
    sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java
    sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredEvent.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredEvent.java?rev=1823544&r1=1823543&r2=1823544&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredEvent.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredEvent.java
[UTF-8] Thu Feb  8 09:48:56 2018
@@ -79,10 +79,10 @@ abstract class FilteredEvent<E extends X
     @Override public Characters   asCharacters()            {throw new ClassCastException();}
     @Override public Location     getLocation()             {return event.getLocation();}
     @Override public QName        getSchemaType()           {return event.getSchemaType();}
-    final     public QName        getName()                 {return name;}
+    public    final  QName        getName()                 {return name;}
 
     /**
-     * Append the name to the given output.
+     * Appends the name to the given output.
      * This is a convenience method for {@link #write(Appendable)} implementations.
      */
     final Appendable name(final Appendable out) throws IOException {

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/LanguageCodeTest.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/LanguageCodeTest.java?rev=1823544&r1=1823543&r2=1823544&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/LanguageCodeTest.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/LanguageCodeTest.java
[UTF-8] Thu Feb  8 09:48:56 2018
@@ -44,6 +44,9 @@ import static org.apache.sis.internal.ut
  * The locale is marshalled as a character string. This format was used by ISO 19139:2007
  * but is not used anymore in ISO 19115-3 (the newer version use {@code PT_Locale} instead).
  *
+ * <p>This class also test indirectly the {@link org.apache.sis.xml} capability to
map the legacy
+ * {@code "http://www.isotc211.org/2005/gmd"} namespace to {@code "http://standards.iso.org/…"}.</p>
+ *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0
  * @since   0.3
@@ -76,6 +79,9 @@ public final strictfp class LanguageCode
      * Creates the XML (un)marshaller pool to be shared by all test methods.
      * The (un)marshallers locale and timezone will be set to fixed values.
      *
+     * <p>This test uses its own pool instead of {@link XMLTestCase#getMarshallerPool()}
because it
+     * uses {@link MetadataMock} instead of {@link org.apache.sis.metadata.iso.DefaultMetadata}.</p>
+     *
      * @throws JAXBException if an error occurred while creating the pool.
      *
      * @see #disposeMarshallerPool()

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java?rev=1823544&r1=1823543&r2=1823544&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java
[UTF-8] Thu Feb  8 09:48:56 2018
@@ -30,6 +30,9 @@ import org.apache.sis.xml.Namespaces;
 /**
  * A dummy implementation of {@link org.opengis.metadata.Metadata} with minimal XML (un)marshalling
capability.
  * Used for testing marshalling of legacy ISO 19139:2007 attributes.
+ * Contrarily to {@link org.apache.sis.metadata.iso.DefaultMetadata}, this mock does not
set automatically
+ * the {@link org.apache.sis.xml.XML#LOCALE} attribute according the {@code <mdb:defaultLocale>}
element.
+ * So this mock makes easier to test localization aspects without the interference of automatic
mechanism.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.0

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java?rev=1823544&r1=1823543&r2=1823544&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
[UTF-8] Thu Feb  8 09:48:56 2018
@@ -34,7 +34,7 @@ import static org.junit.Assume.assumeTru
  *   <li>Invoke every public methods from the {@code NamespacePrefixMapper} class.
  *       If we failed to override an abstract method, we will get an {@link AbstractMethodError}.</li>
  *   <li>For specific methods like {@link OGCNamespacePrefixMapper#getPreferredPrefix(String,
String,
- *       boolean)}, use some value which will prove us that the overriden method has been
invoked.</li>
+ *       boolean)}, use some value which will prove us that the overridden method has been
invoked.</li>
  * </ul>
  *
  * @author  Martin Desruisseaux (Geomatys)



Mime
View raw message