sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1515765 [2/2] - in /sis/trunk: ./ application/sis-console/src/main/java/org/apache/sis/console/ application/sis-console/src/main/resources/org/apache/sis/console/ core/sis-utility/src/main/java/org/apache/sis/internal/util/ core/sis-utilit...
Date Tue, 20 Aug 2013 10:39:09 GMT
Modified: sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/XMLStoreProviderTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/XMLStoreProviderTest.java?rev=1515765&r1=1515764&r2=1515765&view=diff
==============================================================================
--- sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/XMLStoreProviderTest.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/XMLStoreProviderTest.java
[UTF-8] Tue Aug 20 10:39:08 2013
@@ -36,15 +36,17 @@ import static org.junit.Assert.*;
  */
 public final strictfp class XMLStoreProviderTest extends TestCase {
     /**
-     * Tests {@link XMLStoreProvider#canOpen(StorageConnector)} method from a {@link Reader}
object.
+     * Tests {@link XMLStoreProvider#probeContent(StorageConnector)} method from a {@link
Reader} object.
      *
      * @throws DataStoreException Should never happen.
      */
     @Test
-    public void testCanOpenFromReader() throws DataStoreException {
+    public void testProbeContentFromReader() throws DataStoreException {
         final XMLStoreProvider p = new XMLStoreProvider();
         final StorageConnector c = new StorageConnector(new StringReader(XMLStoreTest.XML));
-        assertEquals(ProbeResult.SUPPORTED, p.canOpen(c));
+        final ProbeResult      r = p.probeContent(c);
         c.closeAllExcept(null);
+        assertTrue  ("isSupported()", r.isSupported());
+        assertEquals("getMimeType()", "application/vnd.iso.19139+xml", r.getMimeType());
     }
 }

Modified: sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/XMLStoreTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/XMLStoreTest.java?rev=1515765&r1=1515764&r2=1515765&view=diff
==============================================================================
--- sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/XMLStoreTest.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/XMLStoreTest.java
[UTF-8] Tue Aug 20 10:39:08 2013
@@ -46,7 +46,7 @@ public final strictfp class XMLStoreTest
     /**
      * The metadata to unmarshal.
      */
-    static final String XML =
+    public static final String XML =
             "<?xml version=\"1.0\" standalone=\"yes\"?>\n" +
             "<gmd:MD_Metadata\n" +
             "  xmlns:gmd = \"" + Namespaces.GMD + "\"\n"  +

Modified: sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java?rev=1515765&r1=1515764&r2=1515765&view=diff
==============================================================================
--- sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java
[UTF-8] Tue Aug 20 10:39:08 2013
@@ -33,9 +33,12 @@ import org.junit.BeforeClass;
     org.apache.sis.internal.storage.IOUtilitiesTest.class,
     org.apache.sis.internal.storage.ChannelDataInputTest.class,
     org.apache.sis.internal.storage.ChannelImageInputStreamTest.class,
+    org.apache.sis.storage.ProbeResultTest.class,
     org.apache.sis.storage.StorageConnectorTest.class,
+    org.apache.sis.internal.storage.xml.MimeTypeDetectorTest.class,
     org.apache.sis.internal.storage.xml.XMLStoreProviderTest.class,
     org.apache.sis.internal.storage.xml.XMLStoreTest.class,
+    org.apache.sis.storage.DataStoresTest.class,
     org.apache.sis.index.GeoHashCoderTest.class
 })
 public final strictfp class StorageTestSuite extends TestSuite {



Mime
View raw message