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 2014/01/06 15:07:30 UTC
svn commit: r1555786 - in /jena/Experimental/rdfpatch/src:
main/java/org/apache/jena/rdfpatch/ test/java/org/apache/jena/rdfpatch/
Author: andy
Date: Mon Jan 6 14:07:29 2014
New Revision: 1555786
URL: http://svn.apache.org/r1555786
Log:
Add transaction tests from AbstractTestTransactions.\nFully integrate with DatasetGraphWithLock
Added:
jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TestPatchTransaction.java
- copied, changed from r1555701, jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TestRDFPatch.java
jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TestTransactionPatch.java
Removed:
jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TestRDFPatch.java
Modified:
jena/Experimental/rdfpatch/src/main/java/org/apache/jena/rdfpatch/DatasetGraphPatchTransaction.java
jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TS_RDFPatch.java
Modified: jena/Experimental/rdfpatch/src/main/java/org/apache/jena/rdfpatch/DatasetGraphPatchTransaction.java
URL: http://svn.apache.org/viewvc/jena/Experimental/rdfpatch/src/main/java/org/apache/jena/rdfpatch/DatasetGraphPatchTransaction.java?rev=1555786&r1=1555785&r2=1555786&view=diff
==============================================================================
--- jena/Experimental/rdfpatch/src/main/java/org/apache/jena/rdfpatch/DatasetGraphPatchTransaction.java (original)
+++ jena/Experimental/rdfpatch/src/main/java/org/apache/jena/rdfpatch/DatasetGraphPatchTransaction.java Mon Jan 6 14:07:29 2014
@@ -72,9 +72,7 @@ public class DatasetGraphPatchTransactio
protected void _abort() {
if ( isTransactionType(ReadWrite.WRITE) )
DatasetGraphPlayer.play(delta.get().getActions(), dataset, Direction.BACKWARDS) ;
- // fakery for super.abort()
- if ( isTransactionType(ReadWrite.WRITE) )
- super._end() ;
+ super._abort() ;
}
@Override
@@ -83,6 +81,9 @@ public class DatasetGraphPatchTransactio
super._end() ;
}
+ @Override
+ protected boolean abortImplemented() { return true ; }
+
static class DatasetChangesTransaction implements DatasetChanges {
private DatasetChangesCapture changes ;
public DatasetChangesCapture get() { return changes ; }
Modified: jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TS_RDFPatch.java
URL: http://svn.apache.org/viewvc/jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TS_RDFPatch.java?rev=1555786&r1=1555785&r2=1555786&view=diff
==============================================================================
--- jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TS_RDFPatch.java (original)
+++ jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TS_RDFPatch.java Mon Jan 6 14:07:29 2014
@@ -23,8 +23,9 @@ import org.junit.runners.Suite ;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
- TestRDFPatch.class
+ TestPatchTransaction.class
, TestPatchPlayer.class
+ , TestTransactionPatch.class
})
public class TS_RDFPatch { }
Copied: jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TestPatchTransaction.java (from r1555701, jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TestRDFPatch.java)
URL: http://svn.apache.org/viewvc/jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TestPatchTransaction.java?p2=jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TestPatchTransaction.java&p1=jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TestRDFPatch.java&r1=1555701&r2=1555786&rev=1555786&view=diff
==============================================================================
--- jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TestRDFPatch.java (original)
+++ jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TestPatchTransaction.java Mon Jan 6 14:07:29 2014
@@ -27,7 +27,8 @@ import com.hp.hpl.jena.sparql.core.Datas
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.sse.SSE ;
-public class TestRDFPatch extends BaseTest
+/** Tests directly of the replay-based transaction mechanism */
+public class TestPatchTransaction extends BaseTest
{
private static DatasetGraphPatchTransaction create(Quad...quads) {
DatasetGraph dsg1 = DatasetGraphFactory.createMem() ;
Added: jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TestTransactionPatch.java
URL: http://svn.apache.org/viewvc/jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TestTransactionPatch.java?rev=1555786&view=auto
==============================================================================
--- jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TestTransactionPatch.java (added)
+++ jena/Experimental/rdfpatch/src/test/java/org/apache/jena/rdfpatch/TestTransactionPatch.java Mon Jan 6 14:07:29 2014
@@ -0,0 +1,36 @@
+/**
+ * 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 org.apache.jena.rdfpatch;
+
+import com.hp.hpl.jena.query.Dataset ;
+import com.hp.hpl.jena.query.DatasetFactory ;
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
+import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
+import com.hp.hpl.jena.sparql.transaction.AbstractTestTransaction ;
+
+public class TestTransactionPatch extends AbstractTestTransaction
+{
+ @Override
+ protected Dataset create() {
+ DatasetGraph dsg1 = DatasetGraphFactory.createMem() ;
+ DatasetGraphPatchTransaction dsg = new DatasetGraphPatchTransaction(dsg1) ;
+ return DatasetFactory.create(dsg) ;
+ }
+}
+