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/01/20 15:26:02 UTC
svn commit: r1233922 - in /incubator/jena/Jena2/TDB/trunk: src-dev/dev/
src/main/java/com/hp/hpl/jena/tdb/
src/test/java/com/hp/hpl/jena/tdb/assembler/
src/test/java/com/hp/hpl/jena/tdb/store/
Author: andy
Date: Fri Jan 20 14:26:01 2012
New Revision: 1233922
URL: http://svn.apache.org/viewvc?rev=1233922&view=rev
Log:
Clear up after assembler tests to rmove order dependency in test suite.
Added:
incubator/jena/Jena2/TDB/trunk/src-dev/dev/Tests.java
Modified:
incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java
incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/assembler/TestTDBAssembler.java
incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java
incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestGraphTDB.java
Added: incubator/jena/Jena2/TDB/trunk/src-dev/dev/Tests.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src-dev/dev/Tests.java?rev=1233922&view=auto
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src-dev/dev/Tests.java (added)
+++ incubator/jena/Jena2/TDB/trunk/src-dev/dev/Tests.java Fri Jan 20 14:26:01 2012
@@ -0,0 +1,32 @@
+/**
+ * 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 dev;
+
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses( {
+})
+
+public class Tests
+{
+
+}
+
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java?rev=1233922&r1=1233921&r2=1233922&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java Fri Jan 20 14:26:01 2012
@@ -106,7 +106,7 @@ public class TDBFactory
return dsg ;
}
// Not transactional - add the switching wrapper.
- return asTransactional(TDBMaker._createDatasetGraph(location)) ; }
+ return asTransactional(dsg) ; }
private static DatasetGraph _createDatasetGraph()
{
Modified: incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/assembler/TestTDBAssembler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/assembler/TestTDBAssembler.java?rev=1233922&r1=1233921&r2=1233922&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/assembler/TestTDBAssembler.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/assembler/TestTDBAssembler.java Fri Jan 20 14:26:01 2012
@@ -33,6 +33,7 @@ import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.sparql.core.assembler.AssemblerUtils;
import com.hp.hpl.jena.sparql.core.assembler.DatasetAssemblerVocab;
import com.hp.hpl.jena.tdb.ConfigTest;
+import com.hp.hpl.jena.tdb.StoreConnection ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB;
import com.hp.hpl.jena.tdb.store.GraphNamedTDB;
import com.hp.hpl.jena.tdb.store.GraphTDB;
@@ -57,6 +58,7 @@ public class TestTDBAssembler extends Ba
@AfterClass static public void afterClass()
{
+ StoreConnection.reset() ;
FileOps.clearDirectory(dirDB) ;
}
Modified: incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java?rev=1233922&r1=1233921&r2=1233922&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java Fri Jan 20 14:26:01 2012
@@ -19,28 +19,27 @@
package com.hp.hpl.jena.tdb.store;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.openjena.atlas.iterator.Iter;
-import org.openjena.atlas.junit.BaseTest;
-import org.openjena.atlas.lib.FileOps;
-
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.sparql.sse.SSE;
-import com.hp.hpl.jena.sparql.util.NodeFactory;
-import com.hp.hpl.jena.tdb.ConfigTest;
-import com.hp.hpl.jena.tdb.base.file.Location;
-import com.hp.hpl.jena.tdb.junit.GraphLocation;
-import com.hp.hpl.jena.tdb.sys.SystemTDB;
-import com.hp.hpl.jena.tdb.sys.TDBMaker;
+import java.util.Arrays ;
+import java.util.List ;
+
+import org.junit.After ;
+import org.junit.Before ;
+import org.junit.Test ;
+import org.openjena.atlas.iterator.Iter ;
+import org.openjena.atlas.junit.BaseTest ;
+import org.openjena.atlas.lib.FileOps ;
+
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.query.Dataset ;
+import com.hp.hpl.jena.sparql.sse.SSE ;
+import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.tdb.ConfigTest ;
+import com.hp.hpl.jena.tdb.base.file.Location ;
+import com.hp.hpl.jena.tdb.junit.GraphLocation ;
+import com.hp.hpl.jena.tdb.sys.SystemTDB ;
+import com.hp.hpl.jena.tdb.sys.TDBMaker ;
/** Testing persistence */
public class TestDatasetTDBPersist extends BaseTest
@@ -129,9 +128,8 @@ public class TestDatasetTDBPersist exten
// Graphs only exists if they have a triple in them
assertFalse(ds.containsNamedModel(graphName)) ;
- Iterator<String> iter = ds.listNames() ;
- assertFalse(iter.hasNext()) ;
-
+ List<String> names = Iter.toList(ds.listNames()) ;
+ assertEquals(0, names.size()) ;
assertEquals(0, ds.asDatasetGraph().size()) ;
}
@@ -145,8 +143,7 @@ public class TestDatasetTDBPersist exten
g2.add(triple) ;
assertTrue(ds.containsNamedModel(graphName)) ;
- Iterator<String> iter = ds.listNames() ;
- List<String> x = Iter.toList(iter) ;
+ List<String> x = Iter.toList(ds.listNames()) ;
List<String> y = Arrays.asList(graphName) ;
assertEquals(x,y) ;
Modified: incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestGraphTDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestGraphTDB.java?rev=1233922&r1=1233921&r2=1233922&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestGraphTDB.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestGraphTDB.java Fri Jan 20 14:26:01 2012
@@ -27,6 +27,7 @@ import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.sparql.graph.AbstractTestGraph2 ;
import com.hp.hpl.jena.tdb.ConfigTest;
+import com.hp.hpl.jena.tdb.StoreConnection ;
import com.hp.hpl.jena.tdb.base.file.Location;
import com.hp.hpl.jena.tdb.junit.GraphLocation;
@@ -37,6 +38,7 @@ public class TestGraphTDB extends Abstra
@BeforeClass public static void beforeClass()
{
+ StoreConnection.reset() ;
graphLocation = new GraphLocation(new Location(ConfigTest.getTestingDirDB())) ;
graphLocation.release() ;
graphLocation.clearDirectory() ;