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 2014/04/05 13:30:22 UTC
svn commit: r1585050 -
/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java
Author: andy
Date: Sat Apr 5 11:30:22 2014
New Revision: 1585050
URL: http://svn.apache.org/r1585050
Log:
JENA-672 : Clean tests up.
Remove conneg test because the functionality is tested elsewhere nowadays.
Modified:
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java?rev=1585050&r1=1585049&r2=1585050&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java Sat Apr 5 11:30:22 2014
@@ -16,140 +16,78 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.rdf.model.test;
+package com.hp.hpl.jena.rdf.model.test ;
-import com.hp.hpl.jena.n3.IRIResolver;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.test.helpers.ModelHelper;
-import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory;
-import com.hp.hpl.jena.shared.ConfigException;
-import com.hp.hpl.jena.shared.JenaException;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.ConnectException;
-import java.net.NoRouteToHostException;
-import java.net.UnknownHostException;
+import java.io.FileNotFoundException ;
-import org.apache.jena.iri.IRIException;
-import org.junit.Assert;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.jena.iri.IRIException ;
+import org.junit.Assert ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+
+import com.hp.hpl.jena.n3.IRIResolver ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.rdf.model.test.helpers.ModelHelper ;
+import com.hp.hpl.jena.rdf.model.test.helpers.TestingModelFactory ;
+import com.hp.hpl.jena.shared.ConfigException ;
/**
- * TestModelRead - test that the new model.read operation(s) exist.
+ * TestModelRead - test that the model.read operation(s) exist.
*/
public class TestModelRead extends AbstractModelTestBase
{
- protected static Logger logger = LoggerFactory
- .getLogger(TestModelRead.class);
+ protected static Logger logger = LoggerFactory.getLogger(TestModelRead.class) ;
- public TestModelRead( final TestingModelFactory modelFactory,
- final String name )
- {
- super(modelFactory, name);
- }
-
- public TestModelRead() {
- this( new TestPackage.PlainModelFactory(), "TestModelRead");
- }
-
-// public void testContentNegotiation()
-// {
-// try
-// {
-// model.read("http://jena.sourceforge.net/test/mime/test1");
-// Assert.assertEquals(model.size(), 1);
-// }
-// catch (final JenaException jx)
-// {
-// if ((jx.getCause() instanceof NoRouteToHostException)
-// || (jx.getCause() instanceof UnknownHostException)
-// || (jx.getCause() instanceof ConnectException)
-// || (jx.getCause() instanceof IOException))
-// {
-// TestModelRead.logger
-// .warn("Cannot access public internet - content negotiation test not executed");
-// }
-// else
-// {
-// throw jx;
-// }
-// }
-// }
-
- public void testDefaultLangXML() throws FileNotFoundException
- {
- final Model model = ModelFactory.createDefaultModel();
- model.read(getFileName( "modelReading/plain.rdf"), null, null);
- }
-
- public void testGRDDLConfigMessage()
- {
- try
- {
- model.read("http://www.w3.org/", "GRDDL");
- // ok.
- }
- catch (final ConfigException e)
- {
- // expected.
- }
- }
-
- /*
- * Suppressed, since the other Model::read(String url) operations apparently
- * don't retry failing URLs as filenames. But the code text remains, so that
- * when-and-if, we have a basis.
- */
- // public void testLoadsSimpleModelWithoutProtocol()
- // {
- // Model expected = ModelFactory.createDefaultModel();
- // Model model = ModelFactory.createDefaultModel();
- // expected.read( "testing/modelReading/simple.n3", "RDF/XML" );
- // assertSame( model, model.read( "testing/modelReading/simple.n3", "base",
- // "N3" ) );
- // assertIsoModels( expected, model );
- // }
-
- public void testLoadsSimpleModel() throws FileNotFoundException
- {
- final Model expected = createModel();
- expected.read( getFileName("modelReading/simple.n3"), "N3");
- Assert.assertSame(model,
- model.read( getFileName("modelReading/simple.n3"), "base", "N3"));
- ModelHelper.assertIsoModels(expected, model);
- }
-
- public void testReturnsSelf() throws FileNotFoundException
- {
-
- Assert.assertSame(model,
- model.read( getFileName("modelReading/empty.n3"), "base", "N3"));
- Assert.assertTrue(model.isEmpty());
- }
-
- public void testSimpleLoadExplicitBase() throws FileNotFoundException
- {
- final Model mBasedExplicit = createModel();
- mBasedExplicit.read( getFileName("modelReading/based.n3"),
- "http://example/", "N3");
- ModelHelper.assertIsoModels(ModelHelper.modelWithStatements(this,
- "http://example/ ja:predicate ja:object"), mBasedExplicit);
- }
-
- public void testSimpleLoadImplictBase() throws IRIException, FileNotFoundException
- {
- final Model mBasedImplicit = createModel();
- final String fn = IRIResolver
- .resolveFileURL( getFileName("modelReading/based.n3"));
- final Model wanted = createModel().add(ModelHelper.resource(fn),
- ModelHelper.property("ja:predicate"),
- ModelHelper.resource("ja:object"));
- mBasedImplicit.read(fn, "N3");
- ModelHelper.assertIsoModels(wanted, mBasedImplicit);
- }
+ public TestModelRead(final TestingModelFactory modelFactory, final String name) {
+ super(modelFactory, name) ;
+ }
+
+ public TestModelRead() {
+ this(new TestPackage.PlainModelFactory(), "TestModelRead") ;
+ }
+
+ public void testDefaultLangXML() throws FileNotFoundException {
+ final Model model = ModelFactory.createDefaultModel() ;
+ model.read(getFileName("modelReading/plain.rdf"), null, null) ;
+ }
+
+ public void testGRDDLConfigMessage() {
+ try {
+ model.read("http://www.w3.org/", "GRDDL") ;
+ // ok.
+ } catch (final ConfigException e) {
+ // expected.
+ }
+ }
+
+ public void testLoadsSimpleModel() throws FileNotFoundException {
+ final Model expected = createModel() ;
+ expected.read(getFileName("modelReading/simple.n3"), "N3") ;
+ Assert.assertSame(model, model.read(getFileName("modelReading/simple.n3"), "base", "N3")) ;
+ ModelHelper.assertIsoModels(expected, model) ;
+ }
+
+ public void testReturnsSelf() throws FileNotFoundException {
+
+ Assert.assertSame(model, model.read(getFileName("modelReading/empty.n3"), "base", "N3")) ;
+ Assert.assertTrue(model.isEmpty()) ;
+ }
+
+ public void testSimpleLoadExplicitBase() throws FileNotFoundException {
+ final Model mBasedExplicit = createModel() ;
+ mBasedExplicit.read(getFileName("modelReading/based.n3"), "http://example/", "N3") ;
+ ModelHelper.assertIsoModels(ModelHelper.modelWithStatements(this, "http://example/ ja:predicate ja:object"),
+ mBasedExplicit) ;
+ }
+
+ public void testSimpleLoadImplictBase() throws IRIException, FileNotFoundException {
+ final Model mBasedImplicit = createModel() ;
+ final String fn = IRIResolver.resolveFileURL(getFileName("modelReading/based.n3")) ;
+ final Model wanted = createModel().add(ModelHelper.resource(fn), ModelHelper.property("ja:predicate"),
+ ModelHelper.resource("ja:object")) ;
+ mBasedImplicit.read(fn, "N3") ;
+ ModelHelper.assertIsoModels(wanted, mBasedImplicit) ;
+ }
}