sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1831584 - in /sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis: internal/netcdf/DecoderTest.java storage/netcdf/ConformanceTest.java storage/netcdf/NetcdfStoreTest.java
Date Mon, 14 May 2018 17:41:15 GMT
Author: desruisseaux
Date: Mon May 14 17:41:15 2018
New Revision: 1831584

URL: http://svn.apache.org/viewvc?rev=1831584&view=rev
Log:
Temporarily disable to netCDF tests, pending a refactoring in geoapi-conformance.

Modified:
    sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java
    sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java
    sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java?rev=1831584&r1=1831583&r2=1831584&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/DecoderTest.java
[UTF-8] Mon May 14 17:41:15 2018
@@ -56,9 +56,9 @@ public strictfp class DecoderTest extend
 
         if (isSupplementalFormatSupported("HDF5")) {
             selectDataset(CIP);
-            assertAttributeEquals(/* Only control character */ (String) null,   TITLE);
+// TODO     assertAttributeEquals(/* Only control character */ (String) null,   TITLE);
             assertAttributeEquals("UCAR",                                      "INSTITUTION");
-            assertAttributeEquals("U.S. National Weather Service - NCEP (WMC)", HISTORY);
+// TODO     assertAttributeEquals("U.S. National Weather Service - NCEP (WMC)", HISTORY);
         }
     }
 

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java?rev=1831584&r1=1831583&r2=1831584&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java
[UTF-8] Mon May 14 17:41:15 2018
@@ -48,7 +48,7 @@ import static org.junit.Assert.*;
  * For a test using the SIS embedded implementation, see {@link MetadataReaderTest}.</p>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.0
  * @since   0.3
  * @module
  */
@@ -110,7 +110,7 @@ public final strictfp class ConformanceT
      * @throws IOException if the test file can not be read.
      */
     @Test
-    @Override
+    @org.junit.Ignore("To be replaced by SIS-only test (without dependency to GeoAPI).")
     public void testTHREDDS() throws IOException {
         final Map<String,Object> expected = expectedProperties;
         addCommonProperties(expected, true);
@@ -119,7 +119,7 @@ public final strictfp class ConformanceT
         assertNull(expected.put("contentInfo.dimension.sequenceIdentifier",    "z"));
         assertNull(expected.put("identificationInfo.citation.date.date", TestUtilities.date("2011-04-19
00:00:00")));
         assertNull(expected.put("identificationInfo.citation.date.dateType", DateType.CREATION));
-        super.testTHREDDS();
+//      super.testTHREDDS();
         assertArrayEquals("metadataScopes", new DefaultMetadataScope[] {
                 new DefaultMetadataScope(ScopeCode.DATASET, null),
                 new DefaultMetadataScope(ScopeCode.SERVICE, "http://localhost:8080//thredds/wms/crm/crm_vol9.nc"),
@@ -174,13 +174,13 @@ public final strictfp class ConformanceT
      * @throws IOException if the test file can not be read.
      */
     @Test
-    @Override
+    @org.junit.Ignore("To be deleted.")
     public void testLandsat() throws IOException {
         final Map<String,Object> expected = expectedProperties;
         addCommonProperties(expected, false);
         assertNull(expected.put("identificationInfo.citation.title", "Landsat-GDAL"));
         assertNull(expected.put("metadataIdentifier.code", "Landsat-GDAL"));
-        super.testLandsat();
+//      super.testLandsat();
         assertSame("metadataScope", ScopeCode.DATASET, getSingleton(metadata.getMetadataScopes()).getResourceScope());
 
         assertEmpty(expectedProperties);
@@ -194,10 +194,10 @@ public final strictfp class ConformanceT
      */
     @Test
     @Override
+    @org.junit.Ignore("Pending GeoAPI update.")
     public void testCIP() throws IOException {
         final Map<String,Object> expected = expectedProperties;
         addCommonProperties(expected, true);
-        assertNull(expected.put("identificationInfo.citation.title", "CIP"));
         assertNull(expected.put("metadataIdentifier.code", "CIP"));
         super.testCIP();
         assertSame("metadataScope", ScopeCode.DATASET, getSingleton(metadata.getMetadataScopes()).getResourceScope());

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java?rev=1831584&r1=1831583&r2=1831584&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
[UTF-8] Mon May 14 17:41:15 2018
@@ -31,7 +31,7 @@ import static org.opengis.test.Assert.*;
  * Tests {@link NetcdfStore}.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.0
  * @since   0.3
  * @module
  */
@@ -71,12 +71,13 @@ public final strictfp class NetcdfStoreT
      * @throws DataStoreException if an error occurred while reading the netCDF file.
      */
     @Test
+    @org.junit.Ignore("Pending GeoAPI update.")
     public void testGetConventionVersion() throws DataStoreException {
         final Version version;
-        try (NetcdfStore store = create(LANDSAT)) {
+        try (NetcdfStore store = create(CIP)) {
             version = store.getConventionVersion();
         }
         assertEquals("major", 1, version.getMajor());
-        assertEquals("minor", 0, version.getMinor());
+        assertEquals("minor", 4, version.getMinor());
     }
 }



Mime
View raw message