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 2013/08/24 18:25:13 UTC
svn commit: r1517160 - in
/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql: ./ syntax/
transaction/
Author: andy
Date: Sat Aug 24 16:25:12 2013
New Revision: 1517160
URL: http://svn.apache.org/r1517160
Log:
Migrate AbstractTestTransaction from TDB.
Add testing of DatasetGraphWithLock using AbstractTestTransaction.
Some tioying up of test organisation.
Added:
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/AbstractTestTransaction.java
- copied, changed from r1516967, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/AbstractTestTransaction.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/TS_Transaction.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/TestTransactionMem.java
Modified:
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_Scripted.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_SSE.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_Serialization.java
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java?rev=1517160&r1=1517159&r2=1517160&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java Sat Aug 24 16:25:12 2013
@@ -43,6 +43,7 @@ import com.hp.hpl.jena.sparql.resultset.
import com.hp.hpl.jena.sparql.solver.TS_Solver ;
import com.hp.hpl.jena.sparql.syntax.TS_SSE ;
import com.hp.hpl.jena.sparql.syntax.TS_Serialization ;
+import com.hp.hpl.jena.sparql.transaction.TS_Transaction ;
import com.hp.hpl.jena.sparql.util.TS_Util ;
@@ -68,6 +69,7 @@ import com.hp.hpl.jena.sparql.util.TS_Ut
, TS_Path.class
, TS_ParamString.class
, TS_Update.class
+ , TS_Transaction.class
})
public class TC_General extends TestSuite
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_Scripted.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_Scripted.java?rev=1517160&r1=1517159&r2=1517160&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_Scripted.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_Scripted.java Sat Aug 24 16:25:12 2013
@@ -37,6 +37,7 @@ public class TC_Scripted extends TestSui
public TC_Scripted()
{
+ super("Scripted") ;
NodeValue.VerboseWarnings = false ;
E_Function.WarnOnUnknownFunction = false ;
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_SSE.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_SSE.java?rev=1517160&r1=1517159&r2=1517160&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_SSE.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_SSE.java Sat Aug 24 16:25:12 2013
@@ -18,8 +18,6 @@
package com.hp.hpl.jena.sparql.syntax;
-import junit.framework.JUnit4TestAdapter ;
-import junit.framework.TestSuite ;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
import org.junit.runners.Suite.SuiteClasses ;
@@ -30,10 +28,6 @@ import org.junit.runners.Suite.SuiteClas
TestSSE_Forms.class ,
TestSSE_Builder.class
})
-public class TS_SSE extends TestSuite
-{
- public static junit.framework.Test suite()
- {
- return new JUnit4TestAdapter(TS_SSE.class) ;
- }
-}
+public class TS_SSE
+{ }
+
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_Serialization.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_Serialization.java?rev=1517160&r1=1517159&r2=1517160&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_Serialization.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_Serialization.java Sat Aug 24 16:25:12 2013
@@ -18,7 +18,6 @@
package com.hp.hpl.jena.sparql.syntax;
-import junit.framework.TestSuite ;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
import org.junit.runners.Suite.SuiteClasses ;
@@ -27,6 +26,5 @@ import org.junit.runners.Suite.SuiteClas
@SuiteClasses( {
TestSerialization.class
})
-public class TS_Serialization extends TestSuite
-{
-}
+public class TS_Serialization
+{ }
Copied: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/AbstractTestTransaction.java (from r1516967, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/AbstractTestTransaction.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/AbstractTestTransaction.java?p2=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/AbstractTestTransaction.java&p1=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/AbstractTestTransaction.java&r1=1516967&r2=1517160&rev=1517160&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/AbstractTestTransaction.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/AbstractTestTransaction.java Sat Aug 24 16:25:12 2013
@@ -16,26 +16,19 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.migrate;
+package com.hp.hpl.jena.sparql.transaction;
import static com.hp.hpl.jena.query.ReadWrite.READ ;
import static com.hp.hpl.jena.query.ReadWrite.WRITE ;
import org.apache.jena.atlas.junit.BaseTest ;
-import org.apache.jena.atlas.logging.Log ;
-import org.junit.AfterClass ;
-import org.junit.BeforeClass ;
import org.junit.Test ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.ReadWrite ;
import com.hp.hpl.jena.sparql.JenaTransactionException ;
-import com.hp.hpl.jena.tdb.sys.SystemTDB ;
public abstract class AbstractTestTransaction extends BaseTest
{
- @BeforeClass public static void beforeClassLoggingOff() { Log.disable(SystemTDB.errlog.getName()) ; }
- @AfterClass public static void afterClassLoggingOn() { Log.enable(SystemTDB.errlog.getName(), "info") ; }
-
//MIGRATE
protected abstract Dataset create() ;
@@ -141,7 +134,6 @@ public abstract class AbstractTestTransa
read2(ds) ;
}
- // if parameterised tests had decent naming ...
@Test
public void transaction_err_01() { testBeginBegin(WRITE, WRITE) ; }
Added: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/TS_Transaction.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/TS_Transaction.java?rev=1517160&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/TS_Transaction.java (added)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/TS_Transaction.java Sat Aug 24 16:25:12 2013
@@ -0,0 +1,31 @@
+/**
+ * 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.sparql.transaction;
+
+import junit.framework.TestSuite ;
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+import org.junit.runners.Suite.SuiteClasses ;
+
+@RunWith(Suite.class)
+@SuiteClasses( {
+ TestTransactionMem.class
+})
+public class TS_Transaction extends TestSuite
+{ }
Added: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/TestTransactionMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/TestTransactionMem.java?rev=1517160&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/TestTransactionMem.java (added)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/transaction/TestTransactionMem.java Sat Aug 24 16:25:12 2013
@@ -0,0 +1,47 @@
+/**
+ * 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.sparql.transaction;
+
+import org.junit.Test ;
+
+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.core.DatasetGraphWithLock ;
+
+public class TestTransactionMem extends AbstractTestTransaction
+{
+ @Override
+ protected Dataset create()
+ {
+ DatasetGraph dsg = DatasetGraphFactory.createMem() ;
+ DatasetGraphWithLock dsgl = new DatasetGraphWithLock(dsg) ;
+ return DatasetFactory.create(dsgl) ;
+ }
+
+ // Tests that don't make sense because they abort a write transaction.
+ @Test @Override public void transaction_err_10() {}
+ @Test @Override public void transaction_err_12() {}
+ @Test @Override public void transaction_03() {}
+ @Test @Override public void transaction_05() {}
+ @Test @Override public void transaction_06() {}
+
+ }
+