Alawn/Chronicle-Map
1
0
Fork 0
mirror of https://github.com/OpenHFT/Chronicle-Map.git synced 2021-09-13 01:26:12 +00:00
Code Releases Activity

HCOLL-211 Fixing a few tests to cover the use cases.

Browse Source
This commit is contained in:
Peter Lawrey
2014-12-10 17:49:00 +00:00
parent 18554f4ccc
commit c5396b23e8
15 changed files with 124 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java
+33 -19
View File
@@ -2,6 +2,7 @@ package net.openhft.chronicle.map;
import net.openhft.lang.io.serialization.impl.*;
import net.openhft.lang.values.*;
import org.junit.Ignore;
import org.junit.Test;
import java.nio.ByteBuffer;
@@ -18,8 +19,8 @@ import static org.junit.Assert.*;
public class CHMUseCasesTest {
/**
* String is not as efficient as CharSequence as a key or value but easier to use The key can
* only be on heap and variable length serialised.
* String is not as efficient as CharSequence as a key or value but easier to use The key can only be on heap and
* variable length serialised.
*/
@Test
public void testStringStringMap() throws ExecutionException, InterruptedException {
@@ -32,8 +33,7 @@ public class CHMUseCasesTest {
try (ChronicleMap<String, String> map = chmb.create()) {
*/
try (ChronicleMap<String, String> map = ChronicleMapBuilder
.of(String.class, String.class)
.checkSerializedValues() // for testing purposes only
.of(String.class, String.class) // for testing purposes only
.create()) {
map.put("Hello", "World");
assertEquals("World", map.get("Hello"));
@@ -67,8 +67,7 @@ public class CHMUseCasesTest {
try (ChronicleMap<String, String> map = chmb.create()) {
*/
try (ChronicleMap<String, String> map = ChronicleMapBuilder
.of(String.class, String.class)
.checkSerializedValues() // for testing purposes only
.of(String.class, String.class) // for testing purposes only
.create()) {
map.put("Hello", "World");
@@ -79,20 +78,18 @@ public class CHMUseCasesTest {
return "New " + s;
}
});
}
}
/**
* CharSequence is more efficient when object creation is avoided. The key can only be on heap
* and variable length serialised.
* CharSequence is more efficient when object creation is avoided. The key can only be on heap and variable length
* serialised.
*/
@Test
public void testCharSequenceCharSequenceMap() throws ExecutionException, InterruptedException {
try (ChronicleMap<CharSequence, CharSequence> map = ChronicleMapBuilder
.of(CharSequence.class, CharSequence.class)
.checkSerializedValues() // for testing purposes only
.of(CharSequence.class, CharSequence.class) // for testing purposes only
.defaultValue("")
.create()) {
map.put("Hello", "World");
StringBuilder key = new StringBuilder();
@@ -135,7 +132,7 @@ public class CHMUseCasesTest {
assertEquals("New World !!", map.get("Hello").toString());
assertEquals(null, map.putMapped("no-key", new
assertEquals("New !!", map.putMapped("no-key", new
UnaryOperator<CharSequence>() {
@Override
public CharSequence update(CharSequence s) {
@@ -153,8 +150,7 @@ public class CHMUseCasesTest {
@Test
public void testStringValueStringValueMap() {
try (ChronicleMap<StringValue, StringValue> map = ChronicleMapBuilder
.of(StringValue.class, StringValue.class)
.checkSerializedValues() // for testing purposes only
.of(StringValue.class, StringValue.class) // for testing purposes only
.create()) {
StringValue key1 = map.newKeyInstance();
StringValue key2 = map.newKeyInstance();
@@ -437,7 +433,8 @@ public class CHMUseCasesTest {
.keyMarshaller(ByteBufferMarshaller.INSTANCE)
.valueMarshaller(ByteBufferMarshaller.INSTANCE)
.disableOversizedEntries() // disabled for testing purposes only.
.entrySize(12)
// TODO does this have to be 14 bytes?
.entrySize(14)
.create()) {
ByteBuffer key1 = ByteBuffer.wrap(new byte[]{1, 1, 1, 1});
ByteBuffer key2 = ByteBuffer.wrap(new byte[]{2, 2, 2, 2});
@@ -510,7 +507,6 @@ public class CHMUseCasesTest {
try (WriteContext wc = map.acquireUsingLocked(key1, valueB)) {
assertBBEquals(value1, valueB);
appendMode(valueB);
valueB.putShort((short) 12345);
@@ -675,6 +671,26 @@ public class CHMUseCasesTest {
}
}
@Test
@Ignore("Generated code creates a field too large ie. it ignores the @Range")
public void testUnsignedIntValueUnsignedIntValueMapEntrySize() {
// TODO once this is working, merge the next test.
try (ChronicleMap<UnsignedIntValue, UnsignedIntValue> map = ChronicleMapBuilder
.of(UnsignedIntValue.class, UnsignedIntValue.class)
.disableOversizedEntries() // disabled for testing purposes only.
.entrySize(8)
.create()) {
UnsignedIntValue key1 = ChronicleMapBuilder.newInstance(UnsignedIntValue.class, true);
UnsignedIntValue value1 = ChronicleMapBuilder.newInstance(UnsignedIntValue.class, false);
key1.setValue(1);
value1.setValue(11);
map.put(key1, value1);
assertEquals(value1, map.get(key1));
}
}
/**
* For unsigned int -> unsigned int entries, the key can be on heap or off heap.
*/
@@ -682,8 +698,6 @@ public class CHMUseCasesTest {
public void testUnsignedIntValueUnsignedIntValueMap() {
try (ChronicleMap<UnsignedIntValue, UnsignedIntValue> map = ChronicleMapBuilder
.of(UnsignedIntValue.class, UnsignedIntValue.class)
.disableOversizedEntries() // disabled for testing purposes only.
.entrySize(8)
.create()) {
src/test/java/net/openhft/chronicle/map/ConcurrentMap8Test.java
+1 -1
View File
@@ -27,7 +27,7 @@ package net.openhft.chronicle.map;
/*import junit.framework.Test;
import junit.framework.TestSuite;*/
import net.openhft.chronicle.map.jrs166.JSR166TestCase;
import net.openhft.chronicle.map.jsr166.JSR166TestCase;
import java.util.concurrent.ConcurrentMap;
src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java
+1 -1
View File
@@ -18,7 +18,7 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.map.jrs166.JSR166TestCase;
import net.openhft.chronicle.map.jsr166.JSR166TestCase;
import org.junit.Test;
import java.io.IOException;
src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTest.java
+1 -1
View File
@@ -19,7 +19,7 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.hash.replication.TimeProvider;
import net.openhft.chronicle.map.jrs166.JSR166TestCase;
import net.openhft.chronicle.map.jsr166.JSR166TestCase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
src/test/java/net/openhft/chronicle/map/jrs166/JSR166TestCase.java → src/test/java/net/openhft/chronicle/map/jsr166/JSR166TestCase.java
+1 -1
View File
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.map.jrs166;
package net.openhft.chronicle.map.jsr166;
import junit.framework.AssertionFailedError;
import org.junit.After;
src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java → src/test/java/net/openhft/chronicle/map/jsr166/map/ChronicleMapTest.java
+2 -2
View File
@@ -16,11 +16,11 @@
* limitations under the License.
*/
package net.openhft.chronicle.map.jrs166.map;
package net.openhft.chronicle.map.jsr166.map;
import net.openhft.chronicle.map.ChronicleMap;
import net.openhft.chronicle.map.ChronicleMapBuilder;
import net.openhft.chronicle.map.jrs166.JSR166TestCase;
import net.openhft.chronicle.map.jsr166.JSR166TestCase;
import org.junit.Test;
import java.io.IOException;
src/test/java/net/openhft/chronicle/map/jrs166/map/LoopHelpers.java → src/test/java/net/openhft/chronicle/map/jsr166/map/LoopHelpers.java
+1 -1
View File
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.map.jrs166.map;
package net.openhft.chronicle.map.jsr166.map;
/*
* Written by Doug Lea with assistance from members of JCP JSR-166
src/test/java/net/openhft/chronicle/map/jrs166/map/MapCheck.java → src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java
+1 -1
View File
@@ -16,7 +16,7 @@
* limitations under the License.
*/
package net.openhft.chronicle.map.jrs166.map;
package net.openhft.chronicle.map.jsr166.map;
import net.openhft.chronicle.map.ChronicleMap;
import net.openhft.chronicle.map.ChronicleMapBuilder;
src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java → src/test/java/net/openhft/chronicle/map/jsr166/map/StatelessChronicleMapTest.java
+2 -2
View File
@@ -16,11 +16,11 @@
* limitations under the License.
*/
package net.openhft.chronicle.map.jrs166.map;
package net.openhft.chronicle.map.jsr166.map;
import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
import net.openhft.chronicle.map.*;
import net.openhft.chronicle.map.jrs166.JSR166TestCase;
import net.openhft.chronicle.map.jsr166.JSR166TestCase;
import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Before;