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/11/19 20:53:55 UTC
svn commit: r1411372 [3/4] - in /jena/trunk/jena-core: ./
src/main/java/com/hp/hpl/jena/n3/ src/main/java/com/hp/hpl/jena/ontology/
src/main/java/com/hp/hpl/jena/ontology/daml/
src/main/java/com/hp/hpl/jena/ontology/event/
src/main/java/com/hp/hpl/jena...
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/ontology/impl/TestResource.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/ontology/impl/TestResource.java?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/ontology/impl/TestResource.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/ontology/impl/TestResource.java Mon Nov 19 19:53:42 2012
@@ -76,7 +76,7 @@ public class TestResource extends OntTes
@Override
public OntTestCase[] getTests() {
return new OntTestCase[] {
- new OntTestCase( "OntResource.sameAs", true, false, true, false ) {
+ new OntTestCase( "OntResource.sameAs", true, false, false ) {
@Override
public void ontTest( OntModel m ) throws Exception {
Profile prof = m.getProfile();
@@ -105,7 +105,7 @@ public class TestResource extends OntTes
assertEquals( "Cardinality should be 0", 0, a.getCardinality( prof.SAME_AS() ) );
}
},
- new OntTestCase( "OntResource.differentFrom", true, true, true, false ) {
+ new OntTestCase( "OntResource.differentFrom", true, true, false ) {
@Override
public void ontTest( OntModel m ) throws Exception {
Profile prof = m.getProfile();
@@ -134,7 +134,7 @@ public class TestResource extends OntTes
assertEquals( "Cardinality should be 0", 0, a.getCardinality( prof.DIFFERENT_FROM() ) );
}
},
- new OntTestCase( "OntResource.seeAlso", true, true, true, true ) {
+ new OntTestCase( "OntResource.seeAlso", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
Profile prof = m.getProfile();
@@ -163,7 +163,7 @@ public class TestResource extends OntTes
assertEquals( "Cardinality should be 0", 0, a.getCardinality( prof.SEE_ALSO() ) );
}
},
- new OntTestCase( "OntResource.isDefinedBy", true, true, true, true ) {
+ new OntTestCase( "OntResource.isDefinedBy", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
Profile prof = m.getProfile();
@@ -192,7 +192,7 @@ public class TestResource extends OntTes
assertEquals( "Cardinality should be 0", 0, a.getCardinality( prof.IS_DEFINED_BY() ) );
}
},
- new OntTestCase( "OntResource.versionInfo", true, true, true, false ) {
+ new OntTestCase( "OntResource.versionInfo", true, true, false ) {
@Override
public void ontTest( OntModel m ) throws Exception {
Profile prof = m.getProfile();
@@ -219,7 +219,7 @@ public class TestResource extends OntTes
assertEquals( "Cardinality should be 0", 0, a.getCardinality( prof.VERSION_INFO() ) );
}
},
- new OntTestCase( "OntResource.label.nolang", true, true, true, true ) {
+ new OntTestCase( "OntResource.label.nolang", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
Profile prof = m.getProfile();
@@ -246,7 +246,7 @@ public class TestResource extends OntTes
assertEquals( "Cardinality should be 0", 0, a.getCardinality( prof.LABEL() ) );
}
},
- new OntTestCase( "OntResource.label.lang", true, true, true, true ) {
+ new OntTestCase( "OntResource.label.lang", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
OntResource a = m.getResource( NS + "a" ).as( OntResource.class );
@@ -281,7 +281,7 @@ public class TestResource extends OntTes
assertEquals( "Cardinality should be 4", 4, a.getCardinality( a.getProfile().LABEL() ) );
}
},
- new OntTestCase( "OntResource.comment.nolang", true, true, true, true ) {
+ new OntTestCase( "OntResource.comment.nolang", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
Profile prof = m.getProfile();
@@ -308,7 +308,7 @@ public class TestResource extends OntTes
assertEquals( "Cardinality should be 0", 0, a.getCardinality( prof.COMMENT() ) );
}
},
- new OntTestCase( "OntResource.comment.lang", true, true, true, true ) {
+ new OntTestCase( "OntResource.comment.lang", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
OntResource a = m.getResource( NS + "a" ).as( OntResource.class );
@@ -343,7 +343,7 @@ public class TestResource extends OntTes
assertEquals( "Cardinality should be 4", 4, a.getCardinality( a.getProfile().COMMENT() ) );
}
},
- new OntTestCase( "OntResource.type (no inference)", true, true, true, true ) {
+ new OntTestCase( "OntResource.type (no inference)", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
OntClass A = m.createClass( NS + "A" );
@@ -379,7 +379,7 @@ public class TestResource extends OntTes
assertEquals( "Cardinality should be 0", 0, a.getCardinality( RDF.type ) );
}
},
- new OntTestCase( "OntResource.remove", true, true, true, true ) {
+ new OntTestCase( "OntResource.remove", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
OntClass A = m.createClass( NS + "A" );
@@ -402,7 +402,7 @@ public class TestResource extends OntTes
iteratorTest( A.listSubClasses(), new Object[] {B} );
}
},
- new OntTestCase( "OntResource.asClass", true, true, true, true ) {
+ new OntTestCase( "OntResource.asClass", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
Resource r = m.createResource();
@@ -422,7 +422,7 @@ public class TestResource extends OntTes
assertTrue( "Should be OntClass", n instanceof OntClass );
}
},
- new OntTestCase( "OntResource.asAnnotationProperty", true, true, false, false) {
+ new OntTestCase( "OntResource.asAnnotationProperty", true, true, false) {
@Override
public void ontTest( OntModel m ) throws Exception {
if (m.getProfile().ANNOTATION_PROPERTY() == null) {
@@ -446,7 +446,7 @@ public class TestResource extends OntTes
assertTrue( "Should be AnnotationProperty", n instanceof AnnotationProperty);
}
},
- new OntTestCase( "OntResource.asObjectProperty", true, true, true, false) {
+ new OntTestCase( "OntResource.asObjectProperty", true, true, false) {
@Override
public void ontTest( OntModel m ) throws Exception {
if (m.getProfile().OBJECT_PROPERTY() == null) {
@@ -470,7 +470,7 @@ public class TestResource extends OntTes
assertTrue( "Should be ObjectProperty", n instanceof ObjectProperty);
}
},
- new OntTestCase( "OntResource.asDatatypeProperty", true, true, true, false) {
+ new OntTestCase( "OntResource.asDatatypeProperty", true, true, false) {
@Override
public void ontTest( OntModel m ) throws Exception {
if (m.getProfile().DATATYPE_PROPERTY() == null) {
@@ -494,7 +494,7 @@ public class TestResource extends OntTes
assertTrue( "Should be DatatypeProperty", n instanceof DatatypeProperty);
}
},
- new OntTestCase( "OntResource.asAllDifferent", true, true, false, false) {
+ new OntTestCase( "OntResource.asAllDifferent", true, true, false) {
@Override
public void ontTest( OntModel m ) throws Exception {
if (m.getProfile().ALL_DIFFERENT() == null) {
@@ -518,7 +518,7 @@ public class TestResource extends OntTes
assertTrue( "Should be AnnotationProperty", n instanceof AllDifferent);
}
},
- new OntTestCase( "OntResource.asProperty", true, true, true, true ) {
+ new OntTestCase( "OntResource.asProperty", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
Resource r = m.createResource();
@@ -539,7 +539,7 @@ public class TestResource extends OntTes
assertTrue( "Should be OntProperty", n instanceof OntProperty);
}
},
- new OntTestCase( "OntResource.asIndividual", true, true, true, true ) {
+ new OntTestCase( "OntResource.asIndividual", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
Resource r = m.createResource();
@@ -562,7 +562,7 @@ public class TestResource extends OntTes
assertTrue( "Should be individual", n instanceof Individual);
}
},
- new OntTestCase( "OntResource.asDataRange", true, false, false, false ) {
+ new OntTestCase( "OntResource.asDataRange", true, false, false ) {
@Override
public void ontTest( OntModel m ) throws Exception {
if (m.getProfile().DATARANGE() == null) {
@@ -586,7 +586,7 @@ public class TestResource extends OntTes
assertTrue( "Should be DataRange", n instanceof DataRange );
}
},
- new OntTestCase( "OntResource.asOntology", true, true, true, false ) {
+ new OntTestCase( "OntResource.asOntology", true, true, false ) {
@Override
public void ontTest( OntModel m ) throws Exception {
if (m.getProfile().ONTOLOGY() == null) {
@@ -610,7 +610,7 @@ public class TestResource extends OntTes
assertTrue( "Should be Ontology", n instanceof Ontology);
}
},
- new OntTestCase( "OntResource.isLanguageTerm", true, true, true, true ) {
+ new OntTestCase( "OntResource.isLanguageTerm", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
// class is defined (differently) in every profile
@@ -621,7 +621,7 @@ public class TestResource extends OntTes
assertFalse( "should not be a lang term", or.isOntLanguageTerm() );
}
},
- new OntTestCase( "OntResource.getOntModel", true, true, true, true ) {
+ new OntTestCase( "OntResource.getOntModel", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
OntResource or = m.createOntResource( "http://foo/bar" );
@@ -629,7 +629,7 @@ public class TestResource extends OntTes
assertEquals( m, m0 );
}
},
- new OntTestCase( "OntResource.getPropertyValue - object prop", true, true, true, true ) {
+ new OntTestCase( "OntResource.getPropertyValue - object prop", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
OntResource a = m.createOntResource( "http://foo/bar#a" );
@@ -641,7 +641,7 @@ public class TestResource extends OntTes
assertTrue( "Return value should be an OntResource", bb instanceof OntResource );
}
},
- new OntTestCase( "OntResource.getPropertyValue - missing prop", true, true, true, true ) {
+ new OntTestCase( "OntResource.getPropertyValue - missing prop", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
OntResource a = m.createOntResource( "http://foo/bar#a" );
@@ -653,7 +653,7 @@ public class TestResource extends OntTes
assertNull( bb );
}
},
- new OntTestCase( "OntResource.listPropertyValues - object prop", true, true, true, true ) {
+ new OntTestCase( "OntResource.listPropertyValues - object prop", true, true, true ) {
@Override
public void ontTest( OntModel m ) throws Exception {
OntResource a = m.createOntResource( "http://foo/bar#a" );
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java Mon Nov 19 19:53:42 2012
@@ -39,10 +39,6 @@ import com.hp.hpl.jena.rdf.arp.ParseExce
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
-/**
- * @author jjc
- *
- */
public class TaintingTests extends TestCase implements ErrorHandler,
ARPErrorNumbers {
@@ -123,7 +119,6 @@ public class TaintingTests extends TestC
"testing/arp/tainting/base.rdf",
- "testing/arp/tainting/damlcollection.rdf",
"testing/arp/tainting/lang.rdf",
"testing/arp/tainting/ptUnknown.rdf",
"testing/arp/tainting/typedLiteral.rdf",
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestData.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestData.java?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestData.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestData.java Mon Nov 19 19:53:42 2012
@@ -180,8 +180,6 @@ public class TestData implements ARPErro
new Object[] { testFrame, xmlContext });
add("tl", "typed-literal", WantTypedLiteral.class, new Object[] {
testFrame, "http://ex/dt", xmlContext });
- add("dl", "daml:collection", DAMLCollection.class, new Object[] {
- testFrame, xmlContext });
add("cl", "collection", RDFCollection.class, new Object[] {
testFrame, xmlContext });
add("tp", "top-level", WantTopLevelDescription.class,
@@ -194,7 +192,6 @@ public class TestData implements ARPErro
testFrame, ap });
}
-
int localCount;
int globalCount;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelFactory.java?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelFactory.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelFactory.java Mon Nov 19 19:53:42 2012
@@ -18,29 +18,27 @@
package com.hp.hpl.jena.rdf.model.test;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.rdf.model.impl.*;
-import com.hp.hpl.jena.ontology.*;
-import com.hp.hpl.jena.reasoner.InfGraph;
-import com.hp.hpl.jena.reasoner.Reasoner;
-import com.hp.hpl.jena.reasoner.rulesys.*;
-import com.hp.hpl.jena.shared.*;
-import com.hp.hpl.jena.graph.compose.Union;
+import junit.framework.TestSuite ;
-import junit.framework.*;
+import com.hp.hpl.jena.graph.compose.Union ;
+import com.hp.hpl.jena.rdf.model.InfModel ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.rdf.model.impl.ModelCom ;
+import com.hp.hpl.jena.reasoner.InfGraph ;
+import com.hp.hpl.jena.reasoner.Reasoner ;
+import com.hp.hpl.jena.reasoner.rulesys.GenericRuleReasoner ;
+import com.hp.hpl.jena.reasoner.rulesys.Rule ;
+import com.hp.hpl.jena.shared.PrefixMapping ;
/**
Tests the ModelFactory code. Very skeletal at the moment. It's really
testing that the methods actually exists, but it doesn't check much in
the way of behaviour.
-
- @author kers
*/
public class TestModelFactory extends ModelTestBase
{
- public static final Resource DAMLLangResource = resource( ProfileRegistry.DAML_LANG );
-
public TestModelFactory(String name)
{ super(name); }
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java Mon Nov 19 19:53:42 2012
@@ -18,44 +18,34 @@
package com.hp.hpl.jena.reasoner.rulesys.test;
-import java.io.ByteArrayInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import com.hp.hpl.jena.datatypes.TypeMapper;
-import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.impl.LiteralLabelFactory;
-import com.hp.hpl.jena.ontology.*;
-import com.hp.hpl.jena.rdf.listeners.StatementListener;
-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.ValidityReport;
-import com.hp.hpl.jena.reasoner.rulesys.*;
-import com.hp.hpl.jena.reasoner.rulesys.builtins.BaseBuiltin;
-import com.hp.hpl.jena.reasoner.test.TestUtil;
-import com.hp.hpl.jena.util.FileManager;
-import com.hp.hpl.jena.util.PrintUtil;
-import com.hp.hpl.jena.util.iterator.ClosableIterator;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.vocabulary.DAML_OIL;
-import com.hp.hpl.jena.vocabulary.OWL;
-import com.hp.hpl.jena.vocabulary.RDF;
-import com.hp.hpl.jena.vocabulary.RDFS;
-import com.hp.hpl.jena.vocabulary.ReasonerVocabulary;
+import java.io.FileReader ;
+import java.io.IOException ;
+import java.io.StringReader ;
+import java.util.* ;
+
+import junit.framework.TestCase ;
+import junit.framework.TestSuite ;
+
+import com.hp.hpl.jena.datatypes.TypeMapper ;
+import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.graph.impl.LiteralLabelFactory ;
+import com.hp.hpl.jena.ontology.* ;
+import com.hp.hpl.jena.rdf.listeners.StatementListener ;
+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.rulesys.builtins.BaseBuiltin ;
+import com.hp.hpl.jena.reasoner.test.TestUtil ;
+import com.hp.hpl.jena.util.FileManager ;
+import com.hp.hpl.jena.util.PrintUtil ;
+import com.hp.hpl.jena.util.iterator.ClosableIterator ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.vocabulary.OWL ;
+import com.hp.hpl.jena.vocabulary.RDF ;
+import com.hp.hpl.jena.vocabulary.RDFS ;
+import com.hp.hpl.jena.vocabulary.ReasonerVocabulary ;
/**
@@ -160,27 +150,6 @@ public class TestBugs extends TestCase {
" <ex:cls2 rdf:ID=\"test\"/>" +
"</rdf:RDF>";
- /**
- * This test exposes an apparent problem in the reasoners. If the input data is
- * changed from daml:subClassOf to rdfs:subClassOf, the asserts all pass. As is,
- * the assert for res has rdf:type cls1 fails.
- */
- public void testSubClass() {
- OntModel model = ModelFactory.createOntologyModel(OntModelSpec.DAML_MEM_RDFS_INF, null);
- model.getDocumentManager().setMetadataSearchPath( "file:etc/ont-policy-test.rdf", true );
-
- String base = "http://localhost:8080/axis/daml/a.daml#";
- model.read( new ByteArrayInputStream( INPUT_SUBCLASS.getBytes() ), base );
- OntResource res = model.getResource( base+"test").as(OntResource.class);
-
- OntClass cls1 = model.getResource(base+"cls1").as(OntClass.class);
- OntClass cls2 = model.getResource(base+"cls2").as(OntClass.class);
-
- assertTrue( "cls2 should be a super-class of cls1", cls2.hasSuperClass( cls1 ) );
- assertTrue( "res should have rdf:type cls1", res.hasRDFType( cls1 ) );
- assertTrue( "res should have rdf:type cls2", res.hasRDFType( cls2 ) );
- }
-
public static final String INPUT_SUBPROPERTY =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"" +
@@ -209,29 +178,6 @@ public class TestBugs extends TestCase {
"</rdf:RDF>";
/**
- * This test exposes an apparent problem in the reasoners. If the input data is
- * changed from daml:subPropertyOf to rdfs:subPropertyOf, the asserts all pass. As is,
- * the assert for a1 p a0 fails.
- */
- public void testSubProperty() {
- OntModel model = ModelFactory.createOntologyModel(OntModelSpec.DAML_MEM_RDFS_INF, null);
- model.getDocumentManager().setMetadataSearchPath( "file:etc/ont-policy-test.rdf", true );
-
- String base = "urn:x-hp-jena:test#";
- model.read( new ByteArrayInputStream( INPUT_SUBPROPERTY.getBytes() ), base );
-
- OntResource a0 = model.getResource( base+"a0").as(OntResource.class);
- OntResource a1 = model.getResource( base+"a1").as(OntResource.class);
-
- ObjectProperty p = model.getObjectProperty( base+"p" );
- ObjectProperty q = model.getObjectProperty( base+"q" );
-
- assertTrue("subProp relation present", q.hasProperty(RDFS.subPropertyOf, p));
- assertTrue( "a1 q a0", a1.hasProperty( q, a0 ) ); // asserted
- assertTrue( "a1 p a0", a1.hasProperty( p, a0 ) ); // entailed
- }
-
- /**
* Test for a reported bug in delete
*/
public void testDeleteBug() {
@@ -407,39 +353,6 @@ public class TestBugs extends TestCase {
}
/**
- * Limitation of someValuesFrom applied to datatype properties.
- */
- public void testSomeDatatype() throws IOException {
- String uri = "http://www.daml.org/2001/03/daml+oil-ex-dt";
- String filename = "testing/xsd/daml+oil-ex-dt.xsd";
- TypeMapper tm = TypeMapper.getInstance();
- XSDDatatype.loadUserDefined(uri, new FileReader(filename), null, tm);
-
- Model data = ModelFactory.createDefaultModel();
- data.read("file:testing/reasoners/bugs/userDatatypes.owl");
- InfModel inf = ModelFactory.createInfModel(ReasonerRegistry.getOWLReasoner(), data);
-
- String egNS = "http://jena.hpl.hp.com/eg#";
- Resource meR = inf.getResource(egNS + "me");
- Resource TestR = inf.getResource(egNS + "Test");
- assertTrue("somevalues inf for datatypes", inf.contains(meR, RDF.type, TestR));
-
- Resource Test2R = inf.getResource(egNS + "Test2");
- Resource me2R = inf.getResource(egNS + "me2");
- assertTrue("somevalues inf for datatypes", inf.contains(me2R, RDF.type, Test2R));
- assertTrue("somevalues inf for user datatypes", inf.contains(meR, RDF.type, Test2R));
- }
-
- /* Report on jena-dev that DAMLMicroReasoner infmodels don't support daml:subClassOf, etc */
- public void testDAMLMicroReasonerSupports() {
- Reasoner r = DAMLMicroReasonerFactory.theInstance().create( null );
- assertTrue( "Should support daml:subClassOf", r.supportsProperty( DAML_OIL.subClassOf ));
- assertTrue( "Should support daml:subPropertyOf", r.supportsProperty( DAML_OIL.subPropertyOf));
- assertTrue( "Should support daml:domain", r.supportsProperty( DAML_OIL.domain ));
- assertTrue( "Should support daml:range", r.supportsProperty( DAML_OIL.range ));
- }
-
- /**
* Utility function.
* Create a model from an N3 string with OWL and EG namespaces defined.
*/
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestCapabilities.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestCapabilities.java?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestCapabilities.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestCapabilities.java Mon Nov 19 19:53:42 2012
@@ -18,15 +18,14 @@
package com.hp.hpl.jena.reasoner.rulesys.test;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.reasoner.InfGraph;
-import com.hp.hpl.jena.reasoner.Reasoner;
-import com.hp.hpl.jena.reasoner.ReasonerRegistry;
-import com.hp.hpl.jena.reasoner.rulesys.DAMLMicroReasonerFactory;
+import junit.framework.TestCase ;
+import junit.framework.TestSuite ;
-import junit.framework.TestCase;
-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.reasoner.InfGraph ;
+import com.hp.hpl.jena.reasoner.Reasoner ;
+import com.hp.hpl.jena.reasoner.ReasonerRegistry ;
/**
* Test harness for checking that graphs generated by the main
@@ -64,7 +63,6 @@ public class TestCapabilities extends Te
// {ReasonerRegistry.getDIGReasoner(), Boolean.FALSE},
{ReasonerRegistry.getRDFSReasoner(), Boolean.TRUE},
{ReasonerRegistry.getRDFSSimpleReasoner(), Boolean.TRUE},
- {DAMLMicroReasonerFactory.theInstance().create(null), Boolean.TRUE},
};
Model data = ModelFactory.createDefaultModel();
for (int i = 0; i < testSpec.length; i++) {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestOWLMisc.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestOWLMisc.java?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestOWLMisc.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestOWLMisc.java Mon Nov 19 19:53:42 2012
@@ -103,23 +103,6 @@ public class TestOWLMisc extends TestCas
assertTrue( inf.contains(l4, OWL.differentFrom, l3) );
}
- /**
- * Check datatype range checking using OWL reasoners
- */
- public void testDatatypeRangeValidation() throws IOException {
- String uri = "http://www.daml.org/2001/03/daml+oil-ex-dt";
- String filename = "testing/xsd/daml+oil-ex-dt.xsd";
- TypeMapper tm = TypeMapper.getInstance();
- XSDDatatype.loadUserDefined(uri, new FileReader(filename), null, tm);
-
-// Model m = ModelFactory.createDefaultModel();
- RDFDatatype over12Type = tm.getSafeTypeByName(uri + "#over12");
-
- doTestDatatypeRangeValidation(over12Type, OntModelSpec.OWL_MEM_MICRO_RULE_INF);
- doTestDatatypeRangeValidation(over12Type, OntModelSpec.OWL_MEM_MINI_RULE_INF);
- doTestDatatypeRangeValidation(over12Type, OntModelSpec.OWL_MEM_RULE_INF);
- }
-
private void doTestDatatypeRangeValidation(RDFDatatype over12Type, OntModelSpec spec) {
String NS = "http://jena.hpl.hp.com/example#";
OntModel ont = ModelFactory.createOntologyModel(spec);
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRuleLoader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRuleLoader.java?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRuleLoader.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRuleLoader.java Mon Nov 19 19:53:42 2012
@@ -4,8 +4,6 @@
package com.hp.hpl.jena.reasoner.rulesys.test;
-import java.io.FileNotFoundException;
-
import org.junit.Test;
import com.hp.hpl.jena.reasoner.rulesys.Rule;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestReasoners.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestReasoners.java?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestReasoners.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestReasoners.java Mon Nov 19 19:53:42 2012
@@ -469,33 +469,4 @@ public class TestReasoners extends TestC
});
}
-
- /**
- * Test for duplicate statements in a constructed ontology.
- */
- public void testDuplicateStatements() {
- String NS = "http://swt/test#";
- OntModelSpec s = new OntModelSpec(ModelFactory.createMemModelMaker(),
- null, null, ProfileRegistry.DAML_LANG);
- OntModel model = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF, null);
-
- OntClass documentC = model.createClass(NS + "DOCUMENT");
- OntClass topicC = model.createClass(NS + "TOPIC");
-
- ObjectProperty hasTopicP = model.createObjectProperty(NS + "hasTopic");
- hasTopicP.addDomain(documentC);
- hasTopicP.addRange(topicC);
- ObjectProperty hasDocP = model.createObjectProperty(NS + "hasDocument");
- hasDocP.addDomain(topicC);
- hasDocP.addRange(documentC);
- hasDocP.setInverseOf(hasTopicP);
-
- Individual fooTopic = model.createIndividual(NS + "fooTopic", topicC);
- Individual fooDoc = model.createIndividual(NS + "fooDoc", documentC);
-
- fooDoc.addProperty(hasTopicP, fooTopic);
-
- TestUtil.assertIteratorLength(fooDoc.listProperties(hasTopicP), 1);
- }
-
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/TestPrefixMapping.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/TestPrefixMapping.java?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/TestPrefixMapping.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/shared/TestPrefixMapping.java Mon Nov 19 19:53:42 2012
@@ -18,17 +18,11 @@
package com.hp.hpl.jena.shared;
-import junit.framework.TestSuite;
+import junit.framework.TestSuite ;
-import com.hp.hpl.jena.assembler.JA;
-import com.hp.hpl.jena.shared.impl.PrefixMappingImpl;
-import com.hp.hpl.jena.vocabulary.DAMLVocabulary;
-import com.hp.hpl.jena.vocabulary.DC_11;
-import com.hp.hpl.jena.vocabulary.OWL;
-import com.hp.hpl.jena.vocabulary.RDF;
-import com.hp.hpl.jena.vocabulary.RDFS;
-import com.hp.hpl.jena.vocabulary.RSS;
-import com.hp.hpl.jena.vocabulary.VCARD;
+import com.hp.hpl.jena.assembler.JA ;
+import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;
+import com.hp.hpl.jena.vocabulary.* ;
/**
Tests PrefixMappingImpl by subclassing AbstractTestPrefixMapping, qv.
@@ -64,7 +58,6 @@ public class TestPrefixMapping extends A
public void testExtended( PrefixMapping st )
{
testStandard( st );
- assertEquals( DAMLVocabulary.NAMESPACE_DAML_2001_03_URI, st.getNsPrefixURI( "daml" ) );
assertEquals( RSS.getURI(), st.getNsPrefixURI( "rss" ) );
assertEquals( VCARD.getURI(), st.getNsPrefixURI( "vcard" ) );
assertEquals( JA.getURI(), st.getNsPrefixURI( "ja" ) );
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/PrettyWriterTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/PrettyWriterTest.java?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/PrettyWriterTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/PrettyWriterTest.java Mon Nov 19 19:53:42 2012
@@ -37,12 +37,6 @@ import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.test.ModelTestBase;
-/**
- * JUnit regression tests for the Jena DAML model.
- *
- * @author Jeremy Carroll
- */
-
public class PrettyWriterTest extends ModelTestBase {
/**
@@ -106,12 +100,6 @@ public class PrettyWriterTest extends Mo
}
- public void testAnonDamlClass() throws IOException {
- check(
- "file:testing/abbreviated/daml.rdf",
- "rdf:parseType=[\"']daml:collection[\"']");
- }
-
public void testRDFCollection() throws IOException {
check(
"file:testing/abbreviated/collection.rdf",
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLAbbrev.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLAbbrev.java?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLAbbrev.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLAbbrev.java Mon Nov 19 19:53:42 2012
@@ -44,17 +44,6 @@ public class TestXMLAbbrev extends XMLOu
);
}
- public void testNoDamlCollection() throws IOException
- {
- check
- (
- "testing/abbreviated/daml.rdf",
- null,
- "[\"']daml:collection[\"']",
- Change.blockRules( "daml:collection" )
- );
- }
-
public void testNoRdfCollection() throws IOException
{
check
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/testWriterAndReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/testWriterAndReader.java?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/testWriterAndReader.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/testWriterAndReader.java Mon Nov 19 19:53:42 2012
@@ -18,29 +18,19 @@
package com.hp.hpl.jena.xmloutput;
-import java.io.*;
-import java.util.Random;
-import java.util.Vector;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFErrorHandler;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.RDFReader;
-import com.hp.hpl.jena.rdf.model.RDFWriter;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.rdf.model.test.ModelTestBase;
-import com.hp.hpl.jena.shared.JenaException;
-import com.hp.hpl.jena.vocabulary.DAML_OIL;
-import com.hp.hpl.jena.vocabulary.RDFSyntax;
+import java.io.* ;
+import java.util.Random ;
+import java.util.Vector ;
+
+import junit.framework.Test ;
+import junit.framework.TestSuite ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.rdf.model.test.ModelTestBase ;
+import com.hp.hpl.jena.shared.JenaException ;
+import com.hp.hpl.jena.vocabulary.RDFSyntax ;
/**
* This will test any Writer and Reader pair.
@@ -197,7 +187,6 @@ public class testWriterAndReader
RDFSyntax.sectionReification,
RDFSyntax.sectionListExpand,
RDFSyntax.parseTypeResourcePropertyElt,
- DAML_OIL.collection
};
public void testOptions() throws IOException
@@ -220,9 +209,6 @@ public class testWriterAndReader
static final String baseUris[] =
{
"http://foo.com/Hello",
- "http://foo.com/Hello",
- "http://daml.umbc.edu/ontologies/calendar-ont",
- "http://www.daml.org/2001/03/daml+oil-ex"
};
ByteArrayOutputStream tmpOut;
Modified: jena/trunk/jena-core/testing/abbreviated/collection.rdf
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/testing/abbreviated/collection.rdf?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/testing/abbreviated/collection.rdf (original)
+++ jena/trunk/jena-core/testing/abbreviated/collection.rdf Mon Nov 19 19:53:42 2012
@@ -4,20 +4,20 @@
<rdf:RDF
xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:daml="http://www.daml.org/2001/03/daml+oil#"
+ xmlns:owl ="http://www.w3.org/2002/07/owl#"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
>
<rdfs:Class rdf:ID="C">
- <daml:sameClassAs>
- <daml:Class>
- <daml:intersectionOf rdf:parseType="Collection">
- <daml:Class rdf:ID="A" />
- <daml:Class rdf:ID="B" />
- </daml:intersectionOf>
- </daml:Class>
- </daml:sameClassAs>
+ <owl:sameClassAs>
+ <owl:Class>
+ <owl:intersectionOf rdf:parseType="Collection">
+ <owl:Class rdf:ID="A" />
+ <owl:Class rdf:ID="B" />
+ </owl:intersectionOf>
+ </owl:Class>
+ </owl:sameClassAs>
</rdfs:Class>
Modified: jena/trunk/jena-core/testing/abbreviated/consistency.rdf
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/testing/abbreviated/consistency.rdf?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/testing/abbreviated/consistency.rdf (original)
+++ jena/trunk/jena-core/testing/abbreviated/consistency.rdf Mon Nov 19 19:53:42 2012
@@ -1,4 +1,3 @@
-
<!-- reported on jena-dev early February 2008 as ugly output from the
pretty writer.
OP Magnus Haraldsen Amundsen
Modified: jena/trunk/jena-core/testing/abbreviated/container.rdf
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/testing/abbreviated/container.rdf?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/testing/abbreviated/container.rdf (original)
+++ jena/trunk/jena-core/testing/abbreviated/container.rdf Mon Nov 19 19:53:42 2012
@@ -1,5 +1,3 @@
-<!-- $Id: container.rdf,v 1.2 2003-04-02 08:58:16 jeremy_carroll Exp $ -->
-
<!-- MUST contain rdf:li -->
<rdf:RDF
Modified: jena/trunk/jena-core/testing/abbreviated/cookup.rdf
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/testing/abbreviated/cookup.rdf?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/testing/abbreviated/cookup.rdf (original)
+++ jena/trunk/jena-core/testing/abbreviated/cookup.rdf Mon Nov 19 19:53:42 2012
@@ -1,4 +1,3 @@
-<!-- $Id: cookup.rdf,v 1.1 2003-11-12 11:18:39 jeremy_carroll Exp $ -->
<rdf:RDF
xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
Modified: jena/trunk/jena-core/testing/abbreviated/entities.rdf
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/testing/abbreviated/entities.rdf?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/testing/abbreviated/entities.rdf (original)
+++ jena/trunk/jena-core/testing/abbreviated/entities.rdf Mon Nov 19 19:53:42 2012
@@ -1,4 +1,3 @@
-<!-- $Id: entities.rdf,v 1.1 2007-04-16 15:28:25 jeremy_carroll Exp $ -->
<!-- A variety of URIs that cause problems when they are entities. -->
<rdf:RDF
Modified: jena/trunk/jena-core/testing/abbreviated/namespaces.rdf
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/testing/abbreviated/namespaces.rdf?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/testing/abbreviated/namespaces.rdf (original)
+++ jena/trunk/jena-core/testing/abbreviated/namespaces.rdf Mon Nov 19 19:53:42 2012
@@ -1,5 +1,3 @@
-<!-- $Id: namespaces.rdf,v 1.2 2006-09-19 15:20:40 chris-dollin Exp $ -->
-
<rdf:RDF
xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
Modified: jena/trunk/jena-core/testing/abbreviated/reification.rdf
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/testing/abbreviated/reification.rdf?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
Binary files - no diff available.
Modified: jena/trunk/jena-core/testing/abbreviated/relative-uris.rdf
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/testing/abbreviated/relative-uris.rdf?rev=1411372&r1=1411371&r2=1411372&view=diff
==============================================================================
--- jena/trunk/jena-core/testing/abbreviated/relative-uris.rdf (original)
+++ jena/trunk/jena-core/testing/abbreviated/relative-uris.rdf Mon Nov 19 19:53:42 2012
@@ -1,6 +1,3 @@
-<!-- $Id: relative-uris.rdf,v 1.2 2003-03-29 21:33:28 jeremy_carroll Exp $ -->
-
-
<rdf:RDF
xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:eg="http://www.example.org/2001/03/#"