add tests

Author: lecousin

net.lecousin.core/src/main/java/net/lecousin/framework/collections/map/IntegerMapLinkedArrayList.java

@@ -45,6 +45,7 @@ public Entry(int key, T value) {
 	public void clear() {
 		for (LinkedArrayList<Entry<T>> bucket : buckets)
 			bucket.clear();
+		size = 0;
 	}
 
 	@Override
@@ -58,6 +59,7 @@ public T put(int key, T entry) {
 				return previous;
 			}
 		buckets[b].add(new Entry<T>(key, entry));
+		size++;
 		return null;
 	}
 
@@ -79,6 +81,7 @@ public T remove(int key) {
 			Entry<T> e = it.next();
 			if (e.key == key) {
 				it.remove();
+				size--;
 				return e.value;
 			}
 		}

net.lecousin.core/src/test/java/net/lecousin/framework/core/test/collections/sort/TestSortedAssociatedWithInteger.java

@@ -166,6 +166,19 @@ protected void check(Sorted.AssociatedWithInteger<Object> sorted, TreeSet<Intege
 		}
 		Assert.assertEquals(sorted.size(), nb);
 		Assert.assertFalse(it2.hasNext());
+
+		it1 = sorted.reverseOrderIterator();
+		it2 = order.descendingIterator();
+		nb = 0;
+		while (it1.hasNext()) {
+			Assert.assertTrue(it2.hasNext());
+			Object o = it1.next();
+			Integer i = it2.next();
+			Assert.assertEquals(i.intValue(), -((Integer)o).intValue());
+			nb++;
+		}
+		Assert.assertEquals(sorted.size(), nb);
+		Assert.assertFalse(it2.hasNext());
 	}
 
 }

net.lecousin.core/src/test/java/net/lecousin/framework/core/test/collections/sort/TestSortedAssociatedWithLong.java

@@ -166,6 +166,19 @@ protected void check(Sorted.AssociatedWithLong<Object> sorted, TreeSet<Long> ord
 		}
 		Assert.assertEquals(sorted.size(), nb);
 		Assert.assertFalse(it2.hasNext());
+
+		it1 = sorted.reverseOrderIterator();
+		it2 = order.descendingIterator();
+		nb = 0;
+		while (it1.hasNext()) {
+			Assert.assertTrue(it2.hasNext());
+			Object o = it1.next();
+			Long i = it2.next();
+			Assert.assertEquals(i.longValue(), -((Long)o).longValue());
+			nb++;
+		}
+		Assert.assertEquals(sorted.size(), nb);
+		Assert.assertFalse(it2.hasNext());
 	}
 
 }

net.lecousin.core/src/test/java/net/lecousin/framework/core/test/io/TestOutputToInput.java

@@ -51,7 +51,9 @@ public void testWriteSyncReadHalfSync() throws Exception {
 			readHalfSync(o2i, (nbRead % 2) == 0, b);
 			nbRead++;
 		}
+		Assert.assertFalse(o2i.isFullDataAvailable());
 		o2i.endOfData();
