You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2013/09/14 00:32:06 UTC
svn commit: r1523135 [6/6] - in
/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena: graph/
graph/compose/ graph/impl/ mem/ rdf/ rdf/model/ rdf/model/impl/
rdf/model/temp/ shared/ testing_framework/
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/LiteralTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/LiteralTest.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/LiteralTest.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/LiteralTest.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,28 @@
+package com.hp.hpl.jena.rdf.model.temp;
+
+import com.hp.hpl.jena.rdf.model.AbstractLiteralTest;
+import com.hp.hpl.jena.rdf.model.AbstractModelTest;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
+import com.hp.hpl.jena.testing_framework.ModelProducerInterface;
+
+
+
+public class LiteralTest extends AbstractLiteralTest {
+
+ AbstractModelProducer producer = new AbstractModelProducer()
+ {
+
+ @Override
+ protected Model createNewModel() {
+ return ModelFactory.createDefaultModel();
+ }
+
+ };
+
+ @Override
+ public ModelProducerInterface getModelProducer() {
+ return producer;
+ }
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/LiteralTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelExtractTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelExtractTest.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelExtractTest.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelExtractTest.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,27 @@
+package com.hp.hpl.jena.rdf.model.temp;
+
+import com.hp.hpl.jena.rdf.model.AbstractModelExtractTest;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
+import com.hp.hpl.jena.testing_framework.ModelProducerInterface;
+
+
+
+public class ModelExtractTest extends AbstractModelExtractTest {
+
+ AbstractModelProducer producer = new AbstractModelProducer()
+ {
+
+ @Override
+ protected Model createNewModel() {
+ return ModelFactory.createDefaultModel();
+ }
+
+ };
+
+ @Override
+ public ModelProducerInterface getModelProducer() {
+ return producer;
+ }
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelExtractTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListObjectTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListObjectTest.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListObjectTest.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListObjectTest.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,27 @@
+package com.hp.hpl.jena.rdf.model.temp;
+
+import com.hp.hpl.jena.rdf.model.AbstractListObjectsTest;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
+import com.hp.hpl.jena.testing_framework.ModelProducerInterface;
+
+
+
+public class ModelListObjectTest extends AbstractListObjectsTest {
+
+ AbstractModelProducer producer = new AbstractModelProducer()
+ {
+
+ @Override
+ protected Model createNewModel() {
+ return ModelFactory.createDefaultModel();
+ }
+
+ };
+
+ @Override
+ public ModelProducerInterface getModelProducer() {
+ return producer;
+ }
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListObjectTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListStatementTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListStatementTest.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListStatementTest.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListStatementTest.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,28 @@
+package com.hp.hpl.jena.rdf.model.temp;
+
+import com.hp.hpl.jena.rdf.model.AbstractListStatementsTest;
+import com.hp.hpl.jena.rdf.model.AbstractModelTest;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
+import com.hp.hpl.jena.testing_framework.ModelProducerInterface;
+
+
+
+public class ModelListStatementTest extends AbstractListStatementsTest {
+
+ AbstractModelProducer producer = new AbstractModelProducer()
+ {
+
+ @Override
+ protected Model createNewModel() {
+ return ModelFactory.createDefaultModel();
+ }
+
+ };
+
+ @Override
+ public ModelProducerInterface getModelProducer() {
+ return producer;
+ }
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListStatementTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListSubjectsTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListSubjectsTest.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListSubjectsTest.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListSubjectsTest.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,28 @@
+package com.hp.hpl.jena.rdf.model.temp;
+
+import com.hp.hpl.jena.rdf.model.AbstractListSubjectsTest;
+import com.hp.hpl.jena.rdf.model.AbstractModelTest;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
+import com.hp.hpl.jena.testing_framework.ModelProducerInterface;
+
+
+
+public class ModelListSubjectsTest extends AbstractListSubjectsTest {
+
+ AbstractModelProducer producer = new AbstractModelProducer()
+ {
+
+ @Override
+ protected Model createNewModel() {
+ return ModelFactory.createDefaultModel();
+ }
+
+ };
+
+ @Override
+ public ModelProducerInterface getModelProducer() {
+ return producer;
+ }
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListSubjectsTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelPrefixMappingTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelPrefixMappingTest.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelPrefixMappingTest.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelPrefixMappingTest.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,28 @@
+package com.hp.hpl.jena.rdf.model.temp;
+
+import com.hp.hpl.jena.rdf.model.AbstractModelPrefixMappingTest;
+import com.hp.hpl.jena.rdf.model.AbstractModelTest;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
+import com.hp.hpl.jena.testing_framework.ModelProducerInterface;
+
+
+
+public class ModelPrefixMappingTest extends AbstractModelPrefixMappingTest {
+
+ AbstractModelProducer producer = new AbstractModelProducer()
+ {
+
+ @Override
+ protected Model createNewModel() {
+ return ModelFactory.createDefaultModel();
+ }
+
+ };
+
+ @Override
+ public ModelProducerInterface getModelProducer() {
+ return producer;
+ }
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelPrefixMappingTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelTest.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelTest.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelTest.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,27 @@
+package com.hp.hpl.jena.rdf.model.temp;
+
+import com.hp.hpl.jena.rdf.model.AbstractModelTest;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
+import com.hp.hpl.jena.testing_framework.ModelProducerInterface;
+
+
+
+public class ModelTest extends AbstractModelTest {
+
+ AbstractModelProducer producer = new AbstractModelProducer()
+ {
+
+ @Override
+ protected Model createNewModel() {
+ return ModelFactory.createDefaultModel();
+ }
+
+ };
+
+ @Override
+ public ModelProducerInterface getModelProducer() {
+ return producer;
+ }
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFListTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFListTest.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFListTest.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFListTest.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,27 @@
+package com.hp.hpl.jena.rdf.model.temp;
+
+import com.hp.hpl.jena.rdf.model.AbstractRDFListTest;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
+import com.hp.hpl.jena.testing_framework.ModelProducerInterface;
+
+
+
+public class RDFListTest extends AbstractRDFListTest {
+
+ AbstractModelProducer producer = new AbstractModelProducer()
+ {
+
+ @Override
+ protected Model createNewModel() {
+ return ModelFactory.createDefaultModel();
+ }
+
+ };
+
+ @Override
+ public ModelProducerInterface getModelProducer() {
+ return producer;
+ }
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFListTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFNodeTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFNodeTest.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFNodeTest.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFNodeTest.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,26 @@
+package com.hp.hpl.jena.rdf.model.temp;
+
+import com.hp.hpl.jena.rdf.model.AbstractRDFNodeTest;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
+import com.hp.hpl.jena.testing_framework.ModelProducerInterface;
+
+public class RDFNodeTest extends AbstractRDFNodeTest {
+
+ AbstractModelProducer producer = new AbstractModelProducer()
+ {
+
+ @Override
+ protected Model createNewModel() {
+ return ModelFactory.createDefaultModel();
+ }
+
+ };
+
+ @Override
+ public ModelProducerInterface getModelProducer() {
+ return producer;
+ }
+
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFNodeTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ReifiedStatementTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ReifiedStatementTest.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ReifiedStatementTest.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ReifiedStatementTest.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,28 @@
+package com.hp.hpl.jena.rdf.model.temp;
+
+import com.hp.hpl.jena.rdf.model.AbstractModelTest;
+import com.hp.hpl.jena.rdf.model.AbstractReifiedStatementsTest;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
+import com.hp.hpl.jena.testing_framework.ModelProducerInterface;
+
+
+
+public class ReifiedStatementTest extends AbstractReifiedStatementsTest {
+
+ AbstractModelProducer producer = new AbstractModelProducer()
+ {
+
+ @Override
+ protected Model createNewModel() {
+ return ModelFactory.createDefaultModel();
+ }
+
+ };
+
+ @Override
+ public ModelProducerInterface getModelProducer() {
+ return producer;
+ }
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ReifiedStatementTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/SeqMethodsTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/SeqMethodsTest.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/SeqMethodsTest.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/SeqMethodsTest.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,26 @@
+package com.hp.hpl.jena.rdf.model.temp;
+
+import com.hp.hpl.jena.rdf.model.AbstractSeqMethodsTest;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
+import com.hp.hpl.jena.testing_framework.ModelProducerInterface;
+
+
+
+public class SeqMethodsTest extends AbstractSeqMethodsTest {
+ AbstractModelProducer producer = new AbstractModelProducer()
+ {
+
+ @Override
+ protected Model createNewModel() {
+ return ModelFactory.createDefaultModel();
+ }
+
+ };
+
+ @Override
+ public ModelProducerInterface getModelProducer() {
+ return producer;
+ }
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/SeqMethodsTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/StatementTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/StatementTest.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/StatementTest.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/StatementTest.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,27 @@
+package com.hp.hpl.jena.rdf.model.temp;
+
+import com.hp.hpl.jena.rdf.model.AbstractStatementTest;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
+import com.hp.hpl.jena.testing_framework.ModelProducerInterface;
+
+
+
+public class StatementTest extends AbstractStatementTest {
+
+ AbstractModelProducer producer = new AbstractModelProducer()
+ {
+
+ @Override
+ protected Model createNewModel() {
+ return ModelFactory.createDefaultModel();
+ }
+
+ };
+
+ @Override
+ public ModelProducerInterface getModelProducer() {
+ return producer;
+ }
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/StatementTest.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=1523135&r1=1523134&r2=1523135&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 Fri Sep 13 22:32:05 2013
@@ -19,14 +19,21 @@
package com.hp.hpl.jena.shared;
import static org.junit.Assert.*;
-import static com.hp.hpl.jena.testing_framework.GraphTestUtils.*;
+import static com.hp.hpl.jena.testing_framework.GraphHelper.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.junit.Assert;
import org.junit.Test;
+import com.hp.hpl.jena.graph.Factory;
+import com.hp.hpl.jena.graph.Graph;
+import com.hp.hpl.jena.rdf.model.AbstractModelPrefixMappingTest;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+
/**
* Test prefix mappings - subclass this test and override getMapping() to
* deliver the prefixMapping to be tested.
@@ -202,21 +209,21 @@ public abstract class AbstractPrefixMapp
@Test
public void testUseEasyPrefix() {
- testUseEasyPrefix("prefix mapping impl", getMapping());
- testShortForm("prefix mapping impl", getMapping());
+ testUseEasyPrefix( getMapping());
+ testShortForm( getMapping());
}
- public static void testUseEasyPrefix(String title, PrefixMapping ns) {
- testShortForm(title, ns);
+ public static void testUseEasyPrefix( PrefixMapping ns) {
+ testShortForm( ns);
}
- public static void testShortForm(String title, PrefixMapping ns) {
+ public static void testShortForm(PrefixMapping ns) {
ns.setNsPrefix("crisp", crispURI);
ns.setNsPrefix("butter", butterURI);
- assertEquals(title, "", ns.shortForm(""));
- assertEquals(title, ropeURI, ns.shortForm(ropeURI));
- assertEquals(title, "crisp:tail", ns.shortForm(crispURI + "tail"));
- assertEquals(title, "butter:here:we:are",
+ assertEquals("", ns.shortForm(""));
+ assertEquals( ropeURI, ns.shortForm(ropeURI));
+ assertEquals( "crisp:tail", ns.shortForm(crispURI + "tail"));
+ assertEquals( "butter:here:we:are",
ns.shortForm(butterURI + "here:we:are"));
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/RandomOrderGraphTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/RandomOrderGraphTest.java?rev=1523135&r1=1523134&r2=1523135&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/RandomOrderGraphTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/RandomOrderGraphTest.java Fri Sep 13 22:32:05 2013
@@ -1,6 +1,6 @@
package com.hp.hpl.jena.shared;
-import static com.hp.hpl.jena.testing_framework.GraphTestUtils.*;
+import static com.hp.hpl.jena.testing_framework.GraphHelper.*;
import java.util.List;
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/package-info.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/package-info.java?rev=1523135&r1=1523134&r2=1523135&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/package-info.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/package-info.java Fri Sep 13 22:32:05 2013
@@ -16,7 +16,8 @@
limitations under the License.
*/
package com.hp.hpl.jena.shared;
-
+// TODO move wg subdir to testing classes
+// TODO write tests for uuid subdir
/**
* This package defines some classes common to the Jena API and SPI levels, in particular
* the JenaException class from which all Jena-specific exceptions hang, and the interface
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducer.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducer.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducer.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducer.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,79 @@
+/*
+ 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.testing_framework;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.hp.hpl.jena.rdf.model.Model;
+
+/**
+ * An abstract implementation of the ModelProducerInterface.
+ *
+ * This class handles tracking of the created models and closing them. It also
+ * provides a callback for the implementing class to perform extra cleanup when
+ * the model is closed.
+ *
+ */
+public abstract class AbstractModelProducer implements ModelProducerInterface {
+
+ /**
+ * The list of graphs that have been opened in this test.
+ */
+ protected List<Model> modelList = new ArrayList<Model>();
+
+ /**
+ * The method to create a new model.
+ *
+ * @return a newly constructed model of type under test.
+ */
+ abstract protected Model createNewModel();
+
+ @Override
+ final public Model newModel() {
+ Model retval = createNewModel();
+ modelList.add(retval);
+ return retval;
+ }
+
+ /**
+ * Method called after the graph is closed. This allows the implementer to
+ * perform extra cleanup activities, like deleting the file associated with
+ * a file based graph.
+ * <p>
+ * By default this does nothing.
+ * </p>
+ *
+ * @param g
+ * The graph that is closed
+ */
+ protected void afterClose(Model g) {
+ };
+
+ @Override
+ final public void closeModels() {
+ for (Model m : modelList) {
+ if (!m.isClosed()) {
+ m.close();
+ }
+ afterClose(m);
+ }
+ modelList.clear();
+ }
+
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducerUser.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducerUser.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducerUser.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducerUser.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,35 @@
+/*
+ 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.testing_framework;
+
+import org.junit.After;
+
+/**
+ * An abstract class that provides the GraphProducerInterface implementation and
+ * handles closing all the graphs after a test is complete.
+ *
+ */
+public abstract class AbstractModelProducerUser implements
+ ModelProducerUserInterface {
+
+ @After
+ final public void closeModelsAbstractModelProducerUser() {
+ getModelProducer().closeModels();
+ }
+
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducerUser.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/GraphHelper.java (from r1520822, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/GraphTestUtils.java)
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/GraphHelper.java?p2=jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/GraphHelper.java&p1=jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/GraphTestUtils.java&r1=1520822&r2=1523135&rev=1523135&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/GraphTestUtils.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/GraphHelper.java Fri Sep 13 22:32:05 2013
@@ -23,10 +23,7 @@ package com.hp.hpl.jena.testing_framewor
*/
import static org.junit.Assert.*;
-import java.io.FileNotFoundException;
import java.lang.reflect.Constructor;
-import java.net.URISyntaxException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -40,7 +37,6 @@ import com.hp.hpl.jena.graph.Factory;
import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.graph.GraphUtil;
import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.NodeCreateUtils;
import com.hp.hpl.jena.graph.Triple;
import com.hp.hpl.jena.shared.JenaException;
import com.hp.hpl.jena.shared.PrefixMapping;
@@ -48,19 +44,7 @@ import com.hp.hpl.jena.util.CollectionFa
import com.hp.hpl.jena.util.IteratorCollection;
import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-public class GraphTestUtils extends TestUtils {
-
- public static String getFileName(String fn) {
- URL u = GraphTestUtils.class.getClassLoader().getResource(fn);
- if (u == null) {
- throw new RuntimeException(new FileNotFoundException(fn));
- }
- try {
- return u.toURI().toString();
- } catch (URISyntaxException e) {
- throw new RuntimeException(e);
- }
- }
+public class GraphHelper extends TestUtils {
/**
* Answer a Node as described by <code>x</code>; a shorthand for
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelHelper.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelHelper.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelHelper.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelHelper.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,342 @@
+/*
+ * 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.testing_framework;
+
+import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+import com.hp.hpl.jena.shared.PrefixMapping;
+import com.hp.hpl.jena.util.CollectionFactory;
+
+import static org.junit.Assert.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.junit.Assert;
+
+/**
+ * provides useful functionality for testing models, eg building small models
+ * from strings, testing equality, etc.
+ *
+ * Currently this class extends GraphHelper and thus TestCase.
+ */
+public class ModelHelper extends GraphHelper {
+
+ private static Model builderModel;
+ // protected static Model aModel;
+
+ static {
+ builderModel = ModelFactory.createDefaultModel();
+ builderModel.setNsPrefixes( PrefixMapping.Extended );
+ }
+
+ protected static final Model empty = ModelFactory.createDefaultModel();
+
+ protected static Model extendedModel(AbstractModelProducer producer) {
+ Model result = producer.newModel();
+ result.setNsPrefixes(PrefixMapping.Extended);
+ return result;
+ }
+
+ protected static String nice(RDFNode n) {
+ return nice(n.asNode());
+ }
+
+ /**
+ * create a Statement in a given Model with (S, P, O) extracted by parsing a
+ * string.
+ *
+ * @param lockModel
+ * the model the statement is attached to
+ * @param an
+ * "S P O" string.
+ * @return model.createStatement(S, P, O)
+ */
+ public static Statement statement(Model m, String fact) {
+ StringTokenizer st = new StringTokenizer(fact);
+ Resource sub = resource(st.nextToken());
+ Property pred = property(st.nextToken());
+ RDFNode obj = rdfNode(st.nextToken());
+ return m.createStatement(sub, pred, obj);
+ }
+
+ public static Statement statement( String fact )
+ {
+ StringTokenizer st = new StringTokenizer(fact);
+ Resource sub = resource( st.nextToken());
+ Property pred = property( st.nextToken());
+ RDFNode obj = rdfNode( st.nextToken());
+ return builderModel.createStatement(sub, pred, obj);
+ }
+
+ public static RDFNode rdfNode(Model m, String s) {
+ return m.asRDFNode(NodeCreateUtils.create(s));
+ }
+
+ public static RDFNode rdfNode(String s) {
+ return rdfNode( builderModel, s );
+ }
+
+ public static <T extends RDFNode> T rdfNode(String s, Class<T> c) {
+ return rdfNode(s).as(c);
+ }
+
+ public static Resource resource() {
+ return ResourceFactory.createResource();
+ }
+
+ public static Resource resource( String s )
+ { return (Resource) rdfNode(s); }
+
+ public static Resource resource(Model m, String s) {
+ return (Resource) rdfNode(m, s);
+ }
+
+ public static Property property( String s )
+ { return rdfNode(s).as(Property.class); }
+
+ public static Property property(Model m, String s) {
+ return rdfNode(m, s).as(Property.class);
+ }
+
+ public static Literal literal(String s) {
+ return rdfNode(s).as(Literal.class);
+ }
+
+ /**
+ * Create an array of Statements parsed from a semi-separated string.
+ *
+ * @param lockModel
+ * a model to serve as a statement factory
+ * @param facts
+ * a sequence of semicolon-separated "S P O" facts
+ * @return a Statement[] of the (S P O) statements from the string
+ */
+ public static Statement[] statements(Model m, String facts) {
+ ArrayList<Statement> sl = new ArrayList<Statement>();
+ StringTokenizer st = new StringTokenizer(facts, ";");
+ while (st.hasMoreTokens())
+ sl.add(statement(m, st.nextToken()));
+ return sl.toArray(new Statement[sl.size()]);
+ }
+
+ /**
+ * Create an array of Statements parsed from a semi-separated string.
+ *
+ * @param lockModel
+ * a model to serve as a statement factory
+ * @param facts
+ * a sequence of semicolon-separated "S P O" facts
+ * @return a Statement[] of the (S P O) statements from the string
+ */
+ public static Statement[] statements(String facts) {
+ ArrayList<Statement> sl = new ArrayList<Statement>();
+ StringTokenizer st = new StringTokenizer(facts, ";");
+ while (st.hasMoreTokens())
+ sl.add(statement(st.nextToken()));
+ return sl.toArray(new Statement[sl.size()]);
+ }
+
+ /**
+ * Create an array of Resources from a whitespace-separated string
+ *
+ * @param items
+ * a whitespace-separated sequence to feed to resource
+ * @return a Resource[] of the parsed resources
+ */
+ public static Resource[] resources( String items) {
+ ArrayList<Resource> rl = new ArrayList<Resource>();
+ StringTokenizer st = new StringTokenizer(items);
+ while (st.hasMoreTokens())
+ rl.add(resource(st.nextToken()));
+ return rl.toArray(new Resource[rl.size()]);
+ }
+
+ /**
+ * Answer the set of resources given by the space-separated
+ * <code>items</code> string. Each resource specification is interpreted as
+ * per <code>resource</code>.
+ */
+ public static Set<Resource> resourceSet( String items )
+ {
+ Set<Resource> result = new HashSet<Resource>();
+ StringTokenizer st = new StringTokenizer( items );
+ while (st.hasMoreTokens()) result.add( resource( st.nextToken() ) );
+ return result;
+ }
+
+ /**
+ * add to a model all the statements expressed by a string.
+ *
+ * @param lockModel
+ * the model to be updated
+ * @param facts
+ * a sequence of semicolon-separated "S P O" facts
+ * @return the updated model
+ */
+ public static Model modelAdd(Model m, String facts) {
+ StringTokenizer semis = new StringTokenizer(facts, ";");
+ while (semis.hasMoreTokens())
+ m.add(statement(semis.nextToken()));
+ return m;
+ }
+
+ /**
+ * makes a model with a given reiifcation style, initialised with statements
+ * parsed from a string.
+ *
+ * @param facts
+ * a string in semicolon-separated "S P O" format
+ * @return a model containing those facts
+ */
+ public static Model modelWithStatements(ModelProducerInterface producer,
+ String facts) {
+ return modelAdd(createModel(producer), facts);
+ }
+
+ public static Model modelWithStatements( ModelProducerInterface producer, final StmtIterator it )
+ {
+ final Model m = producer.newModel();
+ while (it.hasNext())
+ {
+ m.add(it.nextStatement());
+ }
+ return m;
+ }
+
+ /**
+ * make a model and give it Extended prefixes
+ */
+ public static Model createModel(ModelProducerInterface producer) {
+ Model result = producer.newModel();
+ result.setNsPrefixes(PrefixMapping.Extended);
+ return result;
+ }
+
+ /**
+ * Answer a default model; it exists merely to abbreviate the rather long
+ * explicit invocation.
+ *
+ * @return a new default [aka memory-based] model
+ */
+ // public static Model createMemModel()
+ // { return ModelFactory.createDefaultModel(); }
+
+ /**
+ * test that two models are isomorphic and fail if they are not.
+ *
+ * @param title
+ * a String appearing at the beginning of the failure message
+ * @param wanted
+ * the model value that is expected
+ * @param got
+ * the model value to check
+ * @exception if
+ * the models are not isomorphic
+ */
+ public static void assertIsoModels(String title, Model wanted, Model got) {
+ if (wanted.isIsomorphicWith(got) == false) {
+ Map<Node, Object> map = CollectionFactory.createHashedMap();
+ fail(title + ": expected " + nice(wanted.getGraph(), map)
+ + "\n but had " + nice(got.getGraph(), map));
+ }
+ }
+
+ public static void assertContainsAll(final Model model, final Model model2) {
+ for (final StmtIterator s = model2.listStatements(); s.hasNext();) {
+ Assert.assertTrue(model.contains(s.nextStatement()));
+ }
+ }
+
+ public static void assertSameStatements(final Model model,
+ final Model model2) {
+ assertContainsAll(model, model2);
+ assertContainsAll(model2, model);
+ }
+
+ public static Property prop(final String uri) {
+ return ResourceFactory.createProperty("eh:/" + uri);
+ }
+
+ public static Resource res(final String uri) {
+ return ResourceFactory.createResource("eh:/" + uri);
+ }
+
+ /**
+ * Fail if the two models are not isomorphic. See
+ * assertIsoModels(String,Model,Model).
+ */
+ public static void assertIsoModels(Model wanted, Model got) {
+ assertIsoModels("models must be isomorphic", wanted, got);
+ }
+
+ public static final boolean tvBoolean = true;
+ public static final byte tvByte = 1;
+ public static final short tvShort = 2;
+ public static final int tvInt = -1;
+ public static final long tvLong = -2;
+ public static final char tvChar = '!';
+ public static final float tvFloat = (float) 123.456;
+ public static final double tvDouble = -123.456;
+ public static final String tvString = "test 12 string";
+ public static final double dDelta = 0.000000005;
+
+ public static final float fDelta = 0.000005f;
+
+ public static final Object tvLitObj = new LitTestObj(1234);
+ public static final LitTestObj tvObject = new LitTestObj(12345);
+
+ public static class LitTestObj {
+ protected long content;
+
+ public LitTestObj(final long l) {
+ content = l;
+ }
+
+ public LitTestObj(final String s) {
+ content = Long.parseLong(s.substring(1, s.length() - 1));
+ }
+
+ @Override
+ public boolean equals(final Object o) {
+ return (o instanceof LitTestObj)
+ && (content == ((LitTestObj) o).content);
+ }
+
+ @Override
+ public int hashCode() {
+ return (int) (content ^ (content >> 32));
+ }
+
+ @Override
+ public String toString() {
+ return "[" + Long.toString(content) + "]";
+ }
+ }
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelHelper.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelProducerInterface.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelProducerInterface.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelProducerInterface.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelProducerInterface.java Fri Sep 13 22:32:05 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.testing_framework;
+
+import com.hp.hpl.jena.rdf.model.Model;
+
+/**
+ * Creates the graph for testing. Implementations must track the creation of
+ * graphs created with newGraph and close them when closeGraphs is called.
+ *
+ */
+public interface ModelProducerInterface {
+
+ /**
+ * Returns a new Model to take part in the test.
+ *
+ * @return The model implementation to test.
+ */
+ public abstract Model newModel();
+
+ /**
+ * provides a hook to close down models. When called all models created by
+ * the newModel() method should be closed. Note that some models may have
+ * been closed during the test, so models should be tested for being closed
+ * prior to closing.
+ */
+ public abstract void closeModels();
+
+ // TODO add assembler stuff
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelProducerInterface.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelProducerUserInterface.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelProducerUserInterface.java?rev=1523135&view=auto
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelProducerUserInterface.java (added)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelProducerUserInterface.java Fri Sep 13 22:32:05 2013
@@ -0,0 +1,28 @@
+/*
+ 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.testing_framework;
+
+public interface ModelProducerUserInterface {
+ /**
+ * The graph producer to use for the tests.
+ *
+ * @return The graph producer
+ */
+ public ModelProducerInterface getModelProducer();
+
+}
Propchange: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelProducerUserInterface.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/NodeCreateUtils.java (from r1519171, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/NodeCreateUtils.java)
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/NodeCreateUtils.java?p2=jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/NodeCreateUtils.java&p1=jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/NodeCreateUtils.java&r1=1519171&r2=1523135&rev=1523135&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/NodeCreateUtils.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/NodeCreateUtils.java Fri Sep 13 22:32:05 2013
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.graph;
+package com.hp.hpl.jena.testing_framework;
import java.util.StringTokenizer;
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/TestUtils.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/TestUtils.java?rev=1523135&r1=1523134&r2=1523135&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/TestUtils.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/TestUtils.java Fri Sep 13 22:32:05 2013
@@ -18,7 +18,13 @@
package com.hp.hpl.jena.testing_framework;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.lang.reflect.*;
+import java.net.URISyntaxException;
+import java.net.URL;
+
import static org.junit.Assert.*;
import java.util.*;
@@ -32,6 +38,7 @@ import com.hp.hpl.jena.util.iterator.*;
public class TestUtils {
// do not instantiate
protected TestUtils() {
+ throw new UnsupportedOperationException("Do not instantiate TestUtils");
};
/**
@@ -203,4 +210,25 @@ public class TestUtils {
assertEquals(msg, o2, o1);
assertEquals(msg, o1.hashCode(), o2.hashCode());
}
+
+ private static URL getURL( String fn )
+ {
+ URL u = GraphHelper.class.getClassLoader().getResource(fn);
+ if (u == null) {
+ throw new RuntimeException(new FileNotFoundException(fn));
+ }
+ return u;
+ }
+ public static String getFileName(String fn) {
+
+ try {
+ return getURL(fn).toURI().toString();
+ } catch (URISyntaxException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static InputStream getInputStream( String fn ) throws IOException {
+ return getURL( fn ).openStream();
+ }
}