svn commit: r1508972 - in /jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test: TestReaders.java helpers/TestingModelFactory.java

[claude]

Author: claude
Date: Wed Jul 31 18:04:00 2013
New Revision: 1508972

URL: http://svn.apache.org/r1508972
Log:
fix for JENA-488

Modified:
    
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java
    
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/TestingModelFactory.java

Modified: 
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java?rev=1508972&r1=1508971&r2=1508972&view=diff
==============================================================================
--- 
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java
 (original)
+++ 
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java
 Wed Jul 31 18:04:00 2013
@@ -27,7 +27,6 @@ import org.junit.Assert ;
 
 import com.hp.hpl.jena.rdf.model.RDFReader ;
 import com.hp.hpl.jena.rdf.model.StmtIterator ;
-import com.hp.hpl.jena.rdf.model.impl.NTripleReader ;
 import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory ;
 import com.hp.hpl.jena.shared.JenaException ;
 import com.hp.hpl.jena.shared.NoReaderForLangException ;
@@ -45,12 +44,15 @@ public class TestReaders extends Abstrac
                this( new TestPackage.PlainModelFactory(), "TestReaders"); 
        }
 
+       /**
+        * Test to ensure that the reader is set.
+        */
        public void testGetNTripleReader()
        {
                final RDFReader reader = model.getReader("N-TRIPLE");
-               Assert.assertTrue(reader instanceof NTripleReader);
+        Assert.assertNotNull(reader);
        }
-
+       
        public void testMissingReader()
        {
                model.setReaderClassName("foobar", "");

Modified: 
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/TestingModelFactory.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/TestingModelFactory.java?rev=1508972&r1=1508971&r2=1508972&view=diff
==============================================================================
--- 
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/TestingModelFactory.java
 (original)
+++ 
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/TestingModelFactory.java
 Wed Jul 31 18:04:00 2013
@@ -30,9 +30,23 @@ import com.hp.hpl.jena.shared.PrefixMapp
  */
 public interface TestingModelFactory
 {
+       /**
+        * Create the default model for testing
+        * @return the model.
+        */
        abstract public Model createModel();
 
+       /**
+        * get the prefix mapping for the default model.
+        * @return a PrefixMapping
+        */
        abstract public PrefixMapping getPrefixMapping();
 
+       /**
+        * Get a model for the specified graph.
+        * @param base the graph to make the model for.
+        * @return the model
+        */
        abstract public Model createModel( Graph base );
+
 }