+		Assert.assertTrue(o2i.isFullDataAvailable());
 		while (nbRead < nbBuf * 2) {
 			readHalfSync(o2i, (nbRead % 2) == 0, b);
 			nbRead++;

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/collections/maps/TestIntegerMapLinkedArrayList.java

@@ -0,0 +1,14 @@
+package net.lecousin.framework.core.tests.collections.maps;
+
+import net.lecousin.framework.collections.map.IntegerMap;
+import net.lecousin.framework.collections.map.IntegerMapLinkedArrayList;
+import net.lecousin.framework.core.test.collections.maps.TestIntegerMap;
+
+public class TestIntegerMapLinkedArrayList extends TestIntegerMap {
+
+	@Override
+	public IntegerMap<Object> createIntegerMap() {
+		return new IntegerMapLinkedArrayList<Object>(20, 10);
+	}
+	
+}

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/collections/sort/TestRedBlackTreeInteger.java

@@ -93,6 +93,24 @@ public void tests() {
 		Assert.assertEquals(0, tree.size());
 		Assert.assertFalse(tree.containsInstance(51, o));
 
+		tree.add(51, o);
+		tree.add(52, o);
+		Assert.assertEquals(2, tree.size());
+		Assert.assertTrue(tree.containsInstance(51, o));
+		Assert.assertTrue(tree.containsInstance(52, o));
+		Assert.assertNull(tree.getPrevious(51));
+		Assert.assertNotNull(tree.getPrevious(52));
+		Assert.assertEquals(51, tree.getPrevious(52).getValue());
+		Assert.assertNotNull(tree.getNext(51));
+		Assert.assertEquals(52, tree.getNext(51).getValue());
+		Assert.assertNull(tree.getNext(52));
+		tree.add(53, o);
+		tree.removeKey(51);
+		Assert.assertNull(tree.getPrevious(52));
+		Assert.assertEquals(53, tree.getNext(52).getValue());
+		Assert.assertNull(tree.getNext(53));
+
+		tree.clear();
 		for (int i = 0; i < 100; ++i)
 			tree.add(i, o);
 		Assert.assertEquals(100, tree.size());

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/collections/sort/TestRedBlackTreeLong.java

@@ -92,6 +92,24 @@ public void tests() {
 		Assert.assertEquals(0, tree.size());
 		Assert.assertFalse(tree.containsInstance(51, o));
 
+		tree.add(51, o);
+		tree.add(52, o);
+		Assert.assertEquals(2, tree.size());
+		Assert.assertTrue(tree.containsInstance(51, o));
+		Assert.assertTrue(tree.containsInstance(52, o));
+		Assert.assertNull(tree.getPrevious(51));
+		Assert.assertNotNull(tree.getPrevious(52));
+		Assert.assertEquals(51, tree.getPrevious(52).getValue());
+		Assert.assertNotNull(tree.getNext(51));
+		Assert.assertEquals(52, tree.getNext(51).getValue());
+		Assert.assertNull(tree.getNext(52));
+		tree.add(53, o);
+		tree.removeKey(51);
+		Assert.assertNull(tree.getPrevious(52));
+		Assert.assertEquals(53, tree.getNext(52).getValue());
+		Assert.assertNull(tree.getNext(53));
+
+		tree.clear();
 		for (int i = 0; i < 100; ++i)
 			tree.add(i, o);
 		Assert.assertEquals(100, tree.size());

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/concurrent/TestDirectoryTasks.java

@@ -14,6 +14,7 @@
 import net.lecousin.framework.concurrent.tasks.drives.RemoveDirectoryContentTask;
 import net.lecousin.framework.concurrent.tasks.drives.RemoveDirectoryTask;
 import net.lecousin.framework.core.test.LCCoreAbstractTest;
+import net.lecousin.framework.progress.FakeWorkProgress;
 
 public class TestDirectoryTasks extends LCCoreAbstractTest {
 
@@ -55,21 +56,24 @@ public void testDirectoryReader() throws Exception {
 		Assert.assertTrue(dir.mkdir());
 		File file = new File(root.toFile(), "titi");
 		Assert.assertTrue(file.createNewFile());
+		
 		DirectoryReader.Request request = new DirectoryReader.Request();
-		request.getCreation = true;
-		request.getIsSymbolicLink = true;
-		request.getLastAccess = true;
-		request.getLastModified = true;
-		request.getSize = true;
+		request.getCreation().getIsSymbolicLink().getLastAccess().getLastModified().getSize();
 		DirectoryReader reader = new DirectoryReader(root.toFile(), Task.PRIORITY_NORMAL, request);
 		Assert.assertEquals(root.toFile(), reader.getDirectory());
 		reader.start().getOutput().blockThrow(0);
+		
 		DirectoryReader.ListSubDirectories lister = new DirectoryReader.ListSubDirectories(root.toFile(), Task.PRIORITY_NORMAL);
 		lister.start().getOutput().blockThrow(0);
+		
 		new RemoveDirectoryContentTask(root.toFile(), null, 0, Task.PRIORITY_NORMAL, false).start().getOutput().blockThrow(0);
 		request = new DirectoryReader.Request();
 		reader = new DirectoryReader(root.toFile(), Task.PRIORITY_NORMAL, request);
 		reader.start().getOutput().blockThrow(0);
+		
+		request = new DirectoryReader.Request();
+		reader = new DirectoryReader(root.toFile(), Task.PRIORITY_NORMAL, request, new FakeWorkProgress());
+		reader.start().getOutput().blockThrow(0);
 	}
 
 }

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/math/TestFragmentedRangeLong.java

@@ -59,6 +59,12 @@ public void test() throws Exception {
 		// 9-31
 		f.addValue(31);
 		Assert.assertEquals(1, f.size());
+		
+		Assert.assertFalse(f.containsOneValueIn(new RangeLong(0, 8)));
+		Assert.assertFalse(f.containsOneValueIn(new RangeLong(35, 50)));
+		Assert.assertTrue(f.containsOneValueIn(new RangeLong(10, 50)));
+		Assert.assertTrue(f.containsOneValueIn(new RangeLong(5, 9)));
+		Assert.assertTrue(f.containsOneValueIn(new RangeLong(31, 50)));
 
 		// 9-31, 100-150, 200-250
 		f.addRanges(Arrays.asList(new RangeLong(100, 150), new RangeLong(200, 250)));