http://git-wip-us.apache.org/repos/asf/jena/blob/c665f630/jena-tdb/src/test/java/org/apache/jena/tdb/store/tupletable/TestTupleIndexRecordDirect.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/store/tupletable/TestTupleIndexRecordDirect.java b/jena-tdb/src/test/java/org/apache/jena/tdb/store/tupletable/TestTupleIndexRecordDirect.java index 0099187..8d461ed 100644 --- a/jena-tdb/src/test/java/org/apache/jena/tdb/store/tupletable/TestTupleIndexRecordDirect.java +++ b/jena-tdb/src/test/java/org/apache/jena/tdb/store/tupletable/TestTupleIndexRecordDirect.java @@ -18,14 +18,13 @@ package org.apache.jena.tdb.store.tupletable; -import static org.apache.jena.atlas.lib.Tuple.createTuple ; - import java.util.Iterator ; import java.util.Set ; import org.apache.jena.atlas.iterator.Iter ; import org.apache.jena.atlas.junit.BaseTest ; -import org.apache.jena.atlas.lib.Tuple ; +import org.apache.jena.atlas.lib.tuple.Tuple ; +import org.apache.jena.atlas.lib.tuple.TupleFactory ; import org.apache.jena.tdb.base.file.FileSet ; import org.apache.jena.tdb.base.record.RecordFactory ; import org.apache.jena.tdb.index.IndexFactory ; @@ -34,7 +33,6 @@ import org.apache.jena.tdb.index.RangeIndex ; import org.apache.jena.tdb.lib.ColumnMap ; import org.apache.jena.tdb.setup.StoreParams ; import org.apache.jena.tdb.store.NodeId ; -import org.apache.jena.tdb.store.tupletable.TupleIndexRecord ; import org.apache.jena.tdb.sys.SystemTDB ; import org.junit.Test ; @@ -59,7 +57,7 @@ public class TestTupleIndexRecordDirect extends BaseTest static void add(TupleIndexRecord index, NodeId x1, NodeId x2, NodeId x3) { - Tuple<NodeId> tuple = createTuple(x1, x2, x3) ; + Tuple<NodeId> tuple = TupleFactory.tuple(x1, x2, x3) ; index.add(tuple) ; } @@ -74,7 +72,7 @@ public class TestTupleIndexRecordDirect extends BaseTest TupleIndexRecord index = create("SPO") ; add(index, n1, n2, n3) ; - Tuple<NodeId> tuple2 = createTuple(n1, n2, n3) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n1, n2, n3) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; assertTrue(iter.hasNext()) ; iter.next(); @@ -86,7 +84,7 @@ public class TestTupleIndexRecordDirect extends BaseTest TupleIndexRecord index = create("SPO") ; add(index, n1, n2, n3) ; - Tuple<NodeId> tuple2 = createTuple(n1, n2, null) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n1, n2, null) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; assertTrue(iter.hasNext()) ; iter.next(); @@ -98,7 +96,7 @@ public class TestTupleIndexRecordDirect extends BaseTest TupleIndexRecord index = create("SPO") ; add(index, n1, n2, n3) ; - Tuple<NodeId> tuple2 = createTuple(n1, null, n3) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n1, null, n3) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; assertNull(iter) ; iter = index.findOrPartialScan(tuple2) ; @@ -112,7 +110,7 @@ public class TestTupleIndexRecordDirect extends BaseTest TupleIndexRecord index = create("SPO") ; add(index, n1, n2, n3) ; - Tuple<NodeId> tuple2 = createTuple(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; assertTrue(iter.hasNext()) ; iter.next(); @@ -125,12 +123,12 @@ public class TestTupleIndexRecordDirect extends BaseTest add(index, n1, n2, n3) ; add(index, n1, n2, n4) ; - Tuple<NodeId> tuple2 = createTuple(n1, n2, n3) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n1, n2, n3) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; Set<Tuple<NodeId>> x = Iter.toSet(iter) ; assertEquals(1, x.size()) ; - assertTrue(x.contains(createTuple(n1, n2, n3))) ; - assertFalse(x.contains(createTuple(n1, n2, n4))) ; + assertTrue(x.contains(TupleFactory.tuple(n1, n2, n3))) ; + assertFalse(x.contains(TupleFactory.tuple(n1, n2, n4))) ; } @Test public void TupleIndexRecordSPO_6() @@ -139,12 +137,12 @@ public class TestTupleIndexRecordDirect extends BaseTest add(index, n1, n2, n3) ; add(index, n1, n2, n4) ; - Tuple<NodeId> tuple2 = createTuple(n1, n2, NodeId.NodeIdAny) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n1, n2, NodeId.NodeIdAny) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; Set<Tuple<NodeId>> x = Iter.toSet(iter) ; assertEquals(2, x.size()) ; - assertTrue(x.contains(createTuple(n1, n2, n3))) ; - assertTrue(x.contains(createTuple(n1, n2, n4))) ; + assertTrue(x.contains(TupleFactory.tuple(n1, n2, n3))) ; + assertTrue(x.contains(TupleFactory.tuple(n1, n2, n4))) ; } @Test public void TupleIndexRecordSPO_7() @@ -153,12 +151,12 @@ public class TestTupleIndexRecordDirect extends BaseTest add(index, n1, n2, n3) ; add(index, n1, n2, n4) ; - Tuple<NodeId> tuple2 = createTuple(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; Set<Tuple<NodeId>> x = Iter.toSet(iter) ; assertEquals(2, x.size()) ; - assertTrue(x.contains(createTuple(n1, n2, n3))) ; - assertTrue(x.contains(createTuple(n1, n2, n4))) ; + assertTrue(x.contains(TupleFactory.tuple(n1, n2, n3))) ; + assertTrue(x.contains(TupleFactory.tuple(n1, n2, n4))) ; } @Test public void TupleIndexRecordSPO_8() @@ -168,19 +166,19 @@ public class TestTupleIndexRecordDirect extends BaseTest add(index, n2, n3, n4) ; { - Tuple<NodeId> tuple2 = createTuple(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; Set<Tuple<NodeId>> x = Iter.toSet(iter) ; assertEquals(1, x.size()) ; - assertTrue(x.contains(createTuple(n1, n2, n3))) ; + assertTrue(x.contains(TupleFactory.tuple(n1, n2, n3))) ; } { - Tuple<NodeId> tuple2 = createTuple(n2, NodeId.NodeIdAny, NodeId.NodeIdAny) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n2, NodeId.NodeIdAny, NodeId.NodeIdAny) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; Set<Tuple<NodeId>> x = Iter.toSet(iter) ; assertEquals(1, x.size()) ; - assertTrue(x.contains(createTuple(n2, n3, n4))) ; + assertTrue(x.contains(TupleFactory.tuple(n2, n3, n4))) ; } } @@ -188,7 +186,7 @@ public class TestTupleIndexRecordDirect extends BaseTest { TupleIndexRecord index = create("POS") ; add(index, n1, n2, n3) ; - Tuple<NodeId> tuple2 = createTuple(n1, n2, n3) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n1, n2, n3) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; assertTrue("Can't find tuple", iter.hasNext()) ; iter.next(); @@ -200,7 +198,7 @@ public class TestTupleIndexRecordDirect extends BaseTest TupleIndexRecord index = create("POS") ; add(index, n1, n2, n3) ; - Tuple<NodeId> tuple2 = createTuple(null, n2, null) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(null, n2, null) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; assertTrue("Can't find tuple",iter.hasNext()) ; iter.next(); @@ -213,7 +211,7 @@ public class TestTupleIndexRecordDirect extends BaseTest TupleIndexRecord index = create("POS") ; add(index, n1, n2, n3) ; - Tuple<NodeId> tuple2 = createTuple(null, n2, n3) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(null, n2, n3) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; assertTrue("Can't find tuple", iter.hasNext()) ; iter.next(); @@ -224,7 +222,7 @@ public class TestTupleIndexRecordDirect extends BaseTest { TupleIndexRecord index = create("SPO") ; add(index, n1, n2, n3) ; - Tuple<NodeId> tuple2 = createTuple(n1, null, n3) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n1, null, n3) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; assertNull(iter) ; iter = index.findOrPartialScan(tuple2) ; @@ -240,7 +238,7 @@ public class TestTupleIndexRecordDirect extends BaseTest add(index, n1, n2, n4) ; - Tuple<NodeId> tuple2 = createTuple(null, null, n3) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(null, null, n3) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; assertNull(iter) ; @@ -258,7 +256,7 @@ public class TestTupleIndexRecordDirect extends BaseTest TupleIndexRecord index = create("SPO") ; add(index, n1, n2, n3) ; - Tuple<NodeId> tuple2 = createTuple(n4, n5, n6) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n4, n5, n6) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; assertNotNull(iter) ; assertFalse(iter.hasNext()) ; @@ -269,7 +267,7 @@ public class TestTupleIndexRecordDirect extends BaseTest TupleIndexRecord index = create("SPO") ; add(index, n1, n2, n3) ; - Tuple<NodeId> tuple2 = createTuple(n1, n5, n6) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n1, n5, n6) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; assertFalse(iter.hasNext()) ; } @@ -279,7 +277,7 @@ public class TestTupleIndexRecordDirect extends BaseTest TupleIndexRecord index = create("SPO") ; add(index, n1, n2, n3) ; - Tuple<NodeId> tuple2 = createTuple(n1, null, n6) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n1, null, n6) ; Iterator<Tuple<NodeId>> iter = index.findOrPartialScan(tuple2) ; assertFalse(iter.hasNext()) ; } @@ -290,7 +288,7 @@ public class TestTupleIndexRecordDirect extends BaseTest add(index, n1, n2, n3) ; add(index, n1, n5, n6) ; - Tuple<NodeId> tuple2 = createTuple(n4, n5, n6) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n4, n5, n6) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; assertFalse(iter.hasNext()) ; } @@ -301,7 +299,7 @@ public class TestTupleIndexRecordDirect extends BaseTest add(index, n1, n2, n3) ; add(index, n1, n5, n6) ; - Tuple<NodeId> tuple2 = createTuple(n2, n5, n6) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n2, n5, n6) ; Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ; assertFalse(iter.hasNext()) ; } @@ -312,7 +310,7 @@ public class TestTupleIndexRecordDirect extends BaseTest add(index, n1, n2, n3) ; add(index, n4, n5, n6) ; - Tuple<NodeId> tuple2 = createTuple(n1, null, n6) ; + Tuple<NodeId> tuple2 = TupleFactory.tuple(n1, null, n6) ; Iterator<Tuple<NodeId>> iter = index.findOrPartialScan(tuple2) ; assertFalse(iter.hasNext()) ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/c665f630/jena-tdb/src/test/java/org/apache/jena/tdb/store/tupletable/TestTupleTable.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/store/tupletable/TestTupleTable.java b/jena-tdb/src/test/java/org/apache/jena/tdb/store/tupletable/TestTupleTable.java index 4664f2c..7fca005 100644 --- a/jena-tdb/src/test/java/org/apache/jena/tdb/store/tupletable/TestTupleTable.java +++ b/jena-tdb/src/test/java/org/apache/jena/tdb/store/tupletable/TestTupleTable.java @@ -23,13 +23,11 @@ import java.util.List; import org.apache.jena.atlas.iterator.Iter ; import org.apache.jena.atlas.junit.BaseTest ; -import org.apache.jena.atlas.lib.Tuple ; +import org.apache.jena.atlas.lib.tuple.Tuple ; +import org.apache.jena.atlas.lib.tuple.TupleFactory ; import org.apache.jena.tdb.base.record.RecordFactory ; import org.apache.jena.tdb.store.NodeId ; -import org.apache.jena.tdb.store.tupletable.TupleIndex ; -import org.apache.jena.tdb.store.tupletable.TupleTable ; import org.apache.jena.tdb.sys.SystemTDB ; -import static org.apache.jena.atlas.lib.Tuple.* ; import org.junit.Test; @@ -63,7 +61,7 @@ public class TestTupleTable extends BaseTest static void add(TupleTable table, NodeId x1, NodeId x2, NodeId x3) { - Tuple<NodeId> tuple = createTuple(x1, x2, x3) ; + Tuple<NodeId> tuple = TupleFactory.tuple(x1, x2, x3) ; table.add(tuple) ; } @@ -74,13 +72,13 @@ public class TestTupleTable extends BaseTest TupleTable table = create() ; add(table, n1, n2, n3) ; // Cast removes compile lint warning. - Tuple<NodeId> pat = createTuple((NodeId)null, null, null) ; + Tuple<NodeId> pat = TupleFactory.tuple((NodeId)null, null, null) ; Iterator<Tuple<NodeId>> iter = table.find(pat) ; List<Tuple<NodeId>> x = Iter.toList(iter) ; int z = x.size() ; assertEquals(1, z) ; Tuple<NodeId> e1 = x.get(0) ; - assertEquals(createTuple(n1, n2, n3) , e1) ; + assertEquals(TupleFactory.tuple(n1, n2, n3) , e1) ; } @Test public void createFind2() @@ -89,7 +87,7 @@ public class TestTupleTable extends BaseTest add(table, n1, n2, n3) ; add(table, n1, n2, n4) ; - Tuple<NodeId> pat = createTuple(null, n2, null) ; + Tuple<NodeId> pat = TupleFactory.tuple(null, n2, null) ; Iterator<Tuple<NodeId>> iter = table.find(pat) ; assertNotNull(iter) ; List<Tuple<NodeId>> x = Iter.toList(iter) ; @@ -98,8 +96,8 @@ public class TestTupleTable extends BaseTest Tuple<NodeId> e1 = x.get(0) ; Tuple<NodeId> e2 = x.get(1) ; - assertEquals(createTuple(n1, n2, n3) , e1) ; - assertEquals(createTuple(n1, n2, n4) , e2) ; + assertEquals(TupleFactory.tuple(n1, n2, n3) , e1) ; + assertEquals(TupleFactory.tuple(n1, n2, n4) , e2) ; } @Test public void createFind3() @@ -109,7 +107,7 @@ public class TestTupleTable extends BaseTest add(table, n1, n2, n3) ; add(table, n1, n2, n4) ; - Tuple<NodeId> pat = createTuple(n1, null, n3) ; + Tuple<NodeId> pat = TupleFactory.tuple(n1, null, n3) ; Iterator<Tuple<NodeId>> iter = table.find(pat) ; assertNotNull(iter) ; List<Tuple<NodeId>> x = Iter.toList(iter) ; @@ -117,7 +115,7 @@ public class TestTupleTable extends BaseTest assertEquals(1, z) ; Tuple<NodeId> e1 = x.get(0) ; - assertEquals(createTuple(n1, n2, n3) , e1) ; + assertEquals(TupleFactory.tuple(n1, n2, n3) , e1) ; } @Test public void createFind4() @@ -127,7 +125,7 @@ public class TestTupleTable extends BaseTest add(table, n1, n2, n3) ; add(table, n1, n2, n4) ; - Tuple<NodeId> pat = createTuple(null, null, n3) ; + Tuple<NodeId> pat = TupleFactory.tuple(null, null, n3) ; Iterator<Tuple<NodeId>> iter = table.find(pat) ; assertNotNull(iter) ; List<Tuple<NodeId>> x = Iter.toList(iter) ; @@ -135,7 +133,7 @@ public class TestTupleTable extends BaseTest assertEquals(1, z) ; Tuple<NodeId> e1 = x.get(0) ; - assertEquals(createTuple(n1, n2, n3) , e1) ; + assertEquals(TupleFactory.tuple(n1, n2, n3) , e1) ; } @Test public void createFind5() @@ -145,7 +143,7 @@ public class TestTupleTable extends BaseTest add(table, n1, n2, n3) ; add(table, n1, n2, n4) ; - Tuple<NodeId> pat = createTuple(null, NodeId.NodeIdAny, n3) ; + Tuple<NodeId> pat = TupleFactory.tuple(null, NodeId.NodeIdAny, n3) ; Iterator<Tuple<NodeId>> iter = table.find(pat) ; assertNotNull(iter) ; List<Tuple<NodeId>> x = Iter.toList(iter) ; @@ -153,7 +151,7 @@ public class TestTupleTable extends BaseTest assertEquals(1, z) ; Tuple<NodeId> e1 = x.get(0) ; - assertEquals(createTuple(n1, n2, n3) , e1) ; + assertEquals(TupleFactory.tuple(n1, n2, n3) , e1) ; } }
