You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/11/07 14:36:34 UTC
svn commit: r1198733 [9/13] - in /incubator/jena/Scratch/AFS/Dev/trunk:
src-archive/riot/comms/ src-archive/riot/comms/client/
src-archive/riot/comms/server0/ src-archive/riot/comms/server1/nio/
src-archive/riot/comms/server1/socket/ src-archive/riot/c...
Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/OrderedSetTestBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/OrderedSetTestBase.java?rev=1198733&r1=1198732&r2=1198733&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/OrderedSetTestBase.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/OrderedSetTestBase.java Mon Nov 7 13:36:30 2011
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,425 +16,425 @@
* limitations under the License.
*/
-package structure;
-
-import java.util.Iterator;
-
-import org.junit.Test;
-import org.openjena.atlas.junit.BaseTest ;
-
-public abstract class OrderedSetTestBase extends BaseTest
-{
- protected abstract OrderedSet<Integer> create() ;
-
- protected OrderedSet<Integer> create(int[] items)
- {
- OrderedSet<Integer> index = create() ;
- for ( int i : items )
- index.add(i) ;
- return index ;
-
- }
-
- @Test public void ins_00()
- {
- int[] r = { } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- @Test public void ins_01()
- {
- int[] r = { 1 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- @Test public void ins_02()
- {
- int[] r = { 1, 2 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- @Test public void ins_03()
- {
- int[] r = { 2 , 1 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- @Test public void ins_04()
- {
- int[] r = { 1, 2, 3, 4, 5 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- @Test public void ins_05()
- {
- int[] r = { 5, 4, 3, 2, 1 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- @Test public void ins_06()
- {
- int[] r = { 1, 3, 5, 7, 2, 4, 6 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- // Causes a pivotLeftRight (RightLeft) in AVL
- @Test public void ins_07()
- {
- int[] r = { 1, 6, 3, 4, 5, 2, 7, 0 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- @Test public void ins_08()
- {
- int[] r = { 1, 3, 2 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- @Test public void ins_09()
- {
- int[] r = { 3, 1, 2 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- @Test public void ins_10()
- {
- int[] r = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- @Test public void ins_11()
- {
- int[] r = { 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- @Test public void ins_12()
- {
- int[] r = { 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 };
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- @Test public void ins_13()
- {
- int[] r = { 20, 18, 16, 14, 12, 10, 8, 6, 4, 2, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 };
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- @Test public void ins_14()
- {
- int[] r = { 20, 18, 16, 14, 12, 10, 8, 6, 4, 2, 19, 17, 15, 13, 11, 9, 7, 5, 3, 1 };
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- @Test public void ins_15()
- {
- int[] r = { 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 19, 17, 15, 13, 11, 9, 7, 5, 3, 1 };
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
- @Test public void ins_16()
- {
- int[] r = { 1, 4, 5, 2, 3, 6, 11, 14, 15, 22, 23, 26 };
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- assertTrue(index.add(7)) ;
- assertFalse(index.add(7)) ;
-
- for ( int i : r )
- assertFalse(index.add(i)) ;
- }
-
-
- @Test public void del_01_1()
- {
- int[] r = { 1 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- OrderedSetTestLib.delete(index, r) ;
- OrderedSetTestLib.size(index, 0) ;
- }
-
- @Test public void del_01_2()
- {
- int[] r = { 1 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- OrderedSetTestLib.delete(index, 2) ;
- OrderedSetTestLib.check(index, r) ;
- }
-
-
- @Test public void del_02_1()
- {
- int[] r1 = { 1, 2 } ;
- int[] r2 = { 1, 2 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.size(index, 0) ;
- }
-
- @Test public void del_02_2()
- {
- int[] r1 = { 1, 2 } ;
- int[] r2 = { 2, 1 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.size(index, 0) ;
- }
-
-
- @Test public void del_03_1()
- {
- int[] r1 = { 2 , 1 } ;
- int[] r2 = { 1 , 2 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.size(index, 0) ;
- }
-
- @Test public void del_03_2()
- {
- int[] r1 = { 2 , 1 } ;
- int[] r2 = { 2 , 1 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.size(index, 0) ;
- }
-
- @Test public void del_03_3()
- {
- int[] r1 = { 2, 3, 4, 1 } ;
- int[] r2 = { 3 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.check(index, 1, 2, 4) ;
- }
-
- @Test public void del_03_4()
- {
- int[] r1 = { 3, 2, 1, 4 } ;
- int[] r2 = { 2 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.check(index, 1, 3, 4) ;
- }
-
- @Test public void del_04_1()
- {
- int[] r1 = { 1, 2, 3, 4, 5 } ;
- int[] r2 = { 1, 2, 3, 4, 5 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.size(index, 0) ;
- }
-
- @Test public void del_04_2()
- {
- int[] r1 = { 1, 2, 3, 4, 5 } ;
- int[] r2 = { 5, 4, 3, 2, 1 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.size(index, 0) ;
- }
-
- @Test public void del_04_3()
- {
- int[] r1 = { 1, 2, 3, 4, 5 } ;
- int[] r2 = { 1, 3, 5 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.check(index, 2, 4) ;
- }
-
- @Test public void del_04_4()
- {
- int[] r1 = { 1, 2, 3, 4, 5 } ;
- int[] r2 = { 4, 2 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.check(index, 1,3,5) ;
- }
-
- @Test public void del_04_5()
- {
- int[] r1 = { 1, 2, 3, 4, 5 } ;
- int[] r2 = { 4, 2 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.check(index, 1,3,5) ;
- OrderedSetTestLib.delete(index, 9) ;
- OrderedSetTestLib.check(index, 1,3,5) ;
- }
-
- @Test public void del_05_1()
- {
- int[] r1 = { 5, 4, 3, 2, 1 } ;
- int[] r2 = { 1, 2, 3, 4, 5 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.size(index, 0) ;
- }
-
- @Test public void del_05_2()
- {
- int[] r1 = { 5, 4, 3, 2, 1 } ;
- int[] r2 = { 1, 3, 5 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.check(index, 2,4) ;
- }
-
- @Test public void del_06_1()
- {
- int[] r1 = { 1, 3, 5, 7, 2, 4, 6 } ;
- int[] r2 = { 1, 3, 5, 7, 2, 4, 6 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.size(index, 0) ;
- }
-
- @Test public void del_07()
- {
- int[] r1 = { 1, 6, 3, 4, 5, 2, 7, 0 } ;
- int[] r2 = { 1, 6, 3, 4, 5, 2, 7, 0 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.size(index, 0) ;
- }
-
- @Test public void del_08()
- {
- int[] r1 = { 1, 6, 3, 4, 5, 2, 7, 0 } ;
- int[] r2 = { 4, 6, 3, 5 } ;
- int[] r3 = { 1, 7, 0, 2 } ;
- OrderedSet<Integer> index = create(r1) ;
- OrderedSetTestLib.check(index, r1) ;
- OrderedSetTestLib.delete(index, r2) ;
- OrderedSetTestLib.check(index, r3) ;
- OrderedSetTestLib.size(index, 4) ;
- }
-
-
- @Test public void del_10()
- {
- int[] r = { 1, 16, 3, 14, 5, 2, 37, 11, 6, 23, 4, 25, 12, 7, 40 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- // Some things not in the ordered set
- assertFalse(index.remove(99)) ;
- assertFalse(index.remove(0)) ;
- assertFalse(index.remove(20)) ;
-
- for ( int i : r )
- assertTrue("remove i="+i,index.remove(i)) ;
- }
-
- @Test public void iter_01()
- {
- int[] r = { 3, 1, 2 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- Iterator<Integer> iter = index.iterator() ;
- OrderedSetTestLib.check(iter, 1,2,3) ;
- }
-
- @Test public void iter_02()
- {
- int[] r = { 1, 2, 3, 4 , 5 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- Iterator<Integer> iter = index.iterator() ;
- OrderedSetTestLib.check(iter, 1,2,3,4,5) ;
- }
-
- @Test public void iter_03()
- {
- int[] r = { 10, 8, 6, 4, 2 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- Iterator<Integer> iter = index.iterator(2,4) ;
- OrderedSetTestLib.check(iter, 2) ;
-
- iter = index.iterator(-99,4) ;
- OrderedSetTestLib.check(iter, 2) ;
-
- }
-
- @Test public void iter_04()
- {
- int[] r = { 2, 4, 6, 8, 10 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- Iterator<Integer> iter = index.iterator(-99,4) ;
- OrderedSetTestLib.check(iter, 2) ;
- }
-
- @Test public void iter_05()
- {
- int[] r = { 2, 4, 6, 8, 10 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- Iterator<Integer> iter = index.iterator(6,99) ;
- OrderedSetTestLib.check(iter, 6,8,10) ;
- }
-
- @Test public void iter_06()
- {
- int[] r = { 2, 4, 6, 8, 10 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- Iterator<Integer> iter = index.iterator(null,null) ;
- OrderedSetTestLib.check(iter, r) ;
- }
-
- @Test public void iter_07()
- {
- int[] r = { 2 } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- Iterator<Integer> iter = index.iterator(null,null) ;
- OrderedSetTestLib.check(iter, r) ;
- }
-
- @Test public void iter_08()
- {
- int[] r = { } ;
- OrderedSet<Integer> index = create(r) ;
- OrderedSetTestLib.check(index, r) ;
- Iterator<Integer> iter = index.iterator(null,null) ;
- OrderedSetTestLib.check(iter, r) ;
- }
-
+package structure;
+
+import java.util.Iterator;
+
+import org.junit.Test;
+import org.openjena.atlas.junit.BaseTest ;
+
+public abstract class OrderedSetTestBase extends BaseTest
+{
+ protected abstract OrderedSet<Integer> create() ;
+
+ protected OrderedSet<Integer> create(int[] items)
+ {
+ OrderedSet<Integer> index = create() ;
+ for ( int i : items )
+ index.add(i) ;
+ return index ;
+
+ }
+
+ @Test public void ins_00()
+ {
+ int[] r = { } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ @Test public void ins_01()
+ {
+ int[] r = { 1 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ @Test public void ins_02()
+ {
+ int[] r = { 1, 2 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ @Test public void ins_03()
+ {
+ int[] r = { 2 , 1 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ @Test public void ins_04()
+ {
+ int[] r = { 1, 2, 3, 4, 5 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ @Test public void ins_05()
+ {
+ int[] r = { 5, 4, 3, 2, 1 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ @Test public void ins_06()
+ {
+ int[] r = { 1, 3, 5, 7, 2, 4, 6 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ // Causes a pivotLeftRight (RightLeft) in AVL
+ @Test public void ins_07()
+ {
+ int[] r = { 1, 6, 3, 4, 5, 2, 7, 0 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ @Test public void ins_08()
+ {
+ int[] r = { 1, 3, 2 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ @Test public void ins_09()
+ {
+ int[] r = { 3, 1, 2 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ @Test public void ins_10()
+ {
+ int[] r = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ @Test public void ins_11()
+ {
+ int[] r = { 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ @Test public void ins_12()
+ {
+ int[] r = { 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 };
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ @Test public void ins_13()
+ {
+ int[] r = { 20, 18, 16, 14, 12, 10, 8, 6, 4, 2, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19 };
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ @Test public void ins_14()
+ {
+ int[] r = { 20, 18, 16, 14, 12, 10, 8, 6, 4, 2, 19, 17, 15, 13, 11, 9, 7, 5, 3, 1 };
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ @Test public void ins_15()
+ {
+ int[] r = { 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 19, 17, 15, 13, 11, 9, 7, 5, 3, 1 };
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+ @Test public void ins_16()
+ {
+ int[] r = { 1, 4, 5, 2, 3, 6, 11, 14, 15, 22, 23, 26 };
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ assertTrue(index.add(7)) ;
+ assertFalse(index.add(7)) ;
+
+ for ( int i : r )
+ assertFalse(index.add(i)) ;
+ }
+
+
+ @Test public void del_01_1()
+ {
+ int[] r = { 1 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ OrderedSetTestLib.delete(index, r) ;
+ OrderedSetTestLib.size(index, 0) ;
+ }
+
+ @Test public void del_01_2()
+ {
+ int[] r = { 1 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ OrderedSetTestLib.delete(index, 2) ;
+ OrderedSetTestLib.check(index, r) ;
+ }
+
+
+ @Test public void del_02_1()
+ {
+ int[] r1 = { 1, 2 } ;
+ int[] r2 = { 1, 2 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.size(index, 0) ;
+ }
+
+ @Test public void del_02_2()
+ {
+ int[] r1 = { 1, 2 } ;
+ int[] r2 = { 2, 1 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.size(index, 0) ;
+ }
+
+
+ @Test public void del_03_1()
+ {
+ int[] r1 = { 2 , 1 } ;
+ int[] r2 = { 1 , 2 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.size(index, 0) ;
+ }
+
+ @Test public void del_03_2()
+ {
+ int[] r1 = { 2 , 1 } ;
+ int[] r2 = { 2 , 1 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.size(index, 0) ;
+ }
+
+ @Test public void del_03_3()
+ {
+ int[] r1 = { 2, 3, 4, 1 } ;
+ int[] r2 = { 3 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.check(index, 1, 2, 4) ;
+ }
+
+ @Test public void del_03_4()
+ {
+ int[] r1 = { 3, 2, 1, 4 } ;
+ int[] r2 = { 2 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.check(index, 1, 3, 4) ;
+ }
+
+ @Test public void del_04_1()
+ {
+ int[] r1 = { 1, 2, 3, 4, 5 } ;
+ int[] r2 = { 1, 2, 3, 4, 5 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.size(index, 0) ;
+ }
+
+ @Test public void del_04_2()
+ {
+ int[] r1 = { 1, 2, 3, 4, 5 } ;
+ int[] r2 = { 5, 4, 3, 2, 1 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.size(index, 0) ;
+ }
+
+ @Test public void del_04_3()
+ {
+ int[] r1 = { 1, 2, 3, 4, 5 } ;
+ int[] r2 = { 1, 3, 5 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.check(index, 2, 4) ;
+ }
+
+ @Test public void del_04_4()
+ {
+ int[] r1 = { 1, 2, 3, 4, 5 } ;
+ int[] r2 = { 4, 2 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.check(index, 1,3,5) ;
+ }
+
+ @Test public void del_04_5()
+ {
+ int[] r1 = { 1, 2, 3, 4, 5 } ;
+ int[] r2 = { 4, 2 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.check(index, 1,3,5) ;
+ OrderedSetTestLib.delete(index, 9) ;
+ OrderedSetTestLib.check(index, 1,3,5) ;
+ }
+
+ @Test public void del_05_1()
+ {
+ int[] r1 = { 5, 4, 3, 2, 1 } ;
+ int[] r2 = { 1, 2, 3, 4, 5 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.size(index, 0) ;
+ }
+
+ @Test public void del_05_2()
+ {
+ int[] r1 = { 5, 4, 3, 2, 1 } ;
+ int[] r2 = { 1, 3, 5 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.check(index, 2,4) ;
+ }
+
+ @Test public void del_06_1()
+ {
+ int[] r1 = { 1, 3, 5, 7, 2, 4, 6 } ;
+ int[] r2 = { 1, 3, 5, 7, 2, 4, 6 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.size(index, 0) ;
+ }
+
+ @Test public void del_07()
+ {
+ int[] r1 = { 1, 6, 3, 4, 5, 2, 7, 0 } ;
+ int[] r2 = { 1, 6, 3, 4, 5, 2, 7, 0 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.size(index, 0) ;
+ }
+
+ @Test public void del_08()
+ {
+ int[] r1 = { 1, 6, 3, 4, 5, 2, 7, 0 } ;
+ int[] r2 = { 4, 6, 3, 5 } ;
+ int[] r3 = { 1, 7, 0, 2 } ;
+ OrderedSet<Integer> index = create(r1) ;
+ OrderedSetTestLib.check(index, r1) ;
+ OrderedSetTestLib.delete(index, r2) ;
+ OrderedSetTestLib.check(index, r3) ;
+ OrderedSetTestLib.size(index, 4) ;
+ }
+
+
+ @Test public void del_10()
+ {
+ int[] r = { 1, 16, 3, 14, 5, 2, 37, 11, 6, 23, 4, 25, 12, 7, 40 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ // Some things not in the ordered set
+ assertFalse(index.remove(99)) ;
+ assertFalse(index.remove(0)) ;
+ assertFalse(index.remove(20)) ;
+
+ for ( int i : r )
+ assertTrue("remove i="+i,index.remove(i)) ;
+ }
+
+ @Test public void iter_01()
+ {
+ int[] r = { 3, 1, 2 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ Iterator<Integer> iter = index.iterator() ;
+ OrderedSetTestLib.check(iter, 1,2,3) ;
+ }
+
+ @Test public void iter_02()
+ {
+ int[] r = { 1, 2, 3, 4 , 5 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ Iterator<Integer> iter = index.iterator() ;
+ OrderedSetTestLib.check(iter, 1,2,3,4,5) ;
+ }
+
+ @Test public void iter_03()
+ {
+ int[] r = { 10, 8, 6, 4, 2 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ Iterator<Integer> iter = index.iterator(2,4) ;
+ OrderedSetTestLib.check(iter, 2) ;
+
+ iter = index.iterator(-99,4) ;
+ OrderedSetTestLib.check(iter, 2) ;
+
+ }
+
+ @Test public void iter_04()
+ {
+ int[] r = { 2, 4, 6, 8, 10 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ Iterator<Integer> iter = index.iterator(-99,4) ;
+ OrderedSetTestLib.check(iter, 2) ;
+ }
+
+ @Test public void iter_05()
+ {
+ int[] r = { 2, 4, 6, 8, 10 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ Iterator<Integer> iter = index.iterator(6,99) ;
+ OrderedSetTestLib.check(iter, 6,8,10) ;
+ }
+
+ @Test public void iter_06()
+ {
+ int[] r = { 2, 4, 6, 8, 10 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ Iterator<Integer> iter = index.iterator(null,null) ;
+ OrderedSetTestLib.check(iter, r) ;
+ }
+
+ @Test public void iter_07()
+ {
+ int[] r = { 2 } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ Iterator<Integer> iter = index.iterator(null,null) ;
+ OrderedSetTestLib.check(iter, r) ;
+ }
+
+ @Test public void iter_08()
+ {
+ int[] r = { } ;
+ OrderedSet<Integer> index = create(r) ;
+ OrderedSetTestLib.check(index, r) ;
+ Iterator<Integer> iter = index.iterator(null,null) ;
+ OrderedSetTestLib.check(iter, r) ;
+ }
+
}
Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/OrderedSetTestFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/OrderedSetTestFactory.java?rev=1198733&r1=1198732&r2=1198733&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/OrderedSetTestFactory.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/OrderedSetTestFactory.java Mon Nov 7 13:36:30 2011
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package structure;
-
-public interface OrderedSetTestFactory
-{
- public OrderedSet<Integer> create(int...recs) ;
+package structure;
+
+public interface OrderedSetTestFactory
+{
+ public OrderedSet<Integer> create(int...recs) ;
}
Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/OrderedSetTestLib.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/OrderedSetTestLib.java?rev=1198733&r1=1198732&r2=1198733&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/OrderedSetTestLib.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/OrderedSetTestLib.java Mon Nov 7 13:36:30 2011
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,119 +16,119 @@
* limitations under the License.
*/
-package structure;
-
-import org.openjena.atlas.iterator.Iter;
-
-import java.util.*;
-
-import static org.junit.Assert.* ;
-
-import org.openjena.atlas.test.ExecGenerator;
-import org.openjena.atlas.test.Gen;
-import org.openjena.atlas.test.RepeatExecution;
-
-public class OrderedSetTestLib
-{
-
- public static void randTests(OrderedSetTestFactory factory, int maxValue, int maxNumKeys, int iterations, boolean showProgess)
- {
- ExecGenerator execGenerator = new OrderedSetTest(factory, maxValue, maxNumKeys) ;
- RepeatExecution.repeatExecutions(execGenerator, iterations, showProgess) ;
- }
-
- public static void randTest(OrderedSetTestFactory factory, int maxValue, int numKeys)
- {
- // if ( numKeys >= 3000 )
- // System.err.printf("Warning: too many keys\n") ;
- //
- int[] r1 = Gen.rand(numKeys, 0, maxValue) ;
- int[] r2 = Gen.permute(r1, 4*numKeys) ;
- try {
- OrderedSet<Integer> sIndx = factory.create(r1) ;
- check(sIndx, r1) ;
- delete(sIndx, r2) ;
- check(sIndx) ;
- } catch (RuntimeException ex)
- {
- System.err.printf("int[] r1 = {%s} ;\n", Gen.strings(r1)) ;
- System.err.printf("int[] r2 = {%s}; \n", Gen.strings(r2)) ;
- throw ex ;
- }
- catch (Error ex)
- {
- System.err.printf("int[] r1 = {%s} ;\n", Gen.strings(r1)) ;
- System.err.printf("int[] r2 = {%s}; \n", Gen.strings(r2)) ;
- throw ex ;
- }
-
- }
-
- public static OrderedSet<Integer> delete(OrderedSet<Integer> sIndx, int...recs)
- {
- for ( int i : recs )
- sIndx.remove(i) ;
- return sIndx ;
- }
-
- public static void check(OrderedSet<Integer> sIndx, int...recs)
- {
- sIndx.checkTree() ;
- for ( int i : recs )
- assertTrue(sIndx.contains(i)) ;
-
- List<Integer> x = Iter.toList(sIndx.iterator()) ;
- List<Integer> y = sIndx.elements() ;
- assertEquals(x,y) ;
-
- SortedSet<Integer> r = new TreeSet<Integer>() ;
-
- // -- Sort to list.
- for ( int i : recs )
- r.add(i) ;
-
- List<Integer> z = new ArrayList<Integer>() ;
- for ( int i : r )
- z.add(i) ;
- // --
-
- if ( ! z.equals(x) )
- {
- System.out.println("About to crash") ;
- }
-
- assertEquals(z, x) ;
-
- if ( r.size() > 0 )
- {
- Integer min = z.get(0) ;
- Integer max = z.get(r.size()-1) ;
- assertEquals(min, sIndx.min()) ;
- assertEquals(max, sIndx.max()) ;
- }
- }
-
- public static void check(Iterator<Integer> iter, int...recs)
- {
- for ( int i : recs )
- {
- assertTrue("Iterator shorter than test answers", iter.hasNext()) ;
- int j = iter.next() ;
- assertEquals(i,j) ;
- }
- assertFalse("Iterator longer than test answers", iter.hasNext()) ;
- }
-
- public static void size(OrderedSet<Integer> sIdx, long size)
- {
- long x = sIdx.count() ;
- long x2 = sIdx.size() ;
- assertEquals(size, x) ;
- assertEquals(size, x2) ;
- if ( size == 0 )
- assertTrue(sIdx.isEmpty()) ;
- else
- assertFalse(sIdx.isEmpty()) ;
- }
-
+package structure;
+
+import org.openjena.atlas.iterator.Iter;
+
+import java.util.*;
+
+import static org.junit.Assert.* ;
+
+import org.openjena.atlas.test.ExecGenerator;
+import org.openjena.atlas.test.Gen;
+import org.openjena.atlas.test.RepeatExecution;
+
+public class OrderedSetTestLib
+{
+
+ public static void randTests(OrderedSetTestFactory factory, int maxValue, int maxNumKeys, int iterations, boolean showProgess)
+ {
+ ExecGenerator execGenerator = new OrderedSetTest(factory, maxValue, maxNumKeys) ;
+ RepeatExecution.repeatExecutions(execGenerator, iterations, showProgess) ;
+ }
+
+ public static void randTest(OrderedSetTestFactory factory, int maxValue, int numKeys)
+ {
+ // if ( numKeys >= 3000 )
+ // System.err.printf("Warning: too many keys\n") ;
+ //
+ int[] r1 = Gen.rand(numKeys, 0, maxValue) ;
+ int[] r2 = Gen.permute(r1, 4*numKeys) ;
+ try {
+ OrderedSet<Integer> sIndx = factory.create(r1) ;
+ check(sIndx, r1) ;
+ delete(sIndx, r2) ;
+ check(sIndx) ;
+ } catch (RuntimeException ex)
+ {
+ System.err.printf("int[] r1 = {%s} ;\n", Gen.strings(r1)) ;
+ System.err.printf("int[] r2 = {%s}; \n", Gen.strings(r2)) ;
+ throw ex ;
+ }
+ catch (Error ex)
+ {
+ System.err.printf("int[] r1 = {%s} ;\n", Gen.strings(r1)) ;
+ System.err.printf("int[] r2 = {%s}; \n", Gen.strings(r2)) ;
+ throw ex ;
+ }
+
+ }
+
+ public static OrderedSet<Integer> delete(OrderedSet<Integer> sIndx, int...recs)
+ {
+ for ( int i : recs )
+ sIndx.remove(i) ;
+ return sIndx ;
+ }
+
+ public static void check(OrderedSet<Integer> sIndx, int...recs)
+ {
+ sIndx.checkTree() ;
+ for ( int i : recs )
+ assertTrue(sIndx.contains(i)) ;
+
+ List<Integer> x = Iter.toList(sIndx.iterator()) ;
+ List<Integer> y = sIndx.elements() ;
+ assertEquals(x,y) ;
+
+ SortedSet<Integer> r = new TreeSet<Integer>() ;
+
+ // -- Sort to list.
+ for ( int i : recs )
+ r.add(i) ;
+
+ List<Integer> z = new ArrayList<Integer>() ;
+ for ( int i : r )
+ z.add(i) ;
+ // --
+
+ if ( ! z.equals(x) )
+ {
+ System.out.println("About to crash") ;
+ }
+
+ assertEquals(z, x) ;
+
+ if ( r.size() > 0 )
+ {
+ Integer min = z.get(0) ;
+ Integer max = z.get(r.size()-1) ;
+ assertEquals(min, sIndx.min()) ;
+ assertEquals(max, sIndx.max()) ;
+ }
+ }
+
+ public static void check(Iterator<Integer> iter, int...recs)
+ {
+ for ( int i : recs )
+ {
+ assertTrue("Iterator shorter than test answers", iter.hasNext()) ;
+ int j = iter.next() ;
+ assertEquals(i,j) ;
+ }
+ assertFalse("Iterator longer than test answers", iter.hasNext()) ;
+ }
+
+ public static void size(OrderedSet<Integer> sIdx, long size)
+ {
+ long x = sIdx.count() ;
+ long x2 = sIdx.size() ;
+ assertEquals(size, x) ;
+ assertEquals(size, x2) ;
+ if ( size == 0 )
+ assertTrue(sIdx.isEmpty()) ;
+ else
+ assertFalse(sIdx.isEmpty()) ;
+ }
+
}
Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/TS_Structure.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/TS_Structure.java?rev=1198733&r1=1198732&r2=1198733&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/TS_Structure.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/TS_Structure.java Mon Nov 7 13:36:30 2011
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,23 +16,23 @@
* limitations under the License.
*/
-package structure;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import structure.avl.TestAVL;
-import structure.exthash.TestExtHashMem;
-import structure.skiplist.TestSkipList;
-import structure.ttree.TestTTree;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses( {
- TestAVL.class
- , TestExtHashMem.class
- , TestSkipList.class
- , TestTTree.class
-} )
-public class TS_Structure
-{
-
+package structure;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import structure.avl.TestAVL;
+import structure.exthash.TestExtHashMem;
+import structure.skiplist.TestSkipList;
+import structure.ttree.TestTTree;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses( {
+ TestAVL.class
+ , TestExtHashMem.class
+ , TestSkipList.class
+ , TestTTree.class
+} )
+public class TS_Structure
+{
+
}
Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/avl/TestAVL.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/avl/TestAVL.java?rev=1198733&r1=1198732&r2=1198733&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/avl/TestAVL.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/avl/TestAVL.java Mon Nov 7 13:36:30 2011
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,21 +16,21 @@
* limitations under the License.
*/
-package structure.avl;
-
-import structure.OrderedSet;
-import structure.OrderedSetTestBase;
-
-public class TestAVL extends OrderedSetTestBase
-{
- static {
- AVL.Checking = true ;
- //AVL.Verbose = false ;
- }
-
- @Override
- protected OrderedSet<Integer> create()
- {
- return new AVL<Integer>() ;
- }
+package structure.avl;
+
+import structure.OrderedSet;
+import structure.OrderedSetTestBase;
+
+public class TestAVL extends OrderedSetTestBase
+{
+ static {
+ AVL.Checking = true ;
+ //AVL.Verbose = false ;
+ }
+
+ @Override
+ protected OrderedSet<Integer> create()
+ {
+ return new AVL<Integer>() ;
+ }
}
Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/exthash/ExtHashMemTestBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/exthash/ExtHashMemTestBase.java?rev=1198733&r1=1198732&r2=1198733&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/exthash/ExtHashMemTestBase.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/exthash/ExtHashMemTestBase.java Mon Nov 7 13:36:30 2011
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,127 +16,127 @@
* limitations under the License.
*/
-package structure.exthash;
-import static org.openjena.atlas.lib.ListUtils.asList;
-import static org.openjena.atlas.lib.ListUtils.unique;
-import static org.openjena.atlas.lib.RandomLib.random;
-import static org.openjena.atlas.test.Gen.permute;
-import static org.openjena.atlas.test.Gen.rand;
-import static org.openjena.atlas.test.Gen.strings;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.openjena.atlas.test.ExecGenerator;
-import org.openjena.atlas.test.RepeatExecution;
-
-public class ExtHashMemTestBase
-{
- public static int BucketSize = 2 ;
- public static void randTests(int maxValue, int maxNumKeys, int iterations, boolean showProgess)
- {
- ExtHashTest test = new ExtHashTest(maxValue, maxNumKeys) ;
- RepeatExecution.repeatExecutions(test, iterations, showProgess) ;
- }
-
- static class ExtHashTest implements ExecGenerator
- {
- int maxNumKeys ;
- int maxValue ;
- ExtHashTest(int maxValue, int maxNumKeys)
- {
- if ( maxValue <= maxNumKeys )
- throw new IllegalArgumentException("ExtHashTest: Max value less than number of keys") ;
- this.maxValue = maxValue ;
- this.maxNumKeys = maxNumKeys ;
- }
-
- @Override
- public void executeOneTest()
- {
- int numKeys = random.nextInt(maxNumKeys)+1 ;
- randTest(maxValue, numKeys) ;
- }
- }
-
- public static void randTest(int maxValue, int numKeys)
- {
-// if ( numKeys >= 3000 )
-// System.err.printf("Warning: too many keys\n") ;
-
- int[] r1 = rand(numKeys, 0, maxValue) ;
- int[] r2 = permute(r1, 4*numKeys) ;
- runTest(r1, r2) ;
- }
-
- public static void runTest(int[] r1, int[] r2)
- {
- try {
- ExtHashMem<Integer, String> table = create(r1) ;
- check(table, r1) ;
- delete(table, r2) ;
- check(table) ;
- } catch (RuntimeException ex)
- {
- System.err.println() ;
- System.err.printf("int[] r1 = {%s} ;\n", strings(r1)) ;
- System.err.printf("int[] r2 = {%s}; \n", strings(r2)) ;
- throw ex ;
- }
- }
-
- public static ExtHashMem<Integer, String> create(int...recs)
- {
- ExtHashMem<Integer, String> table = new ExtHashMem<Integer, String>(BucketSize) ;
- for ( int i : recs )
- {
- table.put(i, "X"+i) ;
- if ( false ) table.dump() ;
- }
- return table ;
- }
-
- public static ExtHashMem<Integer, String> delete(ExtHashMem<Integer, String> table, int...recs)
- {
- for ( int i : recs )
- table.remove(i) ;
- return table ;
- }
-
-
- public static void check(ExtHashMem<Integer, String> table, int...recs)
- {
- table.check();
- for ( int i : recs )
- assertNotNull(table.get(i)) ;
- List<Integer> y = unique(asList(recs)) ;
- assertEquals(y.size(), table.size());
- }
-
-
- public static void check(Iterator<Integer> iter, int...recs)
- {
- for ( int i : recs )
- {
- assertTrue("Iterator shorter than test answers", iter.hasNext()) ;
- int j = iter.next() ;
- assertEquals(i,j) ;
- }
- assertFalse("Iterator longer than test answers", iter.hasNext()) ;
- }
-
- public static void size(ExtHashMem<Integer, String> table, long size)
- {
-// long x = avl.size() ;
-// assertEquals(size, x) ;
-// if ( size == 0 )
-// assertTrue(avl.isEmpty()) ;
-// else
-// assertFalse(avl.isEmpty()) ;
- }
-
+package structure.exthash;
+import static org.openjena.atlas.lib.ListUtils.asList;
+import static org.openjena.atlas.lib.ListUtils.unique;
+import static org.openjena.atlas.lib.RandomLib.random;
+import static org.openjena.atlas.test.Gen.permute;
+import static org.openjena.atlas.test.Gen.rand;
+import static org.openjena.atlas.test.Gen.strings;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.openjena.atlas.test.ExecGenerator;
+import org.openjena.atlas.test.RepeatExecution;
+
+public class ExtHashMemTestBase
+{
+ public static int BucketSize = 2 ;
+ public static void randTests(int maxValue, int maxNumKeys, int iterations, boolean showProgess)
+ {
+ ExtHashTest test = new ExtHashTest(maxValue, maxNumKeys) ;
+ RepeatExecution.repeatExecutions(test, iterations, showProgess) ;
+ }
+
+ static class ExtHashTest implements ExecGenerator
+ {
+ int maxNumKeys ;
+ int maxValue ;
+ ExtHashTest(int maxValue, int maxNumKeys)
+ {
+ if ( maxValue <= maxNumKeys )
+ throw new IllegalArgumentException("ExtHashTest: Max value less than number of keys") ;
+ this.maxValue = maxValue ;
+ this.maxNumKeys = maxNumKeys ;
+ }
+
+ @Override
+ public void executeOneTest()
+ {
+ int numKeys = random.nextInt(maxNumKeys)+1 ;
+ randTest(maxValue, numKeys) ;
+ }
+ }
+
+ public static void randTest(int maxValue, int numKeys)
+ {
+// if ( numKeys >= 3000 )
+// System.err.printf("Warning: too many keys\n") ;
+
+ int[] r1 = rand(numKeys, 0, maxValue) ;
+ int[] r2 = permute(r1, 4*numKeys) ;
+ runTest(r1, r2) ;
+ }
+
+ public static void runTest(int[] r1, int[] r2)
+ {
+ try {
+ ExtHashMem<Integer, String> table = create(r1) ;
+ check(table, r1) ;
+ delete(table, r2) ;
+ check(table) ;
+ } catch (RuntimeException ex)
+ {
+ System.err.println() ;
+ System.err.printf("int[] r1 = {%s} ;\n", strings(r1)) ;
+ System.err.printf("int[] r2 = {%s}; \n", strings(r2)) ;
+ throw ex ;
+ }
+ }
+
+ public static ExtHashMem<Integer, String> create(int...recs)
+ {
+ ExtHashMem<Integer, String> table = new ExtHashMem<Integer, String>(BucketSize) ;
+ for ( int i : recs )
+ {
+ table.put(i, "X"+i) ;
+ if ( false ) table.dump() ;
+ }
+ return table ;
+ }
+
+ public static ExtHashMem<Integer, String> delete(ExtHashMem<Integer, String> table, int...recs)
+ {
+ for ( int i : recs )
+ table.remove(i) ;
+ return table ;
+ }
+
+
+ public static void check(ExtHashMem<Integer, String> table, int...recs)
+ {
+ table.check();
+ for ( int i : recs )
+ assertNotNull(table.get(i)) ;
+ List<Integer> y = unique(asList(recs)) ;
+ assertEquals(y.size(), table.size());
+ }
+
+
+ public static void check(Iterator<Integer> iter, int...recs)
+ {
+ for ( int i : recs )
+ {
+ assertTrue("Iterator shorter than test answers", iter.hasNext()) ;
+ int j = iter.next() ;
+ assertEquals(i,j) ;
+ }
+ assertFalse("Iterator longer than test answers", iter.hasNext()) ;
+ }
+
+ public static void size(ExtHashMem<Integer, String> table, long size)
+ {
+// long x = avl.size() ;
+// assertEquals(size, x) ;
+// if ( size == 0 )
+// assertTrue(avl.isEmpty()) ;
+// else
+// assertFalse(avl.isEmpty()) ;
+ }
+
}
Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/exthash/TestExtHashMem.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/exthash/TestExtHashMem.java?rev=1198733&r1=1198732&r2=1198733&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/exthash/TestExtHashMem.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/exthash/TestExtHashMem.java Mon Nov 7 13:36:30 2011
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,99 +16,99 @@
* limitations under the License.
*/
-package structure.exthash;
-
-import static structure.exthash.ExtHashMemTestBase.check;
-import static structure.exthash.ExtHashMemTestBase.create;
-import static structure.exthash.ExtHashMemTestBase.delete;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import structure.exthash.ExtHashMem;
-import org.openjena.atlas.junit.BaseTest ;
-
-public class TestExtHashMem extends BaseTest
-{
- @BeforeClass static public void setup()
- {
- ExtHashMem.NullOut = true ;
- ExtHashMem.Checking = true ;
- ExtHashMem.DefaultBucketSize = 4 ;
- }
-
- @AfterClass static public void teardown()
- {
-
- }
-
- @Test public void create1()
- {
- ExtHashMem<Integer, String> eHash = new ExtHashMem<Integer, String>() ;
- check(eHash) ;
- }
-
-// @Test public void create2()
-// { ExtHash eHash = build() ; assertNotNull(eHash) ; }
-
- @Test public void insert1()
- {
- ExtHashMem<Integer, String> eHash = create(1) ;
- check(eHash, 1) ;
- assertEquals(eHash.get(1), "X1") ;
- assertEquals(1, eHash.size()) ;
-
- }
-
- @Test public void insert2()
- {
- ExtHashMem<Integer, String> eHash = create(1,2) ;
- check(eHash, 1, 2) ;
- assertEquals(eHash.get(1), "X1") ;
- assertEquals(eHash.get(2), "X2") ;
- assertEquals(2, eHash.size()) ;
- }
-
- @Test public void insert3()
- {
- ExtHashMem<Integer, String> eHash = create(1,2,3,4,5,6,7,8) ;
- check(eHash, 1, 2, 3, 4, 5, 6, 7, 8) ;
- }
-
- // Nasty cases
- @Test public void insert4()
- {
- ExtHashMem<Integer, String> eHash = create(0,2,4,8,16) ;
- assertEquals(5, eHash.size()) ;
- }
-
- @Test public void delete1()
- {
- ExtHashMem<Integer, String> eHash = createAndCheck(1) ;
- assertEquals(1, eHash.size()) ;
- delete(eHash, 1) ;
- assertFalse(eHash.contains(1)) ;
- assertEquals(0, eHash.size()) ;
- }
-
- @Test public void delete2()
- {
- ExtHashMem<Integer, String> eHash = createAndCheck(1, 2, 3, 4, 5, 6, 7, 8) ;
- delete(eHash, 1, 2, 3, 4, 5, 6, 7, 8) ;
- check(eHash) ;
- }
-
- @Test public void delete3()
- {
- ExtHashMem<Integer, String> eHash = createAndCheck(1, 2, 3, 4, 5, 6, 7, 8) ;
- delete(eHash, 8, 7, 6, 5, 4, 3, 2, 1) ;
- check(eHash) ;
- }
-
- static private ExtHashMem<Integer, String> createAndCheck(int... keys)
- {
- ExtHashMem<Integer, String> eHash = create(keys) ;
- check(eHash, keys);
- assertEquals(keys.length, eHash.size()) ;
- return eHash ;
- }
+package structure.exthash;
+
+import static structure.exthash.ExtHashMemTestBase.check;
+import static structure.exthash.ExtHashMemTestBase.create;
+import static structure.exthash.ExtHashMemTestBase.delete;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import structure.exthash.ExtHashMem;
+import org.openjena.atlas.junit.BaseTest ;
+
+public class TestExtHashMem extends BaseTest
+{
+ @BeforeClass static public void setup()
+ {
+ ExtHashMem.NullOut = true ;
+ ExtHashMem.Checking = true ;
+ ExtHashMem.DefaultBucketSize = 4 ;
+ }
+
+ @AfterClass static public void teardown()
+ {
+
+ }
+
+ @Test public void create1()
+ {
+ ExtHashMem<Integer, String> eHash = new ExtHashMem<Integer, String>() ;
+ check(eHash) ;
+ }
+
+// @Test public void create2()
+// { ExtHash eHash = build() ; assertNotNull(eHash) ; }
+
+ @Test public void insert1()
+ {
+ ExtHashMem<Integer, String> eHash = create(1) ;
+ check(eHash, 1) ;
+ assertEquals(eHash.get(1), "X1") ;
+ assertEquals(1, eHash.size()) ;
+
+ }
+
+ @Test public void insert2()
+ {
+ ExtHashMem<Integer, String> eHash = create(1,2) ;
+ check(eHash, 1, 2) ;
+ assertEquals(eHash.get(1), "X1") ;
+ assertEquals(eHash.get(2), "X2") ;
+ assertEquals(2, eHash.size()) ;
+ }
+
+ @Test public void insert3()
+ {
+ ExtHashMem<Integer, String> eHash = create(1,2,3,4,5,6,7,8) ;
+ check(eHash, 1, 2, 3, 4, 5, 6, 7, 8) ;
+ }
+
+ // Nasty cases
+ @Test public void insert4()
+ {
+ ExtHashMem<Integer, String> eHash = create(0,2,4,8,16) ;
+ assertEquals(5, eHash.size()) ;
+ }
+
+ @Test public void delete1()
+ {
+ ExtHashMem<Integer, String> eHash = createAndCheck(1) ;
+ assertEquals(1, eHash.size()) ;
+ delete(eHash, 1) ;
+ assertFalse(eHash.contains(1)) ;
+ assertEquals(0, eHash.size()) ;
+ }
+
+ @Test public void delete2()
+ {
+ ExtHashMem<Integer, String> eHash = createAndCheck(1, 2, 3, 4, 5, 6, 7, 8) ;
+ delete(eHash, 1, 2, 3, 4, 5, 6, 7, 8) ;
+ check(eHash) ;
+ }
+
+ @Test public void delete3()
+ {
+ ExtHashMem<Integer, String> eHash = createAndCheck(1, 2, 3, 4, 5, 6, 7, 8) ;
+ delete(eHash, 8, 7, 6, 5, 4, 3, 2, 1) ;
+ check(eHash) ;
+ }
+
+ static private ExtHashMem<Integer, String> createAndCheck(int... keys)
+ {
+ ExtHashMem<Integer, String> eHash = create(keys) ;
+ check(eHash, keys);
+ assertEquals(keys.length, eHash.size()) ;
+ return eHash ;
+ }
}
Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/radix/RadixRun.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/radix/RadixRun.java?rev=1198733&r1=1198732&r2=1198733&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/radix/RadixRun.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/radix/RadixRun.java Mon Nov 7 13:36:30 2011
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,116 +16,116 @@
* limitations under the License.
*/
-package structure.radix;
-import java.util.ArrayList ;
-import java.util.Iterator ;
-import java.util.List ;
-
-import org.junit.runner.JUnitCore ;
-import org.junit.runner.Result ;
-import org.openjena.atlas.junit.TextListener2 ;
-import org.openjena.atlas.lib.Bytes ;
-import org.openjena.atlas.logging.Log ;
-
-public class RadixRun
-{
- public static void main(String ...argv)
- {
- Log.setLog4j() ;
- Log.enable(RadixTree.class) ;
- RadixTree.logging = false ;
- //RadixTree.logging = true ;
-
- if ( false )
- {
- JUnitCore runner = new org.junit.runner.JUnitCore() ;
- runner.addListener(new TextListener2(System.out)) ;
- //TestRadix.beforeClass() ;
- Result result = runner.run(TestRadix.class) ;
- //TestRadix.afterClass() ;
- System.exit(0) ;
- }
-
- List<byte[]> entries = new ArrayList<byte[]>() ;
- entries.add(new byte[]{1,4}) ;
- entries.add(new byte[]{1,2}) ;
- entries.add(new byte[]{1,2,3,4}) ;
- entries.add(new byte[]{1,2,8}) ;
- entries.add(new byte[]{1,2,3,4}) ; // repeat
- entries.add(new byte[]{1,5,8}) ;
- entries.add(new byte[]{0}) ;
- entries.add(new byte[]{}) ;
-
- RadixTree trie = new RadixTree() ;
- for ( byte[] arr : entries )
- insert(trie, arr) ;
-
- RadixTree.logging = true ;
- Iterator<byte[]> iter = trie.iterator(new byte[]{1,2}, null) ;
- for ( ; iter.hasNext() ; )
- {
- byte[] b = iter.next();
- System.out.println(Bytes.asHex(b)) ;
- }
- System.exit(0) ;
-
- //RadixTree.logging = true ;
-
- //for ( int i = entries.size()-1 ; i >= 0 ; i-- )
- for ( int i = 0 ; i < entries.size(); i++ )
- {
- byte[] arr = entries.get(i) ;
- delete(trie, arr) ;
- }
-
- System.exit(0) ;
- }
-
-// static void search(RadixTree trie, byte[] key)
-// {
-// System.out.println("Search--'"+Bytes.asHex(key)+"'") ;
-// RadixNode node = trie.search(key) ;
-// System.out.println("Search>> "+node) ;
-// System.out.println() ;
-// }
-
- static void find(RadixTree trie, byte[] key)
- {
- System.out.println("Find --'"+Bytes.asHex(key)+"'") ;
- RadixNode node = trie.find(key) ;
- System.out.println("Find >> "+node) ;
- System.out.println() ;
- }
-
-
- static void insert(RadixTree trie, byte[] key)
- {
- System.out.println("Insert--'"+Bytes.asHex(key)+"'") ;
- boolean b2 = ( trie.find(key) == null ) ;
- boolean b = trie.insert(key) ;
- System.out.print(" >> "+b+" ["+b2+"]") ;
- System.out.print(": ") ;
- trie.printLeaves() ;
- //trie.print();
- System.out.flush() ;
- if ( b != b2 )
- System.err.println("Inconsistent (insert)") ;
- trie.check() ;
- }
-
- static void delete(RadixTree trie, byte[] key)
- {
- System.out.println("Delete--'"+Bytes.asHex(key)+"'") ;
- boolean b2 = ( trie.find(key) != null ) ;
- boolean b = trie.delete(key) ;
- System.out.print(" >> "+b+" ["+b2+"]") ;
- System.out.print(": ") ;
- trie.printLeaves() ;
- trie.print();
- System.out.flush() ;
- if ( b != b2 )
- System.err.println("Inconsistent (delete)") ;
- trie.check() ;
- }
-
+package structure.radix;
+import java.util.ArrayList ;
+import java.util.Iterator ;
+import java.util.List ;
+
+import org.junit.runner.JUnitCore ;
+import org.junit.runner.Result ;
+import org.openjena.atlas.junit.TextListener2 ;
+import org.openjena.atlas.lib.Bytes ;
+import org.openjena.atlas.logging.Log ;
+
+public class RadixRun
+{
+ public static void main(String ...argv)
+ {
+ Log.setLog4j() ;
+ Log.enable(RadixTree.class) ;
+ RadixTree.logging = false ;
+ //RadixTree.logging = true ;
+
+ if ( false )
+ {
+ JUnitCore runner = new org.junit.runner.JUnitCore() ;
+ runner.addListener(new TextListener2(System.out)) ;
+ //TestRadix.beforeClass() ;
+ Result result = runner.run(TestRadix.class) ;
+ //TestRadix.afterClass() ;
+ System.exit(0) ;
+ }
+
+ List<byte[]> entries = new ArrayList<byte[]>() ;
+ entries.add(new byte[]{1,4}) ;
+ entries.add(new byte[]{1,2}) ;
+ entries.add(new byte[]{1,2,3,4}) ;
+ entries.add(new byte[]{1,2,8}) ;
+ entries.add(new byte[]{1,2,3,4}) ; // repeat
+ entries.add(new byte[]{1,5,8}) ;
+ entries.add(new byte[]{0}) ;
+ entries.add(new byte[]{}) ;
+
+ RadixTree trie = new RadixTree() ;
+ for ( byte[] arr : entries )
+ insert(trie, arr) ;
+
+ RadixTree.logging = true ;
+ Iterator<byte[]> iter = trie.iterator(new byte[]{1,2}, null) ;
+ for ( ; iter.hasNext() ; )
+ {
+ byte[] b = iter.next();
+ System.out.println(Bytes.asHex(b)) ;
+ }
+ System.exit(0) ;
+
+ //RadixTree.logging = true ;
+
+ //for ( int i = entries.size()-1 ; i >= 0 ; i-- )
+ for ( int i = 0 ; i < entries.size(); i++ )
+ {
+ byte[] arr = entries.get(i) ;
+ delete(trie, arr) ;
+ }
+
+ System.exit(0) ;
+ }
+
+// static void search(RadixTree trie, byte[] key)
+// {
+// System.out.println("Search--'"+Bytes.asHex(key)+"'") ;
+// RadixNode node = trie.search(key) ;
+// System.out.println("Search>> "+node) ;
+// System.out.println() ;
+// }
+
+ static void find(RadixTree trie, byte[] key)
+ {
+ System.out.println("Find --'"+Bytes.asHex(key)+"'") ;
+ RadixNode node = trie.find(key) ;
+ System.out.println("Find >> "+node) ;
+ System.out.println() ;
+ }
+
+
+ static void insert(RadixTree trie, byte[] key)
+ {
+ System.out.println("Insert--'"+Bytes.asHex(key)+"'") ;
+ boolean b2 = ( trie.find(key) == null ) ;
+ boolean b = trie.insert(key) ;
+ System.out.print(" >> "+b+" ["+b2+"]") ;
+ System.out.print(": ") ;
+ trie.printLeaves() ;
+ //trie.print();
+ System.out.flush() ;
+ if ( b != b2 )
+ System.err.println("Inconsistent (insert)") ;
+ trie.check() ;
+ }
+
+ static void delete(RadixTree trie, byte[] key)
+ {
+ System.out.println("Delete--'"+Bytes.asHex(key)+"'") ;
+ boolean b2 = ( trie.find(key) != null ) ;
+ boolean b = trie.delete(key) ;
+ System.out.print(" >> "+b+" ["+b2+"]") ;
+ System.out.print(": ") ;
+ trie.printLeaves() ;
+ trie.print();
+ System.out.flush() ;
+ if ( b != b2 )
+ System.err.println("Inconsistent (delete)") ;
+ trie.check() ;
+ }
+
}
Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/radix/TestRadix.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/radix/TestRadix.java?rev=1198733&r1=1198732&r2=1198733&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/radix/TestRadix.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/radix/TestRadix.java Mon Nov 7 13:36:30 2011
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,60 +16,60 @@
* limitations under the License.
*/
-package structure.radix;
-
+package structure.radix;
+
import java.util.Iterator ;
import org.junit.Test ;
import org.openjena.atlas.iterator.Iter ;
import org.openjena.atlas.iterator.Transform ;
import org.openjena.atlas.junit.BaseTest ;
-
-public class TestRadix extends BaseTest
-{
- // Test order : This sequence of keys triggers every case of insert.
-
- static byte[] key1 = { 2 , 4 , 6 , 8 } ;
-
- static byte[] key2 = { 2 , 4 , 6 , 10 } ;
- // Insert - shorter key
- static byte[] key3 = { 2 } ;
-
- // Insert - existing leaf
- static byte[] key4 = { 2 , 4 , 6, 8 , 10 } ;
-
- // Insert - partial prefix match.
- static byte[] key5 = { 2 , 4 , 3 , 1 } ;
-
- static byte[] key6 = { 0 , 1 , 2 , 3 , 4 } ;
-
- @Test public void radix_01()
- {
- RadixTree t = new RadixTree() ;
- test(0, t) ;
- }
-
- @Test public void radix_02()
- {
- RadixTree t = new RadixTree() ;
- t.insert(new byte[]{1,2,3,4}) ;
- test(1, t) ;
- }
-
- @Test public void radix_03()
- {
- RadixTree t = new RadixTree() ;
- t.insert(new byte[]{1,2,3,4}) ;
- t.insert(new byte[]{0,1,2,3}) ;
- test(2, t) ;
- }
-
- @Test public void radix_04()
- {
- RadixTree t = new RadixTree() ;
- t.insert(new byte[]{0,1,2,3}) ;
- t.insert(new byte[]{1,2,3,4}) ;
- test(2, t) ;
+
+public class TestRadix extends BaseTest
+{
+ // Test order : This sequence of keys triggers every case of insert.
+
+ static byte[] key1 = { 2 , 4 , 6 , 8 } ;
+
+ static byte[] key2 = { 2 , 4 , 6 , 10 } ;
+ // Insert - shorter key
+ static byte[] key3 = { 2 } ;
+
+ // Insert - existing leaf
+ static byte[] key4 = { 2 , 4 , 6, 8 , 10 } ;
+
+ // Insert - partial prefix match.
+ static byte[] key5 = { 2 , 4 , 3 , 1 } ;
+
+ static byte[] key6 = { 0 , 1 , 2 , 3 , 4 } ;
+
+ @Test public void radix_01()
+ {
+ RadixTree t = new RadixTree() ;
+ test(0, t) ;
+ }
+
+ @Test public void radix_02()
+ {
+ RadixTree t = new RadixTree() ;
+ t.insert(new byte[]{1,2,3,4}) ;
+ test(1, t) ;
+ }
+
+ @Test public void radix_03()
+ {
+ RadixTree t = new RadixTree() ;
+ t.insert(new byte[]{1,2,3,4}) ;
+ t.insert(new byte[]{0,1,2,3}) ;
+ test(2, t) ;
+ }
+
+ @Test public void radix_04()
+ {
+ RadixTree t = new RadixTree() ;
+ t.insert(new byte[]{0,1,2,3}) ;
+ t.insert(new byte[]{1,2,3,4}) ;
+ test(2, t) ;
}
@Test public void radix_10()
@@ -105,7 +105,7 @@ public class TestRadix extends BaseTest
}
t.print() ;
test(keys.length, t) ;
- }
+ }
private String str(RadixTree rt)
{
@@ -130,19 +130,19 @@ public class TestRadix extends BaseTest
}
return sb.toString() ;
}
-
- private static void insert(RadixTree t, byte[] key)
- {
- t.insert(key) ;
- t.check();
- RadixNode n = t.find(key) ;
- assertNotNull(n) ;
- assertEquals(key.length, n.lenFinish) ;
- }
-
- private static void test(int size, RadixTree t)
- {
- t.check();
- assertEquals(size, t.size()) ;
- }
+
+ private static void insert(RadixTree t, byte[] key)
+ {
+ t.insert(key) ;
+ t.check();
+ RadixNode n = t.find(key) ;
+ assertNotNull(n) ;
+ assertEquals(key.length, n.lenFinish) ;
+ }
+
+ private static void test(int size, RadixTree t)
+ {
+ t.check();
+ assertEquals(size, t.size()) ;
+ }
}
Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/skiplist/SkipListTestBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/skiplist/SkipListTestBase.java?rev=1198733&r1=1198732&r2=1198733&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/skiplist/SkipListTestBase.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/skiplist/SkipListTestBase.java Mon Nov 7 13:36:30 2011
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/skiplist/TestSkipList.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/skiplist/TestSkipList.java?rev=1198733&r1=1198732&r2=1198733&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/skiplist/TestSkipList.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/skiplist/TestSkipList.java Mon Nov 7 13:36:30 2011
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/tree/TestTree.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/tree/TestTree.java?rev=1198733&r1=1198732&r2=1198733&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/tree/TestTree.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/tree/TestTree.java Mon Nov 7 13:36:30 2011
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,46 +16,46 @@
* limitations under the License.
*/
-package structure.tree;
-
-import java.util.List;
-
-import org.junit.Test;
-import org.openjena.atlas.junit.BaseTest ;
-
-public class TestTree extends BaseTest
-{
- static TreeNode<String> A = new TreeNode<String>("A") ;
- static TreeNode<String> B = new TreeNode<String>("B") ;
- static TreeNode<String> C = new TreeNode<String>("C") ;
- static TreeNode<String> D = new TreeNode<String>("D") ;
-
- @Test public void tree1()
- {
- TreeNode<String> x = new TreeNode<String>("A") ;
- x.insert("B") ;
- List<String> recs = x.records() ;
- assertEquals(2, recs.size()) ;
- assertEquals("A", recs.get(0)) ;
- assertEquals("B", recs.get(1)) ;
- }
-
-
- @Test public void tree10()
- {
- TreeNode<String> x = new TreeNode<String>("K3", new TreeNode<String>("K1", A, new TreeNode<String>("K2", B, C)), D) ;
- List<String> before = x.records() ;
- x.pivotLeftRight() ;
- List<String> after = x.records() ;
- assertEquals(before, after) ;
- }
-
- @Test public void tree11()
- {
- TreeNode<String> x = new TreeNode<String>("K1", A, new TreeNode<String>("K3", new TreeNode<String>("K2", B, C), D)) ;
- List<String> before = x.records() ;
- x.pivotRightLeft() ;
- List<String> after = x.records() ;
- assertEquals(before, after) ;
- }
+package structure.tree;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.openjena.atlas.junit.BaseTest ;
+
+public class TestTree extends BaseTest
+{
+ static TreeNode<String> A = new TreeNode<String>("A") ;
+ static TreeNode<String> B = new TreeNode<String>("B") ;
+ static TreeNode<String> C = new TreeNode<String>("C") ;
+ static TreeNode<String> D = new TreeNode<String>("D") ;
+
+ @Test public void tree1()
+ {
+ TreeNode<String> x = new TreeNode<String>("A") ;
+ x.insert("B") ;
+ List<String> recs = x.records() ;
+ assertEquals(2, recs.size()) ;
+ assertEquals("A", recs.get(0)) ;
+ assertEquals("B", recs.get(1)) ;
+ }
+
+
+ @Test public void tree10()
+ {
+ TreeNode<String> x = new TreeNode<String>("K3", new TreeNode<String>("K1", A, new TreeNode<String>("K2", B, C)), D) ;
+ List<String> before = x.records() ;
+ x.pivotLeftRight() ;
+ List<String> after = x.records() ;
+ assertEquals(before, after) ;
+ }
+
+ @Test public void tree11()
+ {
+ TreeNode<String> x = new TreeNode<String>("K1", A, new TreeNode<String>("K3", new TreeNode<String>("K2", B, C), D)) ;
+ List<String> before = x.records() ;
+ x.pivotRightLeft() ;
+ List<String> after = x.records() ;
+ assertEquals(before, after) ;
+ }
}
Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/ttree/MainTTree.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/ttree/MainTTree.java?rev=1198733&r1=1198732&r2=1198733&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/ttree/MainTTree.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/ttree/MainTTree.java Mon Nov 7 13:36:30 2011
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,56 +16,56 @@
* limitations under the License.
*/
-package structure.ttree;
-
-import structure.OrderedSet;
-import structure.OrderedSetTestLib;
-import org.openjena.atlas.io.IndentedWriter;
-import org.openjena.atlas.test.Gen;
-
-public class MainTTree
-{
-
- public static void ttree()
- {
- // Insertion element to log. Set -1 for all logged, set very large for no logging
-// {
-// String a[] = { "perf", "50", "500" } ;
-// test.TTreeRun.main(a) ;
-// System.exit(0) ;
-// }
-
- TTree.Logging = true ;
-
- int[] r1 = {15, 99, 59, 94, 35, 45, 66} ;
- int[] r2 = {66, 15, 45, 94, 99, 35, 59};
- // int[] r1 = {8, 133, 22, 83, 74, 39, 72, 81, 91, 4, 26, 56, 0, 68} ;
- // int[] r2 = {0, 83, 56, 133, 74, 72, 26, 39, 22, 68, 8, 91, 81, 4};
-
- try {
- OrderedSet<Integer> sIndx = new TTree<Integer>(4,3) ;
- for ( int i : r1 )
- sIndx.add(i) ;
- OrderedSetTestLib.check(sIndx, r1) ; // These throw java.lang.AssertionError. - catch that
- OrderedSetTestLib.delete(sIndx, r2) ;
-
- sIndx.output(IndentedWriter.stdout) ;
-
- OrderedSetTestLib.check(sIndx) ;
- } catch (RuntimeException ex)
- {
- System.err.printf("int[] r1 = {%s} ;\n", Gen.strings(r1)) ;
- System.err.printf("int[] r2 = {%s}; \n", Gen.strings(r2)) ;
- throw ex ;
- }
- catch (AssertionError ex)
- {
- System.err.printf("int[] r1 = {%s} ;\n", Gen.strings(r1)) ;
- System.err.printf("int[] r2 = {%s}; \n", Gen.strings(r2)) ;
- throw ex ;
- }
- System.exit(0) ;
-
- }
-
+package structure.ttree;
+
+import structure.OrderedSet;
+import structure.OrderedSetTestLib;
+import org.openjena.atlas.io.IndentedWriter;
+import org.openjena.atlas.test.Gen;
+
+public class MainTTree
+{
+
+ public static void ttree()
+ {
+ // Insertion element to log. Set -1 for all logged, set very large for no logging
+// {
+// String a[] = { "perf", "50", "500" } ;
+// test.TTreeRun.main(a) ;
+// System.exit(0) ;
+// }
+
+ TTree.Logging = true ;
+
+ int[] r1 = {15, 99, 59, 94, 35, 45, 66} ;
+ int[] r2 = {66, 15, 45, 94, 99, 35, 59};
+ // int[] r1 = {8, 133, 22, 83, 74, 39, 72, 81, 91, 4, 26, 56, 0, 68} ;
+ // int[] r2 = {0, 83, 56, 133, 74, 72, 26, 39, 22, 68, 8, 91, 81, 4};
+
+ try {
+ OrderedSet<Integer> sIndx = new TTree<Integer>(4,3) ;
+ for ( int i : r1 )
+ sIndx.add(i) ;
+ OrderedSetTestLib.check(sIndx, r1) ; // These throw java.lang.AssertionError. - catch that
+ OrderedSetTestLib.delete(sIndx, r2) ;
+
+ sIndx.output(IndentedWriter.stdout) ;
+
+ OrderedSetTestLib.check(sIndx) ;
+ } catch (RuntimeException ex)
+ {
+ System.err.printf("int[] r1 = {%s} ;\n", Gen.strings(r1)) ;
+ System.err.printf("int[] r2 = {%s}; \n", Gen.strings(r2)) ;
+ throw ex ;
+ }
+ catch (AssertionError ex)
+ {
+ System.err.printf("int[] r1 = {%s} ;\n", Gen.strings(r1)) ;
+ System.err.printf("int[] r2 = {%s}; \n", Gen.strings(r2)) ;
+ throw ex ;
+ }
+ System.exit(0) ;
+
+ }
+
}
Modified: incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/ttree/TestTTree.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/ttree/TestTTree.java?rev=1198733&r1=1198732&r2=1198733&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/ttree/TestTTree.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-lib/test/java/structure/ttree/TestTTree.java Mon Nov 7 13:36:30 2011
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,22 +16,22 @@
* limitations under the License.
*/
-package structure.ttree;
-
-import structure.OrderedSet;
-import structure.OrderedSetTestBase;
-
-public class TestTTree extends OrderedSetTestBase
-{
- static {
- TTree.Checking = true ;
- TTree.Logging = false ;
- TTree.Verbose = false ;
- }
-
- @Override
- protected OrderedSet<Integer> create()
- {
- return new TTree<Integer>(3,2) ;
- }
+package structure.ttree;
+
+import structure.OrderedSet;
+import structure.OrderedSetTestBase;
+
+public class TestTTree extends OrderedSetTestBase
+{
+ static {
+ TTree.Checking = true ;
+ TTree.Logging = false ;
+ TTree.Verbose = false ;
+ }
+
+ @Override
+ protected OrderedSet<Integer> create()
+ {
+ return new TTree<Integer>(3,2) ;
+ }
}