sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1569946 - in /sis/trunk: ./ core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
Date Wed, 19 Feb 2014 22:47:27 GMT
Author: desruisseaux
Date: Wed Feb 19 22:47:27 2014
New Revision: 1569946

URL: http://svn.apache.org/r1569946
Log:
Skip the merge of geoapi-snapshot specific changes on the JDK6 branch.

Modified:
    sis/trunk/   (props changed)
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java

Propchange: sis/trunk/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1569917-1569943
  Merged /sis/branches/JDK6:r1569928-1569944

Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java?rev=1569946&r1=1569945&r2=1569946&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java
[UTF-8] Wed Feb 19 22:47:27 2014
@@ -73,11 +73,15 @@ public abstract strictfp class MetadataT
 
     /**
      * Returns the SIS implementation for the given GeoAPI interface.
+     *
+     * @return {@inheritDoc}
      */
     @Override
     protected <T> Class<? extends T> getImplementation(final Class<T> type)
{
         assertTrue(standard.isMetadata(type));
-        return standard.getImplementation(type).asSubclass(type);
+        final Class<?> impl = standard.getImplementation(type);
+        assertNotNull(type.getName(), impl);
+        return impl.asSubclass(type);
     }
 
     /**

Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java?rev=1569946&r1=1569945&r2=1569946&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
[UTF-8] Wed Feb 19 22:47:27 2014
@@ -214,6 +214,8 @@ public final strictfp class AllMetadataT
      * Returns the expected namespace for an element defined by the given specification.
      * For example the namespace of any type defined by {@link Specification#ISO_19115}
      * is {@code "http://www.isotc211.org/2005/gmd"}.
+     *
+     * @return {@inheritDoc}
      */
     @Override
     protected String getExpectedNamespace(final Class<?> impl, final Specification
specification) {
@@ -226,6 +228,8 @@ public final strictfp class AllMetadataT
     /**
      * Returns the type of the given element, or {@code null} if the type is not yet
      * determined (the later cases could change in a future version).
+     *
+     * @return {@inheritDoc}
      */
     @Override
     protected String getExpectedTypeForElement(final Class<?> type, final Class<?>
impl) {
@@ -251,6 +255,8 @@ public final strictfp class AllMetadataT
     /**
      * Returns the ISO 19139 wrapper for the given GeoAPI type,
      * or {@code null} if no adapter is expected for the given type.
+     *
+     * @return {@inheritDoc}
      */
     @Override
     protected Class<?> getWrapperFor(final Class<?> type) throws ClassNotFoundException
{
@@ -272,6 +278,8 @@ public final strictfp class AllMetadataT
 
     /**
      * Return {@code false} for the Apache SIS properties which are known to have no setter
methods.
+     *
+     * @return {@inheritDoc}
      */
     @Override
     protected boolean isWritable(final Class<?> impl, final String property) {



Mime
View raw message