jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1342713 - in /jena/trunk/jena-core/src: main/java/com/hp/hpl/jena/mem/ test/java/com/hp/hpl/jena/graph/query/test/ test/java/com/hp/hpl/jena/graph/test/ test/java/com/hp/hpl/jena/mem/test/ test/java/com/hp/hpl/jena/test/ test/java/com/hp/h...
Date Fri, 25 May 2012 16:23:50 GMT
Author: andy
Date: Fri May 25 16:23:49 2012
New Revision: 1342713

URL: http://svn.apache.org/viewvc?rev=1342713&view=rev
Log:
Remove MixedGraphMem; deprecate SmallGraphMem and GraphMem (the implementation used is GraphMemFaster)

Removed:
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/MixedGraphMem.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/MixedGraphMemStore.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestMixedGraphMem.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestSmallGraphMem.java
Modified:
    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/graph/query/test/QueryTest.java
    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/TestGraphMem.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestMemPackage.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/test/TestPackage.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestResourceUtils.java

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphMem.java?rev=1342713&r1=1342712&r2=1342713&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphMem.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphMem.java Fri May 25 16:23:49
2012
@@ -29,6 +29,7 @@ import com.hp.hpl.jena.util.iterator.*;
     A memory-backed graph with S/P/O indexes. 
     @author  bwm, kers
 */
