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 2012/11/15 14:48:32 UTC
svn commit: r1409776 - in
/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction:
AbstractTestNodeTableTrans.java TS_Transaction.java
TestTransactionUnionGraph.java
Author: andy
Date: Thu Nov 15 13:48:31 2012
New Revision: 1409776
URL: http://svn.apache.org/viewvc?rev=1409776&view=rev
Log:
JENA-346
Tests.
Added:
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransactionUnionGraph.java
Modified:
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_Transaction.java
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java?rev=1409776&r1=1409775&r2=1409776&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java Thu Nov 15 13:48:31 2012
@@ -146,81 +146,6 @@ public abstract class AbstractTestNodeTa
ntt.commitClearup(txn) ;
}
- // Tests 05 and 06 test reuse of a NodeTableTrans
- // Tests 07 and 08 test creations of a NodeTableTrans where the first has "prepared"
-
- // False test. Not valid after ntt.commitClearup
-// @Test
-// public void nodetrans_XX_01()
-// {
-// // 2 transactions - no blocking reader
-// NodeTableTrans ntt = create(node1) ;
-// NodeId nodeId1 = ntt.getBaseNodeTable().getNodeIdForNode(node1) ;
-//
-// Transaction txn1 = createTxn(11) ;
-// ntt.begin(txn1) ;
-// NodeId nodeId2 = ntt.getAllocateNodeId(node2) ;
-// ntt.commitPrepare(txn1) ;
-// ntt.commitEnact(txn1) ;
-// ntt.commitClearup(txn1) ;
-//
-// Transaction txn2 = createTxn(12) ;
-// ntt.begin(txn2) ;
-// assertEquals(nodeId1, ntt.getNodeIdForNode(node1)) ;
-// assertEquals(nodeId2, ntt.getNodeIdForNode(node2)) ;
-// NodeId nodeId3 = ntt.getAllocateNodeId(node3) ;
-// assertEquals(nodeId3, ntt.getNodeIdForNode(node3)) ;
-// ntt.commitPrepare(txn2) ;
-// ntt.commitEnact(txn2) ;
-// ntt.commitClearup(txn2) ;
-//
-// assertEquals(nodeId1, ntt.getBaseNodeTable().getNodeIdForNode(node1)) ;
-// assertEquals(nodeId2, ntt.getBaseNodeTable().getNodeIdForNode(node2)) ;
-// assertEquals(nodeId3, ntt.getBaseNodeTable().getNodeIdForNode(node3)) ;
-// }
-
-// // False test. One transaction - one NTT
-// @Test
-// public void nodetrans_XX_02()
-// {
-// // 2 transactions - blocking reader
-// Transaction txn1 = createTxn(11) ;
-// NodeTableTrans ntt = create(txn1, node1) ;
-// NodeTable ntt0 = ntt.getBaseNodeTable() ;
-// NodeId nodeId1 = ntt0.getNodeIdForNode(node1) ;
-//
-// ntt.begin(txn1) ;
-// NodeId nodeId2 = ntt.getAllocateNodeId(node2) ;
-// assertNotEquals(nodeId1, nodeId2) ;
-// ntt.commitPrepare(txn1) ;
-//
-// assertEquals(nodeId1, ntt0.getNodeIdForNode(node1)) ;
-// assertEquals(nodeId2, ntt0.getNodeIdForNode(node2)) ;
-//
-// // READ - don't enact
-//
-// Transaction txn2 = createTxn(12) ;
-// ntt.begin(txn2) ;
-// assertEquals(nodeId1, ntt.getNodeIdForNode(node1)) ;
-// ntt.getNodeIdForNode(node2) ;
-// assertEquals(nodeId2, ntt.getNodeIdForNode(node2)) ;
-//
-// NodeId nodeId3 = ntt.getAllocateNodeId(node3) ;
-// assertEquals(nodeId3, ntt.getNodeIdForNode(node3)) ;
-// ntt.commitPrepare(txn2) ;
-//
-// // READ ends.
-//
-// ntt.commitEnact(txn1) ;
-// ntt.commitClearup(txn1) ;
-//
-// ntt.commitEnact(txn2) ;
-// ntt.commitClearup(txn2) ;
-//
-// assertEquals(nodeId1, ntt.getBaseNodeTable().getNodeIdForNode(node1)) ;
-// assertEquals(nodeId2, ntt.getBaseNodeTable().getNodeIdForNode(node2)) ;
-// assertEquals(nodeId3, ntt.getBaseNodeTable().getNodeIdForNode(node3)) ;
-// }
@Test
public void nodetrans_05()
@@ -288,5 +213,22 @@ public abstract class AbstractTestNodeTa
assertEquals(nodeId2, ntt1.getBaseNodeTable().getNodeIdForNode(node2)) ;
assertEquals(nodeId3, ntt1.getBaseNodeTable().getNodeIdForNode(node3)) ;
}
+
+ @Test
+ public void nodetrans_07()
+ {
+ Transaction txn = createTxn(13) ;
+ NodeTableTrans ntt = create(txn) ;
+
+ ntt.begin(txn) ;
+ assertEquals(NodeId.NodeIdAny, ntt.getNodeIdForNode(Node.ANY)) ;
+ assertEquals(Node.ANY, ntt.getNodeForNodeId(NodeId.NodeIdAny)) ;
+
+ assertTrue(ntt.isEmpty()) ;
+
+ ntt.commitPrepare(txn) ;
+ ntt.commitEnact(txn) ;
+ ntt.commitClearup(txn) ;
+ }
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_Transaction.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_Transaction.java?rev=1409776&r1=1409775&r2=1409776&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_Transaction.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_Transaction.java Thu Nov 15 13:48:31 2012
@@ -38,6 +38,7 @@ import org.junit.runners.Suite ;
, TestTransDiskMapped.class
, TestTransRestart.class
, TestTransactionTDB.class
+ , TestTransactionUnionGraph.class
})
public class TS_Transaction
{
Added: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransactionUnionGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransactionUnionGraph.java?rev=1409776&view=auto
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransactionUnionGraph.java (added)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransactionUnionGraph.java Thu Nov 15 13:48:31 2012
@@ -0,0 +1,160 @@
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.tdb.transaction;
+
+import org.junit.* ;
+import org.openjena.atlas.junit.BaseTest ;
+
+import com.hp.hpl.jena.query.* ;
+import static com.hp.hpl.jena.query.ReadWrite.* ;
+import com.hp.hpl.jena.sparql.sse.SSE ;
+import com.hp.hpl.jena.tdb.TDB ;
+import com.hp.hpl.jena.tdb.TDBFactory ;
+
+/** Tests of transactions and the TDG union graph */
+public class TestTransactionUnionGraph extends BaseTest
+{
+ private Dataset ds ;
+
+// @BeforeClass public static void beforeClass()
+// {
+// ds = TDBFactory.createDataset() ;
+// ds.asDatasetGraph().add(SSE.parseQuad("(<g> <s> <p> 1)")) ;
+// }
+// @AfterClass public static void afterClass() { ds = null ; }
+
+ @Before
+ public void before()
+ {
+ ds = TDBFactory.createDataset() ;
+ ds.asDatasetGraph().add(SSE.parseQuad("(<g> <s> <p> 1)")) ;
+ }
+
+ @After public void after() {}
+
+ @Test public void uniontxn_global_r()
+ {
+ ARQ.getContext().setTrue(TDB.symUnionDefaultGraph) ;
+ test(ReadWrite.READ) ;
+ ARQ.getContext().unset(TDB.symUnionDefaultGraph) ;
+ }
+
+ @Test public void uniontxn_global_w()
+ {
+ ARQ.getContext().setTrue(TDB.symUnionDefaultGraph) ;
+ test(ReadWrite.WRITE) ;
+ ARQ.getContext().unset(TDB.symUnionDefaultGraph) ;
+ }
+
+ @Test public void uniontxn_ds_r_1()
+ {
+ ds.getContext().setTrue(TDB.symUnionDefaultGraph) ;
+ test(ReadWrite.READ) ;
+ ds.getContext().unset(TDB.symUnionDefaultGraph) ;
+ }
+
+ @Test public void uniontxn_ds_w_1()
+ {
+ ds.getContext().setTrue(TDB.symUnionDefaultGraph) ;
+ test(ReadWrite.WRITE) ;
+ ds.getContext().unset(TDB.symUnionDefaultGraph) ;
+ }
+
+
+ // Set after a transaction.
+ @Test public void uniontxn_ds_rr()
+ {
+ ds.begin(READ) ;
+ ds.commit();
+ ds.end() ;
+
+ ds.getContext().setTrue(TDB.symUnionDefaultGraph) ;
+ test(ReadWrite.READ) ;
+ //ds.getContext().unset(TDB.symUnionDefaultGraph) ;
+ }
+
+ @Test public void uniontxn_ds_wr()
+ {
+ ds.begin(WRITE) ;
+ ds.commit();
+ ds.end() ;
+
+ ds.getContext().setTrue(TDB.symUnionDefaultGraph) ;
+ test(ReadWrite.READ) ;
+ //ds.getContext().unset(TDB.symUnionDefaultGraph) ;
+ }
+
+ @Test public void uniontxn_ds_ww()
+ {
+ ds.begin(WRITE) ;
+ ds.commit();
+ ds.end() ;
+
+ ds.getContext().setTrue(TDB.symUnionDefaultGraph) ;
+ test(ReadWrite.WRITE) ;
+ //ds.getContext().unset(TDB.symUnionDefaultGraph) ;
+ }
+
+ @Test public void uniontxn_ds_rw()
+ {
+ ds.begin(READ) ;
+ ds.commit();
+ ds.end() ;
+
+ ds.getContext().setTrue(TDB.symUnionDefaultGraph) ;
+ test(ReadWrite.WRITE) ;
+ //ds.getContext().unset(TDB.symUnionDefaultGraph) ;
+ }
+
+ private void test(ReadWrite mode)
+ {
+ ds.begin(mode) ;
+ Query q = QueryFactory.create("SELECT * { { ?s ?p ?o } UNION { GRAPH ?g { ?s ?p ?o }}}") ;
+ QueryExecution qExec = QueryExecutionFactory.create(q, ds) ;
+ long count = ResultSetFormatter.consume(qExec.execSelect()) ;
+ ds.commit() ;
+ ds.end() ;
+ assertEquals(2, count) ;
+ }
+
+ @Test public void uniontxn05()
+ {
+ test2(READ) ;
+ }
+
+ @Test public void uniontxn06()
+ {
+ test2(WRITE) ;
+ }
+
+ // Sets the context of the execution
+ private void test2(ReadWrite mode)
+ {
+ ds.begin(mode) ;
+ Query q = QueryFactory.create("SELECT * { { ?s ?p ?o } UNION { GRAPH ?g { ?s ?p ?o }}}") ;
+ QueryExecution qExec = QueryExecutionFactory.create(q, ds) ;
+ qExec.getContext().setTrue(TDB.symUnionDefaultGraph) ;
+ long count = ResultSetFormatter.consume(qExec.execSelect()) ;
+ ds.commit() ;
+ ds.end() ;
+ assertEquals(2, count) ;
+ }
+
+}
+