You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/07/12 21:50:13 UTC
svn commit: r1360890 - in /jena/trunk/jena-core/src:
main/java/com/hp/hpl/jena/mem/ test/java/com/hp/hpl/jena/graph/test/
test/java/com/hp/hpl/jena/mem/test/
Author: andy
Date: Thu Jul 12 19:50:13 2012
New Revision: 1360890
URL: http://svn.apache.org/viewvc?rev=1360890&view=rev
Log:
Remove previously deprecated:
SmallGraphMem
GraphMem
(these were unused in the codebase)
Removed:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphMem.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/SmallGraphMem.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem.java
Modified:
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/MetaTestGraph.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraph.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReificationWrapper.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReifier.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestMemPackage.java
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/MetaTestGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/MetaTestGraph.java?rev=1360890&r1=1360889&r2=1360890&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/MetaTestGraph.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/MetaTestGraph.java Thu Jul 12 19:50:13 2012
@@ -23,15 +23,11 @@ import java.lang.reflect.*;
import junit.framework.*;
import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.mem.GraphMem;
import com.hp.hpl.jena.shared.*;
/**
MetaTestGraph
-
- @author kers
*/
-@SuppressWarnings("deprecation")
public class MetaTestGraph extends AbstractTestGraph
{
protected final Class<? extends Graph> graphClass;
@@ -47,9 +43,6 @@ public class MetaTestGraph extends Abstr
public MetaTestGraph( String name )
{ super( name ); graphClass = null; style = null; }
- public static TestSuite suite()
- { return suite( MetaTestGraph.class, GraphMem.class, ReificationStyle.Minimal ); }
-
/**
Construct a suite of tests from the test class <code>testClass</code>
by instantiating it three times, once each for the three reification styles,
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraph.java?rev=1360890&r1=1360889&r2=1360890&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraph.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraph.java Thu Jul 12 19:50:13 2012
@@ -34,13 +34,11 @@ 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.mem.faster.GraphMemFaster ;
import com.hp.hpl.jena.shared.ReificationStyle ;
import com.hp.hpl.jena.util.CollectionFactory ;
import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
-@SuppressWarnings("deprecation")
public class TestGraph extends GraphTestBase
{
public TestGraph( String name )
@@ -55,8 +53,6 @@ public class TestGraph extends GraphTest
TestSuite result = new TestSuite( TestGraph.class );
result.addTest( suite( MetaTestGraph.class, GraphMemFaster.class ) );
result.addTest( suite( TestReifier.class, GraphMemFaster.class ) );
- result.addTest( suite( MetaTestGraph.class, GraphMem.class ) );
- result.addTest( suite( TestReifier.class, GraphMem.class ) );
result.addTest( suite( MetaTestGraph.class, WrappedGraphMem.class ) );
result.addTest( suite( TestReifier.class, WrappedGraphMem.class ) );
result.addTest( TestGraphListener.suite() );
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReificationWrapper.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReificationWrapper.java?rev=1360890&r1=1360889&r2=1360890&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReificationWrapper.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReificationWrapper.java Thu Jul 12 19:50:13 2012
@@ -18,19 +18,17 @@
package com.hp.hpl.jena.graph.test;
-import junit.framework.TestSuite;
+import junit.framework.TestSuite ;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.graph.impl.*;
-import com.hp.hpl.jena.mem.GraphMem;
-import com.hp.hpl.jena.shared.*;
+import com.hp.hpl.jena.graph.Factory ;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.impl.ReificationWrapperGraph ;
+import com.hp.hpl.jena.mem.faster.GraphMemFaster ;
+import com.hp.hpl.jena.shared.ReificationStyle ;
/**
Tests for ReificationWrapper and hence ReificationWrapperGraph.
-
- @author kers
*/
-@SuppressWarnings("deprecation")
public class TestReificationWrapper extends AbstractTestReifier
{
protected final Class<? extends Graph> graphClass;
@@ -71,5 +69,5 @@ public class TestReificationWrapper exte
@Override
public Graph getGraph( ReificationStyle style )
- { return new ReificationWrapperGraph( new GraphMem( Standard ), style ); }
+ { return new ReificationWrapperGraph( new GraphMemFaster( Standard ), style ); }
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReifier.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReifier.java?rev=1360890&r1=1360889&r2=1360890&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReifier.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestReifier.java Thu Jul 12 19:50:13 2012
@@ -18,21 +18,18 @@
package com.hp.hpl.jena.graph.test;
-import java.lang.reflect.Constructor;
+import java.lang.reflect.Constructor ;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.graph.impl.GraphBase;
-import com.hp.hpl.jena.graph.impl.ReifierFragmentsMap;
-import com.hp.hpl.jena.graph.impl.ReifierTripleMap;
-import com.hp.hpl.jena.graph.impl.SimpleReifier;
-import com.hp.hpl.jena.graph.impl.SimpleReifierFragmentsMap;
-import com.hp.hpl.jena.graph.impl.SimpleReifierTripleMap;
-import com.hp.hpl.jena.mem.*;
-import com.hp.hpl.jena.mem.faster.GraphMemFaster;
-import com.hp.hpl.jena.shared.*;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
+import junit.framework.TestSuite ;
-import junit.framework.*;
+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.faster.GraphMemFaster ;
+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.
@@ -54,11 +51,9 @@ public class TestReifier extends Abstrac
this.style = style;
}
- @SuppressWarnings("deprecation")
public static TestSuite suite()
{
TestSuite result = new TestSuite();
- result.addTest( MetaTestGraph.suite( TestReifier.class, GraphMem.class ) );
result.addTest( MetaTestGraph.suite( TestReifier.class, GraphMemFaster.class ) );
result.setName(TestReifier.class.getSimpleName());
return result;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestMemPackage.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestMemPackage.java?rev=1360890&r1=1360889&r2=1360890&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestMemPackage.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestMemPackage.java Thu Jul 12 19:50:13 2012
@@ -34,7 +34,6 @@ public class TestMemPackage extends Test
{
TestSuite result = new TestSuite();
result.addTest( TestGraphTripleStore.suite() );
- result.addTest( TestGraphMem.suite() );
result.addTest( new TestSuite( TestArrayTripleBunch.class ) );
result.addTest( new TestSuite( TestWrappedSetTripleBunch.class ) );
result.addTest( new TestSuite( TestHashedTripleBunch.class ) );