Cut blank lines

This commit is contained in:
Peter Lawrey
2016-07-07 20:33:40 +01:00
parent 6e23ba5a12
commit a230c08e89
36 changed files with 36 additions and 183 deletions
@@ -158,7 +158,6 @@ interface IBean {
@RunWith(value = Parameterized.class)
public class CHMUseCasesTest {
static volatile int i = 0;
private final TypeOfMap typeOfMap;
@@ -238,7 +237,6 @@ public class CHMUseCasesTest {
assertEquals(map1.size(), map2.size());
for (Object key : map1.keySet()) {
if (map1.valueClass() == byte[].class)
@@ -250,7 +248,6 @@ public class CHMUseCasesTest {
byte[][] o1 = (byte[][]) map1.get(key);
byte[][] o2 = (byte[][]) map2.get(key);
Assert.assertEquals(o1.length, o2.length);
for (int i = 0; i < o1.length; i++) {
Assert.assertArrayEquals(o1[i], o2[i]);
@@ -289,7 +286,6 @@ public class CHMUseCasesTest {
try (ChronicleMap actual = builder.create()) {
actual.putAll(file);
if (map1.valueClass() == char[].class ||
map1.valueClass() == byte[].class ||
map1.valueClass() == byte[][].class) {
@@ -448,8 +444,7 @@ public class CHMUseCasesTest {
mpx1030.setAskPx(109.7);
mpx1030.setBidPx(107.6);
}
}
}
}
@@ -532,7 +527,6 @@ public class CHMUseCasesTest {
public void testStringStringMap() throws ExecutionException, InterruptedException,
IOException {
ChronicleMapBuilder<String, String> builder = ChronicleMapBuilder
.of(String.class, String.class)
.entries(1);
@@ -603,7 +597,6 @@ public class CHMUseCasesTest {
public void testCharSequenceCharSequenceMap()
throws ExecutionException, InterruptedException, IOException {
ChronicleMapBuilder<CharSequence, CharSequence> builder = ChronicleMapBuilder
.of(CharSequence.class, CharSequence.class)
.entries(10);
@@ -623,7 +616,6 @@ public class CHMUseCasesTest {
map.remove("key-1");
assertNull(map.getUsing(key, value));
assertEquals("New World", map.getMapped("Hello", s -> "New " + s));
assertEquals(null, map.getMapped("No key",
(SerializableFunction<CharSequence, CharSequence>) s -> "New " + s));
@@ -647,7 +639,6 @@ public class CHMUseCasesTest {
@Test
public void testAcquireUsingWithCharSequence() throws IOException {
ChronicleMapBuilder<CharSequence, CharSequence> builder = ChronicleMapBuilder
.of(CharSequence.class, CharSequence.class)
.entries(1);
@@ -693,7 +684,6 @@ public class CHMUseCasesTest {
try (ChronicleMap<IntValue, CharSequence> map = newInstance(builder)) {
IntValue using = Values.newHeapInstance(IntValue.class);
using.setValue(1);
@@ -716,7 +706,6 @@ public class CHMUseCasesTest {
try (ChronicleMap<IntValue, StringBuilder> map = newInstance(builder)) {
IntValue key = Values.newHeapInstance(IntValue.class);
key.setValue(1);
@@ -921,7 +910,6 @@ public class CHMUseCasesTest {
map.put(key1, value1);
assertEquals(value1, map.get(key1));
key2 = 2;
value2 = 22;
map.put(key2, value2);
@@ -964,7 +952,6 @@ public class CHMUseCasesTest {
@Test
public void testLongLongMap() throws ExecutionException, InterruptedException, IOException {
ChronicleMapBuilder<Long, Long> builder = ChronicleMapBuilder
.of(Long.class, Long.class)
.entries(10);
@@ -1005,7 +992,6 @@ public class CHMUseCasesTest {
@Test
public void testDoubleDoubleMap() throws ExecutionException, InterruptedException, IOException {
ChronicleMapBuilder<Double, Double> builder = ChronicleMapBuilder
.of(Double.class, Double.class)
.entries(10);
@@ -1035,9 +1021,7 @@ public class CHMUseCasesTest {
} catch (Exception todoMoreSpecificException) {
}
}
}
}
@Test
@@ -1060,7 +1044,6 @@ public class CHMUseCasesTest {
map.put(key1, value1);
assertTrue(Arrays.equals(new byte[]{11, 11},
map.getMapped(key1, new SerializableFunction<byte[], byte[]>() {
@Override
@@ -1085,7 +1068,6 @@ public class CHMUseCasesTest {
byte[] a2 = map.get(key1);
assertTrue(Arrays.equals(new byte[]{12, 10}, a2));
}
}
@@ -1101,7 +1083,6 @@ public class CHMUseCasesTest {
try (ChronicleMap<ByteBuffer, ByteBuffer> map = newInstance(builder)) {
ByteBuffer key1 = ByteBuffer.wrap(new byte[]{1, 1, 1, 1});
ByteBuffer key2 = ByteBuffer.wrap(new byte[]{2, 2, 2, 2});
ByteBuffer value1 = ByteBuffer.wrap(new byte[]{11, 11, 11, 11});
@@ -1111,7 +1092,6 @@ public class CHMUseCasesTest {
assertBBEquals(value2, map.get(key1));
assertNull(map.get(key2));
map.put(key1, value1);
mapChecks();
@@ -1130,7 +1110,6 @@ public class CHMUseCasesTest {
try (ChronicleMap<ByteBuffer, ByteBuffer> map = newInstance(builder)) {
ByteBuffer key1 = ByteBuffer.wrap(new byte[]{1, 1, 1, 1});
ByteBuffer key2 = ByteBuffer.wrap(new byte[]{2, 2, 2, 2});
ByteBuffer value1 = ByteBuffer.wrap(new byte[]{11, 11, 11, 11});
@@ -1201,12 +1180,10 @@ public class CHMUseCasesTest {
valueA.flip();
}
value1.clear();
value1.putInt(12345);
value1.flip();
try (net.openhft.chronicle.core.io.Closeable c =
map.acquireContext(key1, valueB)) {
assertBBEquals(value1, valueB);
@@ -1241,7 +1218,6 @@ public class CHMUseCasesTest {
try (ChronicleMap<ByteBuffer, ByteBuffer> map = newInstance(builder)) {
ByteBuffer key1 = ByteBuffer.wrap(new byte[]{1, 1, 1, 1});
ByteBuffer key2 = ByteBuffer.wrap(new byte[]{2, 2, 2, 2});
ByteBuffer value1 = ByteBuffer.allocateDirect(4);
@@ -1299,7 +1275,6 @@ public class CHMUseCasesTest {
IntValue value1 = Values.newHeapInstance(IntValue.class);
IntValue value2 = Values.newHeapInstance(IntValue.class);
key1.setValue(1);
value1.setValue(11);
map.put(key1, value1);
@@ -1517,7 +1492,6 @@ public class CHMUseCasesTest {
// this may change due to alignment
// assertEquals(6, entrySize(map));
// assertEquals(1, ((VanillaChronicleMap) map).maxChunksPerEntry);
IntValue key1 = Values.newHeapInstance(IntValue.class);
IntValue key2 = Values.newHeapInstance(IntValue.class);
@@ -1621,7 +1595,6 @@ public class CHMUseCasesTest {
try (ChronicleMap<IntValue, UnsignedShortValue> map = newInstance(builder)) {
// this may change due to alignment
// assertEquals(8, entrySize(map));
assertEquals(1, ((VanillaChronicleMap) map).maxChunksPerEntry);
@@ -1726,7 +1699,6 @@ public class CHMUseCasesTest {
try (ChronicleMap<IntValue, CharValue> map = newInstance(builder)) {
assertEquals(1, ((VanillaChronicleMap) map).maxChunksPerEntry);
IntValue key1 = Values.newHeapInstance(IntValue.class);
IntValue key2 = Values.newHeapInstance(IntValue.class);
@@ -1826,7 +1798,6 @@ public class CHMUseCasesTest {
try (ChronicleMap<IntValue, UnsignedByteValue> map = newInstance(builder)) {
// TODO should be 5, but shorter fields based on range doesn't seem to be implemented
// on data value generation level yet
//assertEquals(8, entrySize(map)); this may change due to alignmented
@@ -1837,7 +1808,6 @@ public class CHMUseCasesTest {
UnsignedByteValue value1 = Values.newHeapInstance(UnsignedByteValue.class);
UnsignedByteValue value2 = Values.newHeapInstance(UnsignedByteValue.class);
key1.setValue(1);
value1.setValue(11);
map.put(key1, value1);
@@ -1933,7 +1903,6 @@ public class CHMUseCasesTest {
try (ChronicleMap<IntValue, BooleanValue> map = newInstance(builder)) {
assertEquals(1, ((VanillaChronicleMap) map).maxChunksPerEntry);
IntValue key1 = Values.newHeapInstance(IntValue.class);
@@ -1941,7 +1910,6 @@ public class CHMUseCasesTest {
BooleanValue value1 = Values.newHeapInstance(BooleanValue.class);
BooleanValue value2 = Values.newHeapInstance(BooleanValue.class);
key1.setValue(1);
value1.setValue(true);
map.put(key1, value1);
@@ -2044,7 +2012,6 @@ public class CHMUseCasesTest {
FloatValue value1 = Values.newHeapInstance(FloatValue.class);
FloatValue value2 = Values.newHeapInstance(FloatValue.class);
key1.setValue(1);
value1.setValue(11);
map.put(key1, value1);
@@ -2150,7 +2117,6 @@ public class CHMUseCasesTest {
DoubleValue value1 = Values.newHeapInstance(DoubleValue.class);
DoubleValue value2 = Values.newHeapInstance(DoubleValue.class);
key1.setValue(1);
value1.setValue(11);
assertEquals(null, map.get(key1));
@@ -2257,7 +2223,6 @@ public class CHMUseCasesTest {
LongValue value1 = Values.newHeapInstance(LongValue.class);
LongValue value2 = Values.newHeapInstance(LongValue.class);
key1.setValue(1);
value1.setValue(11);
assertEquals(null, map.get(key1));
@@ -2350,7 +2315,6 @@ public class CHMUseCasesTest {
.valueMarshaller(ListMarshaller.of(
new StringBytesReader(), CharSequenceBytesWriter.INSTANCE));
try (ChronicleMap<String, List<String>> map = newInstance(builder)) {
map.put("1", Collections.<String>emptyList());
map.put("2", asList("two-A"));
@@ -2397,7 +2361,6 @@ public class CHMUseCasesTest {
.valueMarshaller(SetMarshaller.of(
new StringBytesReader(), CharSequenceBytesWriter.INSTANCE));
try (ChronicleMap<String, Set<String>> map = newInstance(builder)) {
map.put("1", Collections.<String>emptySet());
map.put("2", new LinkedHashSet<>(asList("one")));
@@ -2445,7 +2408,6 @@ public class CHMUseCasesTest {
.entries(3)
.valueMarshaller(valueMarshaller);
try (ChronicleMap<String, Map<String, String>> map = newInstance(builder)) {
map.put("1", Collections.<String, String>emptyMap());
map.put("2", mapOf("one", "uni"));
@@ -2602,7 +2564,6 @@ public class CHMUseCasesTest {
enum TypeOfMap {SIMPLE, SIMPLE_PERSISTED}
interface I1 {
@Array(length = 10)
String getStrAt(int i);