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/01/08 20:07:29 UTC
svn commit: r1430447 [7/10] - in /jena/branches/streaming-update: ./
apache-jena/ apache-jena/bat/ apache-jena/bin/ jena-arq/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/ jena-core/
jena-core/src/main/java/com/hp/hpl/jena/assembler/ jena-core/s...
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/RecordingListener.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/RecordingListener.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/RecordingListener.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/RecordingListener.java Tue Jan 8 19:07:23 2013
@@ -85,7 +85,7 @@ public class RecordingListener implement
{ history.clear(); }
public boolean has( List<Object> things )
- { return history.equals( things ); }
+ { return Arrays.deepEquals(history.toArray(), things.toArray() ); }
public boolean hasStart( List<Object> L )
{ return L.size() <= history.size() && L.equals( history.subList( 0, L.size() ) ); }
@@ -94,7 +94,7 @@ public class RecordingListener implement
{ return L.size() <= history.size() && L.equals( history.subList( history.size() - L.size(), history.size() ) ); }
public boolean has( Object [] things )
- { return has( Arrays.asList( things ) ); }
+ { return Arrays.deepEquals(history.toArray(), things ); }
public void assertHas( List<Object> things )
{ if (has( things ) == false) Assert.fail( "expected " + things + " but got " + history ); }
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestCapabilities.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestCapabilities.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestCapabilities.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestCapabilities.java Tue Jan 8 19:07:23 2013
@@ -23,7 +23,6 @@ import junit.framework.*;
/**
Test graph capabilities.
- @author kers
*/
public class TestCapabilities extends GraphTestBase
{
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestDateTime.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestDateTime.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestDateTime.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestDateTime.java Tue Jan 8 19:07:23 2013
@@ -38,9 +38,6 @@ import junit.framework.TestSuite;
* Tests behaviour of the AbstractDateTime support, specifically for
* comparison operations. This complements the main tests in
* TestTypedLiterals.
- *
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.2 $
*/
public class TestDateTime extends TestCase {
/**
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFactory.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFactory.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFactory.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFactory.java Tue Jan 8 19:07:23 2013
@@ -18,10 +18,6 @@
package com.hp.hpl.jena.graph.test;
-/**
- @author kers
-*/
-
import com.hp.hpl.jena.graph.*;
import junit.framework.*;
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFileGraph.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFileGraph.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFileGraph.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFileGraph.java Tue Jan 8 19:07:23 2013
@@ -18,22 +18,22 @@
package com.hp.hpl.jena.graph.test;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.graph.impl.*;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.shared.ReificationStyle;
-import com.hp.hpl.jena.util.FileUtils;
-
-import java.io.*;
-import java.util.*;
-
-import junit.framework.*;
+import java.io.File ;
+import java.util.ArrayList ;
+import java.util.List ;
+
+import junit.framework.TestSuite ;
+
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphUtil ;
+import com.hp.hpl.jena.graph.impl.FileGraph ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.util.FileUtils ;
/**
Test FileGraph by seeing if we can make some file graphs and then read
them back.
-
- @author hedgehog
*/
public class TestFileGraph extends GraphTestBase
@@ -91,13 +91,13 @@ public class TestFileGraph extends Graph
File foo = FileUtils.tempFileName( "fileGraph", ".nt" );
Graph g = new FileGraph( foo, true, true );
- g.getBulkUpdateHandler().add( initial );
+ GraphUtil.addInto( g, initial );
g.getTransactionHandler().begin();
- g.getBulkUpdateHandler().add( extra );
+ GraphUtil.addInto( g, extra );
g.getTransactionHandler().commit();
Graph union = graphWith( "" );
- union.getBulkUpdateHandler().add( initial );
- union.getBulkUpdateHandler().add( extra );
+ GraphUtil.addInto(union, initial );
+ GraphUtil.addInto(union, extra );
assertIsomorphic( union, g );
Model inFile = ModelFactory.createDefaultModel();
inFile.read( "file:///" + foo, "N-TRIPLES" );
@@ -110,9 +110,9 @@ public class TestFileGraph extends Graph
Graph extra = graphWith( "extra hasValue 17; also hasURI world" );
File foo = FileUtils.tempFileName( "fileGraph", ".n3" );
Graph g = new FileGraph( foo, true, true );
- g.getBulkUpdateHandler().add( initial );
+ GraphUtil.addInto( g, initial );
g.getTransactionHandler().begin();
- g.getBulkUpdateHandler().add( extra );
+ GraphUtil.addInto( g, extra );
g.getTransactionHandler().abort();
assertIsomorphic( initial, g );
}
@@ -124,10 +124,10 @@ public class TestFileGraph extends Graph
File foo = FileUtils.tempFileName( "fileGraph", ".nt" );
Graph g = new FileGraph( foo, true, true );
g.getTransactionHandler().begin();
- g.getBulkUpdateHandler().add( initial );
+ GraphUtil.addInto( g, initial );
g.getTransactionHandler().commit();
g.getTransactionHandler().begin();
- g.getBulkUpdateHandler().add( extra );
+ GraphUtil.addInto( g, extra );
g.getTransactionHandler().abort();
assertIsomorphic( initial, g );
Model inFile = ModelFactory.createDefaultModel();
@@ -145,7 +145,7 @@ public class TestFileGraph extends Graph
{ history.add( f ); }
};
File file = FileUtils.tempFileName( "fileGraph", ".nt" );
- Graph g = new FileGraph( n, file, true, true, ReificationStyle.Minimal );
+ Graph g = new FileGraph( n, file, true, true );
assertEquals( new ArrayList<File>(), history );
g.close();
assertEquals( oneElementList( file ), history );
@@ -184,7 +184,7 @@ public class TestFileGraph extends Graph
File foo = FileUtils.tempFileName( prefix, suffix );
Graph original = graphWith( content );
Graph g = new FileGraph( foo, true, true );
- g.getBulkUpdateHandler().add( original );
+ GraphUtil.addInto( g, original );
g.close();
Graph g2 = new FileGraph( foo, false, true );
assertIsomorphic( original, g2 );
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFileGraphMaker.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFileGraphMaker.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFileGraphMaker.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFileGraphMaker.java Tue Jan 8 19:07:23 2013
@@ -18,21 +18,21 @@
package com.hp.hpl.jena.graph.test;
-import java.io.File;
-import java.util.HashSet;
+import java.io.File ;
+import java.util.HashSet ;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.graph.impl.*;
-import com.hp.hpl.jena.shared.*;
-import com.hp.hpl.jena.util.FileUtils;
+import junit.framework.TestSuite ;
-import junit.framework.*;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphMaker ;
+import com.hp.hpl.jena.graph.GraphUtil ;
+import com.hp.hpl.jena.graph.impl.FileGraph ;
+import com.hp.hpl.jena.graph.impl.FileGraphMaker ;
+import com.hp.hpl.jena.util.FileUtils ;
/**
Test a FileGraphMaker; use the abstract tests, plus specialised ones for the name
conversion routines.
-
- @author hedgehog
*/
public class TestFileGraphMaker extends AbstractTestGraphMaker
{
@@ -45,7 +45,7 @@ public class TestFileGraphMaker extends
@Override
public GraphMaker getGraphMaker()
{ String scratch = FileUtils.getScratchDirectory( "jena-test-FileGraphMaker" ).getPath();
- return new FileGraphMaker( scratch, ReificationStyle.Minimal, true ); }
+ return new FileGraphMaker( scratch, true ); }
public void testToFilename()
{ assertEquals( "plain", FileGraphMaker.toFilename( "plain" ) );
@@ -67,10 +67,10 @@ public class TestFileGraphMaker extends
{
File scratch = FileUtils.getScratchDirectory( "jena-test-FileGraphMaker-already" );
Graph content = graphWith( "something hasProperty someValue" );
- FileGraphMaker A = new FileGraphMaker( scratch.getPath(), ReificationStyle.Minimal, true );
- FileGraphMaker B = new FileGraphMaker( scratch.getPath(), ReificationStyle.Minimal, true );
+ FileGraphMaker A = new FileGraphMaker( scratch.getPath(), true );
+ FileGraphMaker B = new FileGraphMaker( scratch.getPath(), true );
FileGraph gA = (FileGraph) A.createGraph( "already", true );
- gA.getBulkUpdateHandler().add( content );
+ GraphUtil.addInto( gA, content );
gA.close();
FileGraph gB = (FileGraph) B.openGraph( "already", false );
assertIsomorphic( content, gB );
@@ -82,7 +82,7 @@ public class TestFileGraphMaker extends
public void testDeletesFilesOfClosedMaker()
{
File scratch = FileUtils.getScratchDirectory( "jena-test-FileGraphMaker-forgets" );
- FileGraphMaker A = new FileGraphMaker( scratch.getPath(), ReificationStyle.Minimal, true );
+ FileGraphMaker A = new FileGraphMaker( scratch.getPath(), true );
A.createGraph( "empty" ).close();
assertTrue( "file 'empty' should exist in '" + scratch + "'", new File( scratch, "empty" ) .exists() );
A.close();
@@ -92,7 +92,7 @@ public class TestFileGraphMaker extends
public void testForgetsClosedGraphs()
{
File scratch = FileUtils.getScratchDirectory( "jena-test-FileGraphMaker-forgets" );
- FileGraphMaker m = new FileGraphMaker( scratch.getPath(), ReificationStyle.Minimal, true );
+ FileGraphMaker m = new FileGraphMaker( scratch.getPath(), true );
m.createGraph( "example" ).close();
assertEquals( new HashSet<String>(), m.listGraphs().toSet() );
m.close();
@@ -101,7 +101,7 @@ public class TestFileGraphMaker extends
public void testDoesntReusedClosedGraphs()
{
File scratch = FileUtils.getScratchDirectory( "jena-test-FileGraphMaker-noReuse" );
- FileGraphMaker m = new FileGraphMaker( scratch.getPath(), ReificationStyle.Minimal, true );
+ FileGraphMaker m = new FileGraphMaker( scratch.getPath(), true );
Graph m1 = m.createGraph( "hello" );
m1.close();
Graph m2 = m.createGraph( "hello" );
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraph.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraph.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraph.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraph.java Tue Jan 8 19:07:23 2013
@@ -21,23 +21,15 @@ package com.hp.hpl.jena.graph.test;
/**
Tests that check GraphMem and WrappedGraph for correctness against the Graph
and reifier test suites.
-
- @author kers
*/
-import java.util.Set ;
-
import junit.framework.Test ;
import junit.framework.TestSuite ;
import com.hp.hpl.jena.graph.Factory ;
import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.impl.WrappedGraph ;
import com.hp.hpl.jena.mem.GraphMem ;
-import com.hp.hpl.jena.shared.ReificationStyle ;
-import com.hp.hpl.jena.util.CollectionFactory ;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
public class TestGraph extends GraphTestBase
{
@@ -45,7 +37,7 @@ public class TestGraph extends GraphTest
{ super( name ); }
/**
- Answer a test suite that runs the Graph and Reifier tests on GraphMem and on
+ Answer a test suite that runs the Graph tests on GraphMem and on
WrappedGraphMem, the latter standing in for testing WrappedGraph.
*/
public static TestSuite suite()
@@ -79,41 +71,10 @@ public class TestGraph extends GraphTest
/**
Class to provide a constructor that produces a wrapper round a GraphMem.
- @author kers
*/
public static class WrappedGraphMem extends WrappedGraph
{
- public WrappedGraphMem( ReificationStyle style )
- { super( Factory.createGraphMem( style ) ); }
+ public WrappedGraphMem( )
+ { super( Factory.createGraphMem( ) ); }
}
-
- public void testListSubjectsDoesntUseFind()
- {
- final boolean [] called = {false};
- Graph g = Factory.createGraphMem();
- ExtendedIterator<Node> subjects = g.queryHandler().subjectsFor( null, null );
- Set<Node> s = CollectionFactory.createHashedSet();
- while (subjects.hasNext()) s.add( subjects.next() );
- assertFalse( "find should not have been called", called[0] );
- }
-
- public void testListPredicatesDoesntUseFind()
- {
- final boolean [] called = {false};
- Graph g = Factory.createGraphMem();
- ExtendedIterator<Node> predicates = g.queryHandler().predicatesFor( null, null );
- Set<Node> s = CollectionFactory.createHashedSet();
- while (predicates.hasNext()) s.add( predicates.next() );
- assertFalse( "find should not have been called", called[0] );
- }
-
- public void testListObjectsDoesntUseFind()
- {
- final boolean [] called = {false};
- Graph g = Factory.createGraphMem();
- ExtendedIterator<Node> subjects = g.queryHandler().objectsFor( null, null );
- Set<Node> s = CollectionFactory.createHashedSet();
- while (subjects.hasNext()) s.add( subjects.next() );
- assertFalse( "find should not have been called", called[0] );
- }
}
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphBaseToString.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphBaseToString.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphBaseToString.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphBaseToString.java Tue Jan 8 19:07:23 2013
@@ -30,8 +30,6 @@ import com.hp.hpl.jena.util.iterator.*;
/**
Tests for the revisions to GraphBase.toString() to see that it's compact,
ie outputs no more than LIMIT triples.
-
- @author chris
*/
public class TestGraphBaseToString extends GraphTestBase
{
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphExtract.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphExtract.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphExtract.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphExtract.java Tue Jan 8 19:07:23 2013
@@ -24,7 +24,6 @@ import junit.framework.TestSuite;
/**
Tests for recursive sub-graph extraction.
- @author hedgehog
*/
public class TestGraphExtract extends GraphTestBase
{
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphListener.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphListener.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphListener.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphListener.java Tue Jan 8 19:07:23 2013
@@ -19,45 +19,33 @@
package com.hp.hpl.jena.graph.test;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestSuite;
-
-import com.hp.hpl.jena.graph.Factory;
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.GraphEvents;
-import com.hp.hpl.jena.graph.GraphListener;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.impl.SimpleBulkUpdateHandler;
+import java.util.Arrays ;
+import java.util.Iterator ;
+import java.util.List ;
+
+import junit.framework.TestSuite ;
+
+import com.hp.hpl.jena.graph.* ;
+import com.hp.hpl.jena.graph.impl.SimpleBulkUpdateHandler ;
import com.hp.hpl.jena.mem.GraphMem ;
-import com.hp.hpl.jena.shared.ReificationStyle;
/**
* Version of graph tests that set up a listener that copies all changes
* and verifies that after every notification modified graph
* and original are isomorphic.
- * @author Jeremy Carroll
- *
*/
public class TestGraphListener extends MetaTestGraph {
-
-
-
public TestGraphListener(String name) {
super(name);
}
- public TestGraphListener( Class<? extends Graph> graphClass, String name, ReificationStyle style )
- { super( graphClass, name, style ); }
+ public TestGraphListener( Class<? extends Graph> graphClass, String name)
+ { super( graphClass, name); }
public static TestSuite suite()
{ return MetaTestGraph.suite( TestGraphListener.class, GraphMem.class ); }
/**
* A listener to check that a graph is being tracked
* correctly by its events.
- * @author Jeremy
- *
*/
protected class CheckChanges implements GraphListener {
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphMatchWithInference.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphMatchWithInference.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphMatchWithInference.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphMatchWithInference.java Tue Jan 8 19:07:23 2013
@@ -25,8 +25,6 @@ import junit.framework.*;
/**
Test that an inferred graph and an identical concrete graph
compare as equal.
-
- @author jjc
*/
public class TestGraphMatchWithInference extends GraphTestBase
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphPrefixMapping.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphPrefixMapping.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphPrefixMapping.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphPrefixMapping.java Tue Jan 8 19:07:23 2013
@@ -25,9 +25,6 @@ import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.shared.AbstractTestPrefixMapping;
import com.hp.hpl.jena.shared.PrefixMapping;
-/**
- @author kers
-*/
public class TestGraphPrefixMapping extends GraphTestBase
{
public TestGraphPrefixMapping( String name )
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphUtils.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphUtils.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphUtils.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphUtils.java Tue Jan 8 19:07:23 2013
@@ -24,9 +24,6 @@ import com.hp.hpl.jena.util.iterator.*;
import junit.framework.*;
-/**
- @author kers
-*/
public class TestGraphUtils extends GraphTestBase
{
public TestGraphUtils(String name)
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java Tue Jan 8 19:07:23 2013
@@ -36,7 +36,6 @@ import com.hp.hpl.jena.vocabulary.RSS ;
import com.hp.hpl.jena.vocabulary.VCARD ;
/**
- @author bwm out of kers
Exercise nodes. Make sure that the different node types do not overlap
and that the test predicates work properly on the different node kinds.
*/
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNodeToTriplesMap.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNodeToTriplesMap.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNodeToTriplesMap.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNodeToTriplesMap.java Tue Jan 8 19:07:23 2013
@@ -30,8 +30,6 @@ import junit.framework.TestSuite;
TestNodeToTriplesMap: added, post-hoc, by kers once NTM got
rather complicated. So these tests may be (are, at the moment)
incomplete.
-
- @author kers
*/
public class TestNodeToTriplesMap extends GraphTestBase
{
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestPackage.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestPackage.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestPackage.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestPackage.java Tue Jan 8 19:07:23 2013
@@ -18,12 +18,10 @@
package com.hp.hpl.jena.graph.test;
-import junit.framework.*;
-import com.hp.hpl.jena.graph.query.test.*;
+import junit.framework.TestSuite ;
/**
Collected test suite for the .graph package.
- @author jjc + kers
*/
public class TestPackage extends TestSuite {
@@ -41,15 +39,9 @@ public class TestPackage extends TestSui
addTest( TestTriple.suite() );
addTest( TestTripleField.suite() );
addTest( TestNodeToTriplesMap.suite() );
- addTest( TestSimpleReifierTripleMap.suite() );
- addTest( TestSimpleReifierFragmentsMap.suite() );
addTest( TestReifier.suite() );
- addTestSuite( TestReifierSearch.class );
- addTest( TestReificationWrapper.suite() );
- addTest( TestReificationPredicates.suite() );
addTest( TestTypedLiterals.suite() );
addTest( TestDateTime.suite() );
- addTest( TestGraphQueryPackage.suite() );
addTest( TestFactory.suite() );
addTest( TestGraph.suite() );
addTest( TestSimpleGraphMaker.suite() );
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestRegisterGraphListener.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestRegisterGraphListener.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestRegisterGraphListener.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestRegisterGraphListener.java Tue Jan 8 19:07:23 2013
@@ -30,8 +30,6 @@ import com.hp.hpl.jena.graph.Triple;
* other listeners.
* It motivates the use of, e.g. CopyOnWriteArrayList
* for storing listeners.
- * @author Jeremy
- *
*/
public class TestRegisterGraphListener extends GraphTestBase {
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReifier.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReifier.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReifier.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReifier.java Tue Jan 8 19:07:23 2013
@@ -23,32 +23,25 @@ import java.lang.reflect.Constructor ;
import junit.framework.TestSuite ;
import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.graph.TripleMatch ;
-import com.hp.hpl.jena.graph.impl.* ;
import com.hp.hpl.jena.mem.GraphMem ;
import com.hp.hpl.jena.shared.JenaException ;
-import com.hp.hpl.jena.shared.ReificationStyle ;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
/**
This class tests the reifiers of ordinary GraphMem graphs.
- @author kers
+ Old test suite - kept to ensure compatibility for teh one and only Standard mode
*/
public class TestReifier extends AbstractTestReifier
{
public TestReifier( String name )
- { super( name ); graphClass = null; style = null; }
+ { super( name ); graphClass = null; }
protected final Class<? extends Graph> graphClass;
- protected final ReificationStyle style;
- public TestReifier( Class<? extends Graph> graphClass, String name, ReificationStyle style )
+ public TestReifier( Class<? extends Graph> graphClass, String name)
{
super( name );
this.graphClass = graphClass;
- this.style = style;
}
public static TestSuite suite()
@@ -59,17 +52,14 @@ public class TestReifier extends Abstrac
return result;
}
- @Override public Graph getGraph()
- { return getGraph( style ); }
-
- @Override public Graph getGraph( ReificationStyle style )
+ @Override public Graph getGraph( )
{
try
{
- Constructor<?> cons = getConstructor( graphClass, new Class[] {ReificationStyle.class} );
- if (cons != null) return (Graph) cons.newInstance( new Object[] { style } );
- Constructor<?> cons2 = getConstructor( graphClass, new Class [] {this.getClass(), ReificationStyle.class} );
- if (cons2 != null) return (Graph) cons2.newInstance( new Object[] { this, style } );
+ Constructor<?> cons = getConstructor( graphClass, new Class[] {} );
+ if (cons != null) return (Graph) cons.newInstance( new Object[] { } );
+ Constructor<?> cons2 = getConstructor( graphClass, new Class [] {this.getClass()} );
+ if (cons2 != null) return (Graph) cons2.newInstance( new Object[] { this } );
throw new JenaException( "no suitable graph constructor found for " + graphClass );
}
catch (RuntimeException e)
@@ -77,18 +67,4 @@ public class TestReifier extends Abstrac
catch (Exception e)
{ throw new JenaException( e ); }
}
-
- public void testExtendedConstructorExists()
- {
- GraphBase parent = new GraphBase() {
-
- @Override public ExtendedIterator<Triple> graphBaseFind( TripleMatch m )
- {
- // TODO Auto-generated method stub
- return null;
- }};
- ReifierTripleMap tm = new SimpleReifierTripleMap();
- ReifierFragmentsMap fm = new SimpleReifierFragmentsMap();
- SimpleReifier sr = new SimpleReifier( parent, tm, fm, ReificationStyle.Minimal );
- }
}
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestSimpleGraphMaker.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestSimpleGraphMaker.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestSimpleGraphMaker.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestSimpleGraphMaker.java Tue Jan 8 19:07:23 2013
@@ -23,8 +23,6 @@ import com.hp.hpl.jena.graph.impl.*;
import junit.framework.*;
/**
- @author hedgehog
-
Test the SimpleGraphFactory by extending AbstractTestGraphFactory
and supplying new SimplGraphFactorys via getGraph.
*/
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTriple.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTriple.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTriple.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTriple.java Tue Jan 8 19:07:23 2013
@@ -18,10 +18,6 @@
package com.hp.hpl.jena.graph.test;
-/**
- @author bwm out of kers, then kers updates
-*/
-
import com.hp.hpl.jena.graph.*;
import com.hp.hpl.jena.graph.impl.LiteralLabel;
import com.hp.hpl.jena.graph.impl.LiteralLabelFactory;
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTripleField.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTripleField.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTripleField.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTripleField.java Tue Jan 8 19:07:23 2013
@@ -23,9 +23,6 @@ import junit.framework.TestSuite;
import com.hp.hpl.jena.graph.*;
import com.hp.hpl.jena.graph.Triple.*;
-/**
- @author kers
-*/
public class TestTripleField extends GraphTestBase
{
public TestTripleField( String name )
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java Tue Jan 8 19:07:23 2013
@@ -41,8 +41,6 @@ import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.graph.impl.LiteralLabel ;
import com.hp.hpl.jena.graph.impl.LiteralLabelFactory ;
-import com.hp.hpl.jena.graph.query.Domain ;
-import com.hp.hpl.jena.graph.query.GraphQuery ;
import com.hp.hpl.jena.rdf.model.* ;
import com.hp.hpl.jena.shared.impl.JenaParameters ;
import com.hp.hpl.jena.vocabulary.XSD ;
@@ -755,30 +753,6 @@ public class TestTypedLiterals extends T
}
/**
- * Test query applied to graphs containing typed values
- */
- public void testTypedQueries() {
- Model model = ModelFactory.createDefaultModel();
- Property p = model.createProperty("urn:x-eg/p");
- Literal l1 = model.createTypedLiteral("10", "http://www.w3.org/2001/XMLSchema#integer");
- Literal l2 = model.createTypedLiteral("010", "http://www.w3.org/2001/XMLSchema#integer");
- assertSameValueAs("sameas test", l1, l2);
- Resource a = model.createResource("urn:x-eg/a");
- a.addProperty(p, l1);
- assertTrue(model.getGraph().find(null, p.asNode(), l1.asNode()).hasNext());
- assertTrue(model.getGraph().find(null, p.asNode(), l2.asNode()).hasNext());
- assertTrue(model.getGraph().find(a.asNode(), p.asNode(), l2.asNode()).hasNext());
- assertTrue( model.getGraph().contains( a.asNode(), p.asNode(), l2.asNode() ) );
- GraphQuery q = new GraphQuery();
- q.addMatch(a.asNode(), p.asNode(), l2.asNode());
- Iterator<Domain> qi = model.getGraph().queryHandler().prepareBindings(q, new Node[] {}).executeBindings();
- assertTrue(qi.hasNext());
- // Similar tests at Model API level
- // Selector s1 = new SimpleSelector(a, p, l2);
- assertTrue(model.listStatements( a, p, l2 ).hasNext());
- }
-
- /**
* Test the isValidLiteral machinery
*/
public void testIsValidLiteral() {
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestConcurrentModificationException.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestConcurrentModificationException.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestConcurrentModificationException.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestConcurrentModificationException.java Tue Jan 8 19:07:23 2013
@@ -23,8 +23,6 @@ import java.util.*;
import junit.framework.*;
import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.query.Domain;
-import com.hp.hpl.jena.graph.query.StageElement;
import com.hp.hpl.jena.graph.test.NodeCreateUtils;
import com.hp.hpl.jena.mem.*;
import com.hp.hpl.jena.rdf.model.test.ModelTestBase;
@@ -97,34 +95,4 @@ public abstract class TestConcurrentModi
try { it.next(); fail( "should have thrown ConcurrentModificationException" ); }
catch (ConcurrentModificationException e) { pass(); }
}
-
- private static final MatchOrBind mob = new MatchOrBind()
- {
- @Override
- public boolean matches( Triple t )
- {
- return true;
- }
-
- @Override
- public MatchOrBind reset( Domain d )
- {
- return null;
- }
- };
-
- public void testAddDuringAppThrowsCME()
- {
- final TripleBunch b = getBunch();
- b.add( NodeCreateUtils.createTriple( "a P b" ) );
- b.add( NodeCreateUtils.createTriple( "c Q d" ) );
- StageElement se = new StageElement()
- {
- @Override
- public void run( Domain current )
- { b.add( NodeCreateUtils.createTriple( "S P O" ) ); }
- };
- try { b.app( new Domain( 0 ), se, mob ); fail(" should throw CME" ); }
- catch (ConcurrentModificationException e) { pass(); }
- }
}
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem.java Tue Jan 8 19:07:23 2013
@@ -36,15 +36,7 @@ public class TestGraphMem extends Abstra
@Override public Graph getGraph()
{ return new GraphMem(); }
-
- public void testRemoveAllDoesntUseFind()
- {
- Graph g = new GraphMemWithoutFind();
- graphAdd( g, "x P y; a Q b" );
- g.getBulkUpdateHandler().removeAll();
- assertEquals( 0, g.size() );
- }
-
+
public void testSizeAfterRemove()
{
Graph g = getGraphWith( "x p y" );
@@ -127,16 +119,7 @@ public class TestGraphMem extends Abstra
{
testStatsWithConcreteTriple( 0, "x P y", "" );
}
-
- public void testStatsWithreification()
- {
- ReificationStyle style = ReificationStyle.Standard;
- Graph g = new GraphMem( style );
- GraphStatisticsHandler h = g.getStatisticsHandler();
- graphAdd( g, "x rdf:subject A" );
- assertEquals( -1L, h.getStatistic( node( "x" ), Node.ANY, Node.ANY ) );
- }
-
+
private void testStatsWithConcreteTriple( int expect, String triple, String graph )
{
Graph g = getGraphWith( graph );
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMemPackage.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMemPackage.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMemPackage.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMemPackage.java Tue Jan 8 19:07:23 2013
@@ -27,7 +27,7 @@ public class TestGraphMemPackage extends
{
TestSuite result = new TestSuite();
result.addTest( TestGraphMem.suite() );
- result.addTest( TestMemQuery.suite() );
+ result.addTest( TestGraphMem2.suite() );
result.addTest( TestConcurrentModificationException.suite() );
return result;
}
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractTestReifiedStatements.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractTestReifiedStatements.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractTestReifiedStatements.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractTestReifiedStatements.java Tue Jan 8 19:07:23 2013
@@ -65,16 +65,15 @@ public abstract class AbstractTestReifie
we can get a ReifiedStatement that represents the reified statement.
*/
public void testBasicReification()
- {
- if (model.getReificationStyle() != ModelFactory.Minimal)
- { Resource R = model.createResource( aURI );
- model.add( R, RDF.type, RDF.Statement );
- model.add( R, RDF.subject, S );
- model.add( R, RDF.predicate, P );
- model.add( R, RDF.object, O );
- RDFNode rs = R.as( ReifiedStatement.class );
- assertEquals( "can recover statement", SPO, ((ReifiedStatement) rs).getStatement() ); }
- }
+ {
+ Resource R = model.createResource(aURI) ;
+ model.add(R, RDF.type, RDF.Statement) ;
+ model.add(R, RDF.subject, S) ;
+ model.add(R, RDF.predicate, P) ;
+ model.add(R, RDF.object, O) ;
+ RDFNode rs = R.as(ReifiedStatement.class) ;
+ assertEquals("can recover statement", SPO, ((ReifiedStatement)rs).getStatement()) ;
+ }
/**
check that, from a model with any combination of the statements given,
@@ -98,8 +97,7 @@ public abstract class AbstractTestReifie
{ model.createStatement( SS, RDF.object, O ), new Integer(256) },
{ model.createStatement( SS, RDF.type, RDF.Statement ), new Integer(512) }
};
- if (model.getReificationStyle() != ModelFactory.Minimal)
- testCombinations( model, RR, 0, statements, statements.length );
+ testCombinations( model, RR, 0, statements, statements.length );
}
/**
@@ -118,6 +116,10 @@ public abstract class AbstractTestReifie
// System.err.println( "| hello. mask = " + mask );
ReifiedStatement rs = R.as( ReifiedStatement.class );
// System.err.println( "+ we constructed " + rs );
+
+ if ( (mask & 15) != 15 )
+ m.write(System.out, "TTL") ;
+
assertTrue( "should not reify: not all components present [" + mask + "]: " + rs, (mask & 15) == 15 );
// System.err.println( "+ and we passed the assertion." );
}
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/ModelTestBase.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/ModelTestBase.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/ModelTestBase.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/ModelTestBase.java Tue Jan 8 19:07:23 2013
@@ -18,13 +18,14 @@
package com.hp.hpl.jena.rdf.model.test;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.test.*;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.shared.*;
-import com.hp.hpl.jena.util.CollectionFactory;
+import java.util.* ;
-import java.util.*;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.test.GraphTestBase ;
+import com.hp.hpl.jena.graph.test.NodeCreateUtils ;
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.shared.PrefixMapping ;
+import com.hp.hpl.jena.util.CollectionFactory ;
/**
provides useful functionality for testing models, eg building small models
@@ -159,25 +160,14 @@ public class ModelTestBase extends Graph
@return a model containing those facts
*/
public static Model modelWithStatements( String facts )
- { return modelWithStatements( ReificationStyle.Standard, facts ); }
-
- /**
- makes a model with a given reiifcation style, initialised with statements parsed
- from a string.
-
- @param style the required reification style
- @param facts a string in semicolon-separated "S P O" format
- @return a model containing those facts
- */
- public static Model modelWithStatements( ReificationStyle style, String facts )
- { return modelAdd( createModel( style ), facts ); }
+ { return modelAdd( createModel( ), facts ); }
/**
- make a model with a given reification style, give it Extended prefixes
+ make a model, give it Extended prefixes
*/
- public static Model createModel( ReificationStyle style )
+ public static Model createModel( )
{
- Model result = ModelFactory.createDefaultModel( style );
+ Model result = ModelFactory.createDefaultModel( );
result.setNsPrefixes( PrefixMapping.Extended );
return result;
}
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestList.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestList.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestList.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestList.java Tue Jan 8 19:07:23 2013
@@ -106,7 +106,7 @@ public class TestList
s.addTest( new ListEqualsTest() );
s.addTest( new ListSubclassTest() );
s.addTest( new UserDefinedListTest() );
-
+ s.addTest( new CopyTest() );
return s;
}
@@ -677,6 +677,19 @@ public class TestList
}
}
+ protected static class CopyTest extends ListTest {
+ public CopyTest() {super("CopyTest");}
+
+ @Override
+ public void runTest() {
+ Model m = ModelFactory.createDefaultModel();
+ // check for empty copy error (JENA-360)
+ RDFList list = m.createList().copy();
+ assertEquals( "Should be a 0 length list", 0, list.size() );
+
+ }
+ }
+
protected static class ApplyTest extends ListTest {
public ApplyTest() {super("ApplyTest");}
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelBulkUpdate.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelBulkUpdate.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelBulkUpdate.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelBulkUpdate.java Tue Jan 8 19:07:23 2013
@@ -18,55 +18,58 @@
package com.hp.hpl.jena.rdf.model.test;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.shared.*;
+import java.util.Arrays ;
+import java.util.List ;
-import java.util.*;
-import junit.framework.*;
+import junit.framework.TestSuite ;
+
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.rdf.model.Statement ;
/**
Tests of the Model-level bulk update API.
-
+
@author kers
-*/
+ */
public class TestModelBulkUpdate extends ModelTestBase
- {
+{
public TestModelBulkUpdate( String name )
- { super( name ); }
-
+ { super( name ); }
+
public static TestSuite suite()
- { return new TestSuite( TestModelBulkUpdate.class ); }
+ { return new TestSuite( TestModelBulkUpdate.class ); }
public void testMBU()
- { testMBU( ModelFactory.createDefaultModel() ); }
-
+ { testMBU( ModelFactory.createDefaultModel() ); }
+
public void testContains( Model m, Statement [] statements )
- {
+ {
for (int i = 0; i < statements.length; i += 1)
assertTrue( "it should be here", m.contains( statements[i] ) );
- }
-
+ }
+
public void testContains( Model m, List<Statement> statements )
- {
+ {
for (int i = 0; i < statements.size(); i += 1)
assertTrue( "it should be here", m.contains( statements.get(i) ) );
- }
-
+ }
+
public void testOmits( Model m, Statement [] statements )
- {
+ {
for (int i = 0; i < statements.length; i += 1)
assertFalse( "it should not be here", m.contains( statements[i] ) );
- }
+ }
public void testOmits( Model m, List<Statement> statements )
- {
+ {
for (int i = 0; i < statements.size(); i += 1)
assertFalse( "it should not be here", m.contains( statements.get(i) ) );
- }
-
+ }
+
public void testMBU( Model m )
- {
+ {
Statement [] sArray = statements( m, "moon orbits earth; earth orbits sun" );
List<Statement> sList = Arrays.asList( statements( m, "I drink tea; you drink coffee" ) );
m.add( sArray );
@@ -74,20 +77,20 @@ public class TestModelBulkUpdate extends
m.add( sList );
testContains( m, sList );
testContains( m, sArray );
- /* */
+ /* */
m.remove( sArray );
testOmits( m, sArray );
testContains( m, sList );
m.remove( sList );
testOmits( m, sArray );
testOmits( m, sList );
- }
-
+ }
+
public void testBulkByModel()
- { testBulkByModel( ModelFactory.createDefaultModel() ); }
-
+ { testBulkByModel( ModelFactory.createDefaultModel() ); }
+
public void testBulkByModel( Model m )
- {
+ {
assertEquals( "precondition: model must be empty", 0, m.size() );
Model A = modelWithStatements( "clouds offer rain; trees offer shelter" );
Model B = modelWithStatements( "x R y; y Q z; z P x" );
@@ -98,54 +101,17 @@ public class TestModelBulkUpdate extends
assertIsoModels( B, m );
m.remove( B );
assertEquals( "", 0, m.size() );
- }
-
+ }
+
public void testBulkRemoveSelf()
- {
+ {
Model m = modelWithStatements( "they sing together; he sings alone" );
m.remove( m );
assertEquals( "", 0, m.size() );
- }
-
- public void testBulkByModelReifying()
- {
- testBulkByModelReifying( false );
- testBulkByModelReifying( true );
- }
-
- public void testBulkByModelReifying( boolean suppress )
- {
- Model m = modelWithStatements( ReificationStyle.Minimal, "a P b" );
- addReification( m, "x", "S P O" );
- addReification( m, "a", "x R y" );
- Model target = modelWithStatements( ReificationStyle.Minimal, "" );
- target.add( m, suppress );
- target.setNsPrefixes( PrefixMapping.Standard );
- assertIsoModels( (suppress ? modelWithStatements("a P b") : m), target );
- }
-
- public void testBulkDeleteByModelReifying()
- {
- testBulkDeleteByModelReifying( false );
- testBulkDeleteByModelReifying( true );
- }
-
- public void testBulkDeleteByModelReifying( boolean suppress )
- {
- Model target = modelWithStatements( ReificationStyle.Minimal, "" );
- addReification( target, "x", "S P O" );
- addReification( target, "y", "A P B" );
- Model remove = modelWithStatements( "" );
- addReification( remove, "y", "A P B" );
- Model answer = modelWithStatements( "" );
- addReification( answer, "x", "S P O" );
- if (suppress) addReification( answer, "y", "A P B" );
- target.remove( remove, suppress );
- assertIsoModels( answer, target );
- }
-
+ }
+
public void addReification( Model m, String tag, String statement )
- {
+ {
m.createReifiedStatement( tag, statement( m, statement ) );
- }
}
+}
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelMakerImpl.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelMakerImpl.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelMakerImpl.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelMakerImpl.java Tue Jan 8 19:07:23 2013
@@ -18,23 +18,27 @@
package com.hp.hpl.jena.rdf.model.test;
-import com.hp.hpl.jena.rdf.model.impl.*;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.shared.*;
-import com.hp.hpl.jena.util.iterator.*;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.graph.test.*;
+import java.util.ArrayList ;
+import java.util.List ;
-import java.util.*;
+import junit.framework.TestSuite ;
-import junit.framework.*;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphMaker ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.test.GraphTestBase ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelMaker ;
+import com.hp.hpl.jena.rdf.model.impl.ModelMakerImpl ;
+import com.hp.hpl.jena.shared.ReificationStyle ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.util.iterator.NullIterator ;
/**
Test ModelMakerImpl using a mock GraphMaker. This is as much an
exercise in learning testing technique as it is in actually doing the test ....
-
- @author hedgehog
*/
+@SuppressWarnings("deprecation")
public class TestModelMakerImpl extends ModelTestBase
{
public TestModelMakerImpl(String name)
@@ -147,6 +151,7 @@ public class TestModelMakerImpl extends
{ this.graph = graph; }
@Override
+ @Deprecated
public ReificationStyle getReificationStyle()
{
history.add( "getReificationStyle()" );
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestPackage.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestPackage.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestPackage.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestPackage.java Tue Jan 8 19:07:23 2013
@@ -20,11 +20,6 @@ package com.hp.hpl.jena.rdf.model.test;
import junit.framework.*;
-/**
- Collected test suite for the .graph package.
- @author jjc + kers
-*/
-
public class TestPackage extends TestSuite {
static public TestSuite suite() {
@@ -35,6 +30,8 @@ public class TestPackage extends TestSui
private TestPackage() {
super("Model");
addTest( "TestModel", TestModelFactory.suite() );
+ addTest(TestListStatements.suite() );
+
addTest( "TestModelFactory", TestModelFactory.suite() );
addTest( "TestSimpleListStatements", TestSimpleListStatements.suite() );
addTest( "TestModelPolymorphism", TestModelPolymorphism.suite() );
@@ -46,7 +43,6 @@ public class TestPackage extends TestSui
addTest( "TestContains", TestContains.suite() );
addTest( "TestLiteralImpl", TestLiteralImpl.suite() );
addTest( "TestResourceImpl", TestResourceImpl.suite() );
- addTest( "TestHiddenStatements", TestHiddenStatements.suite() );
addTest( "TestNamespace", TestNamespace.suite() );
addTest( "TestModelBulkUpdate", TestModelBulkUpdate.suite() );
addTest( "TestConcurrency", TestConcurrency.suite() ) ;
@@ -54,7 +50,6 @@ public class TestPackage extends TestSui
addTest( "TestModelPrefixMapping", TestModelPrefixMapping.suite() );
addTest( TestContainers.suite() );
addTest( "TestStandardModels", TestStandardModels.suite() );
- addTest( "TestQuery", TestQuery.suite() );
addTest( "TestSelectors", TestSelectors.suite() );
addTest( "TestModelEvents", TestModelEvents.suite() );
addTest( "TestReaderEvents", TestReaderEvents.suite() );
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReifiedStatements.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReifiedStatements.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReifiedStatements.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReifiedStatements.java Tue Jan 8 19:07:23 2013
@@ -18,54 +18,27 @@
package com.hp.hpl.jena.rdf.model.test;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.shared.ReificationStyle;
+import junit.framework.TestSuite ;
-import junit.framework.*;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
/**
test the properties required of ReifiedStatement objects.
- @author kers
*/
-public class TestReifiedStatements extends ModelTestBase
+public class TestReifiedStatements extends AbstractTestReifiedStatements
{
- public TestReifiedStatements( String name )
- { super( name ); }
+ public TestReifiedStatements(String name)
+ {
+ super(name) ;
+ }
+
public static TestSuite suite()
- { TestSuite result = new TestSuite();
- result.addTest( new TestSuite( TestStandard.class ) );
- result.addTest( new TestSuite( TestConvenient.class ) );
- result.addTest( new TestSuite( TestMinimal.class ) );
- return result; }
+ { return new TestSuite(TestReifiedStatements.class, "TestReifiedStatements" ) ; }
+ @Override
public Model getModel()
{ return ModelFactory.createDefaultModel(); }
- public static class TestStandard extends AbstractTestReifiedStatements
- {
- public TestStandard( String name ) { super( name ); }
- public static final ReificationStyle style = ModelFactory.Standard;
- @Override
- public Model getModel() { return ModelFactory.createDefaultModel( style ); }
- public void testStyle() { assertEquals( style, getModel().getReificationStyle() ); }
- }
-
- public static class TestConvenient extends AbstractTestReifiedStatements
- {
- public TestConvenient( String name ) { super( name ); }
- public static final ReificationStyle style = ModelFactory.Convenient;
- @Override
- public Model getModel() { return ModelFactory.createDefaultModel( style ); }
- public void testStyle() { assertEquals( style, getModel().getReificationStyle() ); }
- }
-
- public static class TestMinimal extends AbstractTestReifiedStatements
- {
- public TestMinimal( String name ) { super( name ); }
- public static final ReificationStyle style = ModelFactory.Minimal;
- @Override
- public Model getModel() { return ModelFactory.createDefaultModel( style); }
- public void testStyle() { assertEquals( style, getModel().getReificationStyle() ); }
- }
}
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceFactory.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceFactory.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceFactory.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestResourceFactory.java Tue Jan 8 19:07:23 2013
@@ -68,6 +68,15 @@ public class TestResourceFactory extends
assertNull(l.getDatatypeURI()) ;
}
+ public void testCreateLangLiteral()
+ {
+ Literal l = ResourceFactory.createLangLiteral("lex", "en") ;
+ assertTrue(l.getLexicalForm().equals("lex")) ;
+ assertTrue(l.getLanguage().equals("en")) ;
+ assertNull(l.getDatatype()) ;
+ assertNull(l.getDatatypeURI()) ;
+ }
+
public void testCreateTypedLiteral()
{
Literal l = ResourceFactory.createTypedLiteral("22", XSDDatatype.XSDinteger) ;
@@ -115,14 +124,17 @@ public class TestResourceFactory extends
assertTrue(!r1.equals(r2));
}
- public void testSetInstance() {
- Resource r = ResourceFactory.createResource();
- ResourceFactory.Interface factory = new TestFactory(r);
- ResourceFactory.setInstance(factory);
- assertTrue(factory.equals(ResourceFactory.getInstance()));
- assertTrue(ResourceFactory.createResource() == r);
+ public void testSetInstance()
+ {
+ ResourceFactory.Interface original = ResourceFactory.getInstance() ;
+ try {
+ Resource r = ResourceFactory.createResource() ;
+ ResourceFactory.Interface factory = new TestFactory(r) ;
+ ResourceFactory.setInstance(factory) ;
+ assertTrue(factory.equals(ResourceFactory.getInstance())) ;
+ assertTrue(ResourceFactory.createResource() == r) ;
+ } finally { ResourceFactory.setInstance(original) ; }
}
-
class TestFactory implements ResourceFactory.Interface {
Resource resource;
@@ -147,6 +159,12 @@ public class TestResourceFactory extends
}
@Override
+ public Literal createLangLiteral( String string, String lang ) {
+ return null;
+ }
+
+
+ @Override
public Literal createTypedLiteral(String string, RDFDatatype datatype)
{
return null ;
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/ConcurrencyTest.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/ConcurrencyTest.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/ConcurrencyTest.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/ConcurrencyTest.java Tue Jan 8 19:07:23 2013
@@ -18,9 +18,13 @@
package com.hp.hpl.jena.reasoner.rulesys.test;
+import java.lang.management.ManagementFactory ;
+import java.lang.management.ThreadInfo ;
+import java.lang.management.ThreadMXBean ;
import java.util.concurrent.ExecutorService ;
import java.util.concurrent.Executors ;
+import junit.framework.Assert ;
import junit.framework.TestCase ;
import junit.framework.TestSuite ;
@@ -117,6 +121,11 @@ public class ConcurrencyTest extends Te
try {
// Iterate over all statements
StmtIterator it = model.listStatements();
+
+// // Debug
+// List<Statement> s = it.toList();
+// it = new StmtIteratorImpl(s.iterator()) ;
+
while(it.hasNext()) it.nextStatement();
it.close();
@@ -150,31 +159,31 @@ public class ConcurrencyTest extends Te
// Possibly in deadlock, wait a little longer to be sure
for(int i = 0; i < 50 && !executorService.isTerminated(); i++) {
- Thread.sleep(100);
+ Thread.sleep(20);
}
if(!executorService.isTerminated()) {
/* uncomment this block to perform deadlock checking, only on java 1.6 */
-// // Check for deadlock
-// ThreadMXBean tmx = ManagementFactory.getThreadMXBean();
-// long[] ids = tmx.findDeadlockedThreads();
-// if (ids != null) {
-// ThreadInfo[] infos = tmx.getThreadInfo(ids, true, true);
-//
-// System.err.println("*** Deadlocked threads");
-// for (ThreadInfo ti : infos) {
-// System.err.println("Thread \"" + ti.getThreadName() + "\" id=" + ti.getThreadId() + " "
-// + ti.getThreadState().toString());
-// System.err.println("Lock name: " + ti.getLockName() + " owned by \""
-// + ti.getLockOwnerName() + "\" id=" + ti.getLockOwnerId());
-// System.err.println("\nStack trace:");
-// for(StackTraceElement st : ti.getStackTrace())
-// System.err.println(" " + st.getClassName() + "." + st.getMethodName()
-// + " (" + st.getFileName() + ":" + st.getLineNumber() + ")" );
-// System.err.println();
-// }
-// }
-// Assert.assertTrue("Deadlock detected!", false);
+ // Check for deadlock
+ ThreadMXBean tmx = ManagementFactory.getThreadMXBean();
+ long[] ids = tmx.findDeadlockedThreads();
+ if (ids != null) {
+ ThreadInfo[] infos = tmx.getThreadInfo(ids, true, true);
+
+ System.err.println("*** Deadlocked threads");
+ for (ThreadInfo ti : infos) {
+ System.err.println("Thread \"" + ti.getThreadName() + "\" id=" + ti.getThreadId() + " "
+ + ti.getThreadState().toString());
+ System.err.println("Lock name: " + ti.getLockName() + " owned by \""
+ + ti.getLockOwnerName() + "\" id=" + ti.getLockOwnerId());
+ System.err.println("\nStack trace:");
+ for(StackTraceElement st : ti.getStackTrace())
+ System.err.println(" " + st.getClassName() + "." + st.getMethodName()
+ + " (" + st.getFileName() + ":" + st.getLineNumber() + ")" );
+ System.err.println();
+ }
+ }
+ Assert.assertTrue("Deadlock detected!", false);
/* end deadlock block */
assertTrue("Failed to terminate execution", false);
}
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLWGTester.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLWGTester.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLWGTester.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLWGTester.java Tue Jan 8 19:07:23 2013
@@ -18,23 +18,26 @@
package com.hp.hpl.jena.reasoner.rulesys.test;
-import com.hp.hpl.jena.reasoner.*;
-import com.hp.hpl.jena.reasoner.rulesys.FBRuleInfGraph;
-import com.hp.hpl.jena.reasoner.test.WGReasonerTester;
-import com.hp.hpl.jena.util.FileManager;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.vocabulary.*;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.graph.query.*;
-
-import com.hp.hpl.jena.shared.*;
-
-import junit.framework.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.*;
-import java.util.*;
+import java.io.BufferedReader ;
+import java.io.FileReader ;
+import java.io.IOException ;
+import java.io.Reader ;
+
+import junit.framework.Assert ;
+import junit.framework.TestCase ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.reasoner.InfGraph ;
+import com.hp.hpl.jena.reasoner.Reasoner ;
+import com.hp.hpl.jena.reasoner.ReasonerFactory ;
+import com.hp.hpl.jena.reasoner.rulesys.FBRuleInfGraph ;
+import com.hp.hpl.jena.reasoner.test.WGReasonerTester ;
+import com.hp.hpl.jena.shared.JenaException ;
+import com.hp.hpl.jena.util.FileManager ;
+import com.hp.hpl.jena.vocabulary.RDF ;
+import com.hp.hpl.jena.vocabulary.ReasonerVocabulary ;
/**
@@ -164,7 +167,7 @@ public class OWLWGTester {
logger.debug("WG test " + test.getURI() + " - " + status);
// Load up the premise documents
- Model premises = ModelFactory.createNonreifyingModel();
+ Model premises = ModelFactory.createDefaultModel();
for (StmtIterator premisesI = test.listProperties(premiseDocumentP); premisesI.hasNext(); ) {
premises.add(loadFile(premisesI.nextStatement().getObject().toString() + ".rdf"));
}
@@ -195,10 +198,10 @@ public class OWLWGTester {
// Check the results against the official conclusions
boolean correct = true;
if (testType.equals(PositiveEntailmentTest)) {
- correct = testConclusions(conclusions.getGraph(), result.getGraph());
+ correct = WGReasonerTester.testConclusions(conclusions.getGraph(), result.getGraph());
} else {
// A negative entailment check
- correct = !testConclusions(conclusions.getGraph(), result.getGraph());
+ correct = !WGReasonerTester.testConclusions(conclusions.getGraph(), result.getGraph());
}
long t2 = System.currentTimeMillis();
timeCost += (t2-t1);
@@ -242,7 +245,7 @@ public class OWLWGTester {
} else if (file.endsWith("n3")) {
langType = "N3";
}
- Model result = ModelFactory.createNonreifyingModel();
+ Model result = ModelFactory.createDefaultModel();
String fname = file;
if (fname.startsWith(BASE_URI)) {
fname = fname.substring(BASE_URI.length());
@@ -252,17 +255,6 @@ public class OWLWGTester {
return result;
}
- /**
- * Test a conclusions graph against a result graph. This works by
- * translating the conclusions graph into a find query which contains one
- * variable for each distinct bNode in the conclusions graph.
- */
- private boolean testConclusions(Graph conclusions, Graph result) {
- QueryHandler qh = result.queryHandler();
- GraphQuery query = WGReasonerTester.graphToQuery(conclusions);
- Iterator<Domain> i = qh.prepareBindings(query, new Node[] {}).executeBindings();
- return i.hasNext();
- }
/**
* Log (info level) some summary information on the timecost of the tests.
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestInferenceReification.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestInferenceReification.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestInferenceReification.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestInferenceReification.java Tue Jan 8 19:07:23 2013
@@ -26,7 +26,6 @@ import com.hp.hpl.jena.rdf.model.*;
import com.hp.hpl.jena.reasoner.*;
import com.hp.hpl.jena.reasoner.rulesys.*;
import com.hp.hpl.jena.reasoner.test.TestUtil;
-import com.hp.hpl.jena.shared.ReificationStyle;
import com.hp.hpl.jena.util.PrintUtil;
import junit.framework.TestSuite;
@@ -50,11 +49,7 @@ public class TestInferenceReification ex
@Override
public Graph getGraph()
- { return getGraph( ReificationStyle.Minimal ); }
-
- @Override
- public Graph getGraph( ReificationStyle style )
- { return makeInfGraph( "", "", style ); }
+ { return makeInfGraph( "", "" ); }
/**
* Case 1: Rules construct a reified statement, is that
@@ -64,51 +59,13 @@ public class TestInferenceReification ex
String rules =
"[r1: (?x eh:p ?o) -> (?o rdf:type rdf:Statement) (?o rdf:subject ?x)" +
" (?o rdf:predicate eh:q) (?o rdf:object 42)]";
- Model m = makeInfModel( rules, "r1 p r", ReificationStyle.Standard );
+ Model m = makeInfModel( rules, "r1 p r" );
TestUtil.assertIteratorLength( m.listReifiedStatements(), 1 );
}
- public void testBindFixesStyle()
- {
- testBindCopiesStyle( ruleBaseReasoner() );
- testBindCopiesStyle( ReasonerRegistry.getRDFSReasoner() );
- testBindCopiesStyle( ReasonerRegistry.getTransitiveReasoner() );
- testBindCopiesStyle( ReasonerRegistry.getOWLMicroReasoner() );
- testBindCopiesStyle( ReasonerRegistry.getOWLMiniReasoner() );
- testBindCopiesStyle( ReasonerRegistry.getOWLReasoner() );
- testBindCopiesStyle( ReasonerRegistry.getRDFSSimpleReasoner() );
- }
-
- private void testBindCopiesStyle( Reasoner r )
- {
- testCopiesStyle( r, ReificationStyle.Minimal );
- testCopiesStyle( r, ReificationStyle.Standard );
- testCopiesStyle( r, ReificationStyle.Convenient );
- }
-
- private void testCopiesStyle( Reasoner r, ReificationStyle style )
- {
- assertEquals( style, r.bind( graphWith( "", style ) ).getReifier().getStyle() );
- }
-
private Reasoner ruleBaseReasoner()
{ return new FBRuleReasoner( Rule.parseRules( "" ) ); }
- public void testRetainsStyle()
- {
- testRetainsStyle( ReificationStyle.Standard );
- testRetainsStyle( ReificationStyle.Convenient );
- testRetainsStyle( ReificationStyle.Minimal );
- }
-
- private void testRetainsStyle( ReificationStyle style )
- {
- BasicForwardRuleInfGraph g = (BasicForwardRuleInfGraph) getGraph( style );
- assertEquals( style, g.getReifier().getStyle() );
- assertEquals( style, g.getRawGraph().getReifier().getStyle() );
- assertEquals( style, g.getDeductionsGraph().getReifier().getStyle() );
- }
-
public void testConstructingModelDoesntForcePreparation()
{
Model m = makeInfModel( "", "" );
@@ -132,27 +89,20 @@ public class TestInferenceReification ex
* Internal helper: create an InfGraph with given rule set and base data.
* The base data is encoded in kers-special RDF syntax.
*/
- private InfGraph makeInfGraph(String rules, String data, ReificationStyle style ) {
+ private InfGraph makeInfGraph(String rules, String data) {
PrintUtil.registerPrefix("eh", "eh:/");
- Graph base = graphWith( data, style );
+ Graph base = graphWith( data );
List<Rule> ruleList = Rule.parseRules(rules);
return new FBRuleReasoner(ruleList).bind( base );
}
- private Graph graphWith( String data, ReificationStyle style )
- { return graphAdd( Factory.createDefaultGraph( style ), data ); }
-
/**
* Internal helper: create a Model which wraps an InfGraph with given rule set and base data.
* The base data is encoded in kers-special RDF syntax.
- * @param style TODO
*/
- private Model makeInfModel( String rules, String data, ReificationStyle style ) {
- return ModelFactory.createModelForGraph( makeInfGraph(rules, data, style ) );
- }
private Model makeInfModel( String rules, String data ) {
- return makeInfModel( rules, data, ReificationStyle.Minimal );
+ return ModelFactory.createModelForGraph( makeInfGraph(rules, data ) );
}
}
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/WebOntTestHarness.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/WebOntTestHarness.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/WebOntTestHarness.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/WebOntTestHarness.java Tue Jan 8 19:07:23 2013
@@ -18,18 +18,18 @@
package com.hp.hpl.jena.reasoner.rulesys.test;
-import com.hp.hpl.jena.graph.query.*;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.rdf.model.*;
-
-import com.hp.hpl.jena.reasoner.*;
-import com.hp.hpl.jena.reasoner.rulesys.FBRuleInfGraph;
-import com.hp.hpl.jena.reasoner.test.WGReasonerTester;
-import com.hp.hpl.jena.vocabulary.*;
+import java.io.* ;
+import java.util.* ;
-import java.io.*;
-import java.util.*;
+import com.hp.hpl.jena.ontology.OntModelSpec ;
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.reasoner.InfGraph ;
+import com.hp.hpl.jena.reasoner.Reasoner ;
+import com.hp.hpl.jena.reasoner.ReasonerException ;
+import com.hp.hpl.jena.reasoner.ReasonerRegistry ;
+import com.hp.hpl.jena.reasoner.rulesys.FBRuleInfGraph ;
+import com.hp.hpl.jena.reasoner.test.WGReasonerTester ;
+import com.hp.hpl.jena.vocabulary.* ;
/**
* Test harness for running the WebOnt working group tests relevant
@@ -377,7 +377,7 @@ public class WebOntTestHarness {
((FBRuleInfGraph)graph).resetLPProfile(true);
}
Model result = ModelFactory.createModelForGraph(graph);
- boolean correct = testEntailment(conclusions.getGraph(), result.getGraph());
+ boolean correct = WGReasonerTester.testConclusions(conclusions.getGraph(), result.getGraph());
long t2 = System.currentTimeMillis();
lastTestDuration = t2 - t1;
if (printProfile) {
@@ -468,18 +468,6 @@ public class WebOntTestHarness {
}
/**
- * Test a conclusions graph against a result graph. This works by
- * translating the conclusions graph into a find query which contains one
- * variable for each distinct bNode in the conclusions graph.
- */
- public boolean testEntailment(Graph conclusions, Graph result) {
- QueryHandler qh = result.queryHandler();
- GraphQuery query = WGReasonerTester.graphToQuery(conclusions);
- Iterator<Domain> i = qh.prepareBindings(query, new Node[] {}).executeBindings();
- return i.hasNext();
- }
-
- /**
* Example the conclusions graph for introduction of restrictions which
* require a comprehension rewrite and declare new (anon) classes
* for those restrictions.
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestInfGraph.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestInfGraph.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestInfGraph.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestInfGraph.java Tue Jan 8 19:07:23 2013
@@ -18,13 +18,12 @@
package com.hp.hpl.jena.reasoner.test;
-import junit.framework.*;
+import junit.framework.TestSuite ;
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.test.AbstractTestGraph;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.reasoner.InfGraph;
-import com.hp.hpl.jena.reasoner.rulesys.BasicFBReifier;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.test.AbstractTestGraph ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.reasoner.InfGraph ;
/**
Needs extending; relys on knowing that the only InfGraph currently used is
@@ -56,12 +55,6 @@ public class TestInfGraph extends Abstra
assertSame( ig.getPrefixMapping(), ig.getRawGraph().getPrefixMapping() );
}
- public void testInfReification()
- {
- InfGraph ig = getInfGraph();
- assertInstanceOf( BasicFBReifier.class, ig.getReifier() );
- }
-
/**
Placeholder. Will need revision later.
*/
Modified: jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestRDFSReasoners.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestRDFSReasoners.java?rev=1430447&r1=1430446&r2=1430447&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestRDFSReasoners.java (original)
+++ jena/branches/streaming-update/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestRDFSReasoners.java Tue Jan 8 19:07:23 2013
@@ -274,7 +274,7 @@ public class TestRDFSReasoners extends R
} else if (file.endsWith("n3")) {
langType = "N3";
}
- Model m = ModelFactory.createNonreifyingModel();
+ Model m = ModelFactory.createDefaultModel();
Reader reader = new BufferedReader(new FileReader("testing/reasoners/rdfs/"+file));
m.read(reader, WGReasonerTester.BASE_URI + file, langType);
InfGraph g = rf.create(null).bind(m.getGraph());