+@Deprecated
 public class GraphMem extends GraphMemBase implements Graph 
     {    
     public GraphTripleStore forTestingOnly_getStore() 

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/SmallGraphMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/SmallGraphMem.java?rev=1342713&r1=1342712&r2=1342713&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/SmallGraphMem.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/mem/SmallGraphMem.java Fri May 25 16:23:49
2012
@@ -33,7 +33,7 @@ import com.hp.hpl.jena.util.iterator.Ext
      
     @author kers
 */
-
+@Deprecated
 public class SmallGraphMem extends GraphMemBase
     {
     protected Set<Triple> triples = CollectionFactory.createHashedSet();

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/QueryTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/QueryTest.java?rev=1342713&r1=1342712&r2=1342713&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/QueryTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/query/test/QueryTest.java Fri
May 25 16:23:49 2012
@@ -18,10 +18,11 @@
 
 package com.hp.hpl.jena.graph.query.test;
 
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.mem.*;
+import junit.framework.TestCase ;
+import junit.framework.TestSuite ;
 
-import junit.framework.*;
+import com.hp.hpl.jena.graph.Factory ;
+import com.hp.hpl.jena.graph.Graph ;
 
 /**
     Test query over plain memory graphs.
@@ -36,7 +37,6 @@ public class QueryTest extends TestCase
     	{ 
         TestSuite result = new TestSuite();
         result.addTest( new TestSuite( TestQueryGraphMem.class ) );
-        result.addTest( new TestSuite( TestQuerySmallGraphMem.class ) );
         result.addTestSuite( TestQuery.class );
         result.setName(QueryTest.class.getName());
         return result;
@@ -48,12 +48,4 @@ public class QueryTest extends TestCase
         
         @Override public Graph getGraph() { return Factory.createGraphMem(); }       
         }
-    
-    public static class TestQuerySmallGraphMem extends AbstractTestQuery
-        {
-        public TestQuerySmallGraphMem( String name ) { super( name ); }
-        
-        @Override public Graph getGraph() { return new SmallGraphMem(); }       
-        }
-     
     }

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=1342713&r1=1342712&r2=1342713&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 Fri May
25 16:23:49 2012
@@ -31,6 +31,7 @@ import com.hp.hpl.jena.shared.*;
 
 	@author kers
 */
+@SuppressWarnings("deprecation")
 public class MetaTestGraph extends AbstractTestGraph 
     {
     protected final Class<? extends Graph> graphClass;

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=1342713&r1=1342712&r2=1342713&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 Fri May 25
16:23:49 2012
@@ -25,17 +25,22 @@ package com.hp.hpl.jena.graph.test;
     @author kers
 */
 
-import com.hp.hpl.jena.mem.*;
-import com.hp.hpl.jena.shared.ReificationStyle;
-import com.hp.hpl.jena.util.CollectionFactory;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.graph.impl.*;
+import java.util.Set ;
 
-import java.util.*;
+import junit.framework.Test ;
+import junit.framework.TestSuite ;
 
-import junit.framework.*;
+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 )
@@ -48,10 +53,10 @@ public class TestGraph extends GraphTest
     public static TestSuite suite()
         { 
         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, SmallGraphMem.class ) );
-        result.addTest( suite( TestReifier.class, SmallGraphMem.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=1342713&r1=1342712&r2=1342713&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
Fri May 25 16:23:49 2012
@@ -30,6 +30,7 @@ import com.hp.hpl.jena.shared.*;
     
  	@author kers
 */
+@SuppressWarnings("deprecation")
 public class TestReificationWrapper extends AbstractTestReifier
     {
     protected final Class<? extends Graph> graphClass;

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=1342713&r1=1342712&r2=1342713&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 Fri May
25 16:23:49 2012
@@ -54,6 +54,7 @@ public class TestReifier extends Abstrac
         this.style = style;
         }
         
+    @SuppressWarnings("deprecation")
     public static TestSuite suite()
         { 
         TestSuite result = new TestSuite();

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem.java?rev=1342713&r1=1342712&r2=1342713&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem.java Fri May
25 16:23:49 2012
@@ -65,6 +65,7 @@ public class TestGraphMem extends Abstra
         assertFalse( g.contains( triple( "y R b" ) ) );
         }    
     
+    @SuppressWarnings("deprecation")
     protected final class GraphMemWithoutFind extends GraphMem
         {
         @Override public ExtendedIterator<Triple> graphBaseFind( TripleMatch t )

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=1342713&r1=1342712&r2=1342713&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 Fri May
25 16:23:49 2012
@@ -35,8 +35,6 @@ public class TestMemPackage extends Test
         TestSuite result = new TestSuite();
         result.addTest( TestGraphTripleStore.suite() );
         result.addTest( TestGraphMem.suite() );
-        result.addTest( TestMixedGraphMem.suite() );
-        result.addTest( TestSmallGraphMem.suite() );
         result.addTest( new TestSuite( TestArrayTripleBunch.class ) );
         result.addTest( new TestSuite( TestWrappedSetTripleBunch.class ) );
         result.addTest( new TestSuite( TestHashedTripleBunch.class ) );

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/test/TestPackage.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/test/TestPackage.java?rev=1342713&r1=1342712&r2=1342713&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/test/TestPackage.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/test/TestPackage.java Fri May 25 16:23:49
2012
@@ -43,6 +43,7 @@ public class TestPackage extends TestCas
         addTest(ts,  "Enhanced", com.hp.hpl.jena.enhanced.test.TestPackage.suite());
         addTest(ts,  "Graph", com.hp.hpl.jena.graph.test.TestPackage.suite());
         addTest(ts,  "Mem", com.hp.hpl.jena.mem.test.TestMemPackage.suite() );
+        addTest(ts,  "Mem2", com.hp.hpl.jena.mem.faster.test.TestFasterMemPackage.suite()
);
         addTest(ts,  "Model", com.hp.hpl.jena.rdf.model.test.TestPackage.suite());
         addTest(ts,  "N3", com.hp.hpl.jena.n3.N3TestSuite.suite());
         addTest(ts,  "Turtle", com.hp.hpl.jena.n3.turtle.TurtleTestSuite.suite()) ;

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestResourceUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestResourceUtils.java?rev=1342713&r1=1342712&r2=1342713&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestResourceUtils.java
(original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/iterator/test/TestResourceUtils.java
Fri May 25 16:23:49 2012
@@ -23,7 +23,6 @@ package com.hp.hpl.jena.util.iterator.te
 
 // Imports
 ///////////////
-import com.hp.hpl.jena.mem.SmallGraphMem;
 import com.hp.hpl.jena.rdf.model.*;
 import com.hp.hpl.jena.vocabulary.RDFS;
 import com.hp.hpl.jena.util.*;
@@ -90,11 +89,6 @@ public class TestResourceUtils
         assertEquals( "Result should be a", c, ResourceUtils.maximalLowerElements( cd, RDFS.subClassOf,
true ).iterator().next() );
     }
     
-    // this is a way to check for violation of the CME constraint.
-    public void testRenameResourceAvoidsCCE() {
-        testRenameResource( ModelFactory.createModelForGraph( new SmallGraphMem() ) );
-    }
-
     public void testRenameResource() {
         testRenameResource( ModelFactory.createDefaultModel() );
     }



Mime
View raw message