You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2016/03/30 13:25:07 UTC
svn commit: r1737101 [7/7] - in /sis/branches/JDK6: ./
application/sis-console/src/main/artifact/conf/
core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/
core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/
core/sis-meta...
Modified: sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/ChannelDataOutputTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/ChannelDataOutputTest.java?rev=1737101&r1=1737100&r2=1737101&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/ChannelDataOutputTest.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/ChannelDataOutputTest.java [UTF-8] Wed Mar 30 11:25:06 2016
@@ -82,7 +82,7 @@ public strictfp class ChannelDataOutputT
referenceStream = new DataOutputStream(expectedData);
testedStreamBackingArray = new byte[streamLength];
testedStream = new ChannelDataOutput(testName,
- new ByteArrayChannel(testedStreamBackingArray), ByteBuffer.allocate(bufferLength));
+ new ByteArrayChannel(testedStreamBackingArray, false), ByteBuffer.allocate(bufferLength));
}
/**
Modified: sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/ChannelImageOutputStreamTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/ChannelImageOutputStreamTest.java?rev=1737101&r1=1737100&r2=1737101&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/ChannelImageOutputStreamTest.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/ChannelImageOutputStreamTest.java [UTF-8] Wed Mar 30 11:25:06 2016
@@ -48,7 +48,7 @@ public final strictfp class ChannelImage
referenceStream = new MemoryCacheImageOutputStream(expectedData);
testedStreamBackingArray = new byte[streamLength];
testedStream = new ChannelImageOutputStream(fileName,
- new ByteArrayChannel(testedStreamBackingArray), ByteBuffer.allocate(bufferLength));
+ new ByteArrayChannel(testedStreamBackingArray, false), ByteBuffer.allocate(bufferLength));
}
/**
Modified: sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java?rev=1737101&r1=1737089&r2=1737101&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java [UTF-8] Wed Mar 30 11:25:06 2016
@@ -61,8 +61,11 @@ public final class StoreTest extends Tes
@org.junit.Ignore("Pending completion of sis-referencing")
public void testGetMetadata() throws DataStoreException {
final Metadata metadata;
- try (Store store = new Store(new StorageConnector(new StringReader(TEST_DATA)))) {
+ Store store = new Store(new StorageConnector(new StringReader(TEST_DATA)));
+ try {
metadata = store.getMetadata();
+ } finally {
+ store.close();
}
final SpatialTemporalExtent extent = (SpatialTemporalExtent) getSingleton(getSingleton(getSingleton(
metadata.getIdentificationInfo()).getExtents()).getTemporalElements());
@@ -82,13 +85,16 @@ public final class StoreTest extends Tes
*/
@Test
public void testGetFeatures() throws DataStoreException {
- try (Store store = new Store(new StorageConnector(new StringReader(TEST_DATA)))) {
+ Store store = new Store(new StorageConnector(new StringReader(TEST_DATA)));
+ try {
final Iterator<Feature> it = store.getFeatures();
assertFeatureEquals(it.next(), "a", new double[] {11, 2, 12, 3}, "walking", 1);
assertFeatureEquals(it.next(), "b", new double[] {10, 2, 11, 3}, "walking", 2);
assertFeatureEquals(it.next(), "a", new double[] {12, 3, 10, 3}, "walking", 2);
assertFeatureEquals(it.next(), "c", new double[] {12, 1, 10, 2, 11, 3}, "vehicle", 1);
assertFalse(it.hasNext());
+ } finally {
+ store.close();
}
}
Modified: sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java?rev=1737101&r1=1737100&r2=1737101&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java [UTF-8] Wed Mar 30 11:25:06 2016
@@ -35,6 +35,7 @@ import org.junit.BeforeClass;
org.apache.sis.internal.storage.ChannelDataOutputTest.class,
org.apache.sis.internal.storage.ChannelImageInputStreamTest.class,
org.apache.sis.internal.storage.ChannelImageOutputStreamTest.class,
+ org.apache.sis.internal.storage.HyperRectangleReaderTest.class,
org.apache.sis.storage.ProbeResultTest.class,
org.apache.sis.storage.StorageConnectorTest.class,
org.apache.sis.internal.storage.xml.MimeTypeDetectorTest.class,
@@ -42,6 +43,7 @@ import org.junit.BeforeClass;
org.apache.sis.internal.storage.xml.StoreTest.class,
org.apache.sis.internal.storage.wkt.StoreProviderTest.class,
org.apache.sis.internal.storage.wkt.StoreTest.class,
+ org.apache.sis.internal.storage.csv.StoreTest.class,
org.apache.sis.storage.DataStoresTest.class,
org.apache.sis.index.GeoHashCoderTest.class
})