Author: claude
Date: Sat Sep 7 09:56:46 2013
New Revision: 1520748
URL: http://svn.apache.org/r1520748
Log:
first complete code/graph/impl tests
Added:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/AbstractTripleStoreTest.java
- copied, changed from r1519171,
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/AbstractTestTripleStore.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/CollectionGraphTest.java
- copied, changed from r1520740,
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TestCollectionGraph.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphMakerTest.java
- copied, changed from r1520740,
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TestFileGraphMaker.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/LiteralLabelsTest.java
- copied, changed from r1520740,
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/TestLiteralLabels.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/SimpleEventManagerTest.java
(with props)
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/SimpleGraphMakerTest.java
- copied, changed from r1520740,
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/TestSimpleGraphMaker.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/package-info.java
(with props)
Removed:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/AbstractTestTripleStore.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TestCollectionGraph.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TestFileGraphMaker.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TripleStoreProducerInterface.java
Modified:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphSuite.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphSuite2.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/AbstractPrefixMappingTest.java
Copied:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/AbstractTripleStoreTest.java
(from r1519171,
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/AbstractTestTripleStore.java)
URL:
http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/AbstractTripleStoreTest.java?p2=jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/AbstractTripleStoreTest.java&p1=jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/AbstractTestTripleStore.java&r1=1519171&r2=1520748&rev=1520748&view=diff
==============================================================================
---
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/AbstractTestTripleStore.java
(original)
+++
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/AbstractTripleStoreTest.java
Sat Sep 7 09:56:46 2013
@@ -22,13 +22,14 @@ import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
-import static com.hp.hpl.jena.graph.GraphTestUtils.*;
+import static com.hp.hpl.jena.testing_framework.GraphTestUtils.*;
+
import com.hp.hpl.jena.graph.impl.TripleStore;
/**
* AbstractTestTripleStore - post-hoc tests for TripleStores.
*/
-public abstract class AbstractTestTripleStore {
+public abstract class AbstractTripleStoreTest {
/**
* Subclasses must over-ride to return a new empty TripleStore.
Copied:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/CollectionGraphTest.java
(from r1520740,
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TestCollectionGraph.java)
URL:
http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/CollectionGraphTest.java?p2=jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/CollectionGraphTest.java&p1=jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TestCollectionGraph.java&r1=1520740&r2=1520748&rev=1520748&view=diff
==============================================================================
---
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TestCollectionGraph.java
(original)
+++
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/CollectionGraphTest.java
Sat Sep 7 09:56:46 2013
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.graph.impl.Collec
import com.hp.hpl.jena.testing_framework.AbstractGraphProducer;
import com.hp.hpl.jena.testing_framework.GraphProducerInterface;
-public class TestCollectionGraph extends AbstractGraphTest {
+public class CollectionGraphTest extends AbstractGraphTest {
private GraphProducerInterface graphProducer = new GraphProducer();
Copied:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphMakerTest.java
(from r1520740,
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TestFileGraphMaker.java)
URL:
http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphMakerTest.java?p2=jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphMakerTest.java&p1=jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TestFileGraphMaker.java&r1=1520740&r2=1520748&rev=1520748&view=diff
==============================================================================
---
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TestFileGraphMaker.java
(original)
+++
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphMakerTest.java
Sat Sep 7 09:56:46 2013
@@ -24,10 +24,9 @@ import java.util.HashSet;
import org.junit.Test;
import static org.junit.Assert.*;
-import static com.hp.hpl.jena.graph.GraphTestUtils.*;
+import static com.hp.hpl.jena.testing_framework.GraphTestUtils.*;
import com.hp.hpl.jena.graph.AbstractGraphMakerTest;
-import com.hp.hpl.jena.graph.AbstractTestGraphMaker;
import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.graph.GraphMaker;
import com.hp.hpl.jena.graph.GraphUtil;
@@ -39,13 +38,13 @@ import com.hp.hpl.jena.util.FileUtils;
* Test a FileGraphMaker; use the abstract tests, plus specialised ones for the
* name conversion routines.
*/
-public class TestFileGraphMaker extends AbstractGraphMakerTest {
+public class FileGraphMakerTest extends AbstractGraphMakerTest {
@Override
public GraphMaker getGraphMaker() {
- String scratch = FileUtils.getScratchDirectory(
- "jena-test-FileGraphMaker").getPath();
- return new FileGraphMaker(scratch, true);
+ String scratch = FileUtils.getScratchDirectory(
+ "jena-test-FileGraphMaker").getPath();
+ return new FileGraphMaker(scratch, true);
}
@Test
Modified:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphSuite.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphSuite.java?rev=1520748&r1=1520747&r2=1520748&view=diff
==============================================================================
---
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphSuite.java
(original)
+++
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphSuite.java
Sat Sep 7 09:56:46 2013
@@ -32,7 +32,7 @@ import org.junit.runners.Parameterized;
import org.junit.runners.Suite;
import org.junit.runners.Parameterized.Parameters;
-import static com.hp.hpl.jena.graph.GraphTestUtils.*;
+import static com.hp.hpl.jena.testing_framework.GraphTestUtils.*;
import com.hp.hpl.jena.graph.AbstractGraphSuite;
import com.hp.hpl.jena.graph.Graph;
Modified:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphSuite2.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphSuite2.java?rev=1520748&r1=1520747&r2=1520748&view=diff
==============================================================================
---
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphSuite2.java
(original)
+++
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphSuite2.java
Sat Sep 7 09:56:46 2013
@@ -32,7 +32,7 @@ import org.junit.runners.Parameterized;
import org.junit.runners.Suite;
import org.junit.runners.Parameterized.Parameters;
-import static com.hp.hpl.jena.graph.GraphTestUtils.*;
+import static com.hp.hpl.jena.testing_framework.GraphTestUtils.*;
import com.hp.hpl.jena.graph.AbstractGraphSuite;
import com.hp.hpl.jena.graph.Graph;
Copied:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/LiteralLabelsTest.java
(from r1520740,
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/TestLiteralLabels.java)
URL:
http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/LiteralLabelsTest.java?p2=jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/LiteralLabelsTest.java&p1=jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/TestLiteralLabels.java&r1=1520740&r2=1520748&rev=1520748&view=diff
==============================================================================
---
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/TestLiteralLabels.java
(original)
+++
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/LiteralLabelsTest.java
Sat Sep 7 09:56:46 2013
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.graph;
+package com.hp.hpl.jena.graph.impl;
-import static com.hp.hpl.jena.graph.GraphTestUtils.*;
+import static com.hp.hpl.jena.testing_framework.GraphTestUtils.*;
import static org.junit.Assert.*;
import org.junit.Test;
@@ -30,7 +30,7 @@ import com.hp.hpl.jena.graph.impl.Litera
import com.hp.hpl.jena.graph.impl.LiteralLabelFactory;
-public class TestLiteralLabels
+public class LiteralLabelsTest
{
private void assertEq( LiteralLabel ll1, LiteralLabel ll2)
{
Added:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/SimpleEventManagerTest.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/SimpleEventManagerTest.java?rev=1520748&view=auto
==============================================================================
---
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/SimpleEventManagerTest.java
(added)
+++
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/SimpleEventManagerTest.java
Sat Sep 7 09:56:46 2013
@@ -0,0 +1,45 @@
+/*
+ * 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.graph.impl;
+
+import org.mockito.Mockito;
+
+import com.hp.hpl.jena.graph.AbstractEventManagerTest;
+import com.hp.hpl.jena.graph.Graph;
+import com.hp.hpl.jena.graph.GraphEventManager;
+import com.hp.hpl.jena.testing_framework.GraphEventManagerProducerInterface;
+
+/**
+ * Test the SimpleGraphFactory by extending AbstractTestGraphFactory and
+ * supplying new SimplGraphFactorys via getGraph.
+ */
+public class SimpleEventManagerTest extends AbstractEventManagerTest {
+
+ @Override
+ protected GraphEventManagerProducerInterface getEventManagerProducer() {
+ return new GraphEventManagerProducerInterface() {
+
+ @Override
+ public GraphEventManager newEventManager() {
+ return new
SimpleEventManager(Mockito.mock(Graph.class));
+ }
+ };
+ }
+
+}
Propchange:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/SimpleEventManagerTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/SimpleGraphMakerTest.java
(from r1520740,
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/TestSimpleGraphMaker.java)
URL:
http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/SimpleGraphMakerTest.java?p2=jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/SimpleGraphMakerTest.java&p1=jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/TestSimpleGraphMaker.java&r1=1520740&r2=1520748&rev=1520748&view=diff
==============================================================================
---
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/TestSimpleGraphMaker.java
(original)
+++
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/SimpleGraphMakerTest.java
Sat Sep 7 09:56:46 2013
@@ -16,9 +16,11 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.graph;
+package com.hp.hpl.jena.graph.impl;
+import com.hp.hpl.jena.graph.AbstractGraphMakerTest;
+import com.hp.hpl.jena.graph.GraphMaker;
import com.hp.hpl.jena.graph.impl.*;
@@ -26,7 +28,7 @@ import com.hp.hpl.jena.graph.impl.*;
Test the SimpleGraphFactory by extending AbstractTestGraphFactory
and supplying new SimplGraphFactorys via getGraph.
*/
-public class TestSimpleGraphMaker extends AbstractGraphMakerTest
+public class SimpleGraphMakerTest extends AbstractGraphMakerTest
{
@Override
Added:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/package-info.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/package-info.java?rev=1520748&view=auto
==============================================================================
---
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/package-info.java
(added)
+++
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/package-info.java
Sat Sep 7 09:56:46 2013
@@ -0,0 +1,19 @@
+package com.hp.hpl.jena.graph.impl;
+/**
+
+<h3>Missing Tests</h3>
+<ul>
+<li>AdhocDataType</li>
+<li>GraphMatcher</li>
+<li>GraphWithPerofrm</li>
+</ul>
+
+
+
+*/
+
+
+
+
+
+
Propchange:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/AbstractPrefixMappingTest.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/AbstractPrefixMappingTest.java?rev=1520748&r1=1520747&r2=1520748&view=diff
==============================================================================
---
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/AbstractPrefixMappingTest.java
(original)
+++
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/AbstractPrefixMappingTest.java
Sat Sep 7 09:56:46 2013
@@ -19,7 +19,8 @@
package com.hp.hpl.jena.shared;
import static org.junit.Assert.*;
-import static com.hp.hpl.jena.graph.GraphTestUtils.*;
+import static com.hp.hpl.jena.testing_framework.GraphTestUtils.*;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
