From 698a49d068457217e89772a2a4fc0c2da4ba0443 Mon Sep 17 00:00:00 2001 From: Peter Lawrey Date: Wed, 10 Dec 2014 17:52:32 +0000 Subject: [PATCH] HCOLL-211 Fixing a few tests to cover the use cases. --- .../java/net/openhft/chronicle/map/VanillaChronicleMap.java | 5 +++-- src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java index 18b3d0379..af5314f64 100755 --- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java @@ -37,6 +37,7 @@ import net.openhft.lang.collection.SingleThreadedDirectBitSet; import net.openhft.lang.io.*; import net.openhft.lang.io.serialization.JDKObjectSerializer; import net.openhft.lang.io.serialization.ObjectSerializer; +import net.openhft.lang.model.DataValueClasses; import net.openhft.lang.threadlocal.Provider; import net.openhft.lang.threadlocal.StatefulCopyable; import net.openhft.lang.threadlocal.ThreadLocalCopies; @@ -645,8 +646,8 @@ class VanillaChronicleMap, if (interfaceClass.isEnum()) - return isKey ? DataValueClasses.newDirectReference(interfaceClass) : DataValueClasses - .newDirectInstance(interfaceClass); + return isKey ? DataValueClasses.newDirectReference(interfaceClass) + : DataValueClasses.newDirectInstance(interfaceClass); else if (!offHeapReference(interfaceClass) && !interfaceClass.isInterface() && !builtInType(interfaceClass)) { diff --git a/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java b/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java index 328a4ceea..4860e2903 100644 --- a/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java +++ b/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java @@ -680,8 +680,8 @@ public class CHMUseCasesTest { .disableOversizedEntries() // disabled for testing purposes only. .entrySize(8) .create()) { - UnsignedIntValue key1 = ChronicleMapBuilder.newInstance(UnsignedIntValue.class, true); - UnsignedIntValue value1 = ChronicleMapBuilder.newInstance(UnsignedIntValue.class, false); + UnsignedIntValue key1 = map.newKeyInstance(); + UnsignedIntValue value1 = map.newValueInstance(); key1.setValue(1); value1.setValue(11);