Merge pull request #71 from phillord/fix/clean-test-files

Ensure test file generation is consistent

src/io/owx/reader.rs

@@ -1258,17 +1258,6 @@ pub mod test {
         );
     }
 
-    #[test]
-    fn test_simple_ontology_rendered_by_horned() {
-        let ont_s = include_str!("../../ont/owl-xml/one-ont-from-horned.owx");
-        let (ont, _) = read_ok(&mut ont_s.as_bytes());
-
-        assert_eq!(
-            ont.i().the_ontology_id_or_default().iri.as_ref().unwrap().as_ref(),
-            "http://example.com/iri"
-        );
-    }
-
     #[test]
     fn test_class() {
         let ont_s = include_str!("../../ont/owl-xml/class.owx");
@@ -1323,7 +1312,7 @@ pub mod test {
 
     #[test]
     fn test_one_class_fqn() {
-        let ont_s = include_str!("../../ont/owl-xml/one-class-fully-qualified.owx");
+        let ont_s = include_str!("../../ont/owl-xml/manual/one-class-fully-qualified.owx");
         let (ont, _) = read_ok(&mut ont_s.as_bytes());
 
         assert_eq!(ont.i().declare_class().count(), 1);
@@ -1690,7 +1679,7 @@ pub mod test {
         let ss = ont.i().sub_class_of().next().unwrap();
         match ss.sup {
             ClassExpression::ObjectHasSelf(ObjectPropertyExpression::ObjectProperty(ref op)) => {
-                assert_eq!(String::from(op), "http://example.com/iri#o")
+                assert_eq!(String::from(op), "http://www.example.com/iri#op")
             }
             _ => {
                 panic!("Expecting ObjectProperty");
@@ -1717,7 +1706,7 @@ pub mod test {
                 } => String::from(op),
                 _ => "It didn't match".to_string(),
             },
-            "http://www.example.com#r"
+            "http://www.example.com/iri#r"
         );
     }
 
@@ -1835,7 +1824,7 @@ pub mod test {
 
         match dd {
             DatatypeDefinition { kind, range } => {
-                assert_eq!(String::from(kind), "http://www.example.com/D");
+                assert_eq!(String::from(kind), "http://www.example.com/iri#D");
 
                 match range {
                     DataRange::Datatype(real) => {
@@ -2081,7 +2070,7 @@ pub mod test {
 
     #[test]
     fn family() {
-        let ont_s = include_str!("../../ont/owl-xml/family.owx");
+        let ont_s = include_str!("../../ont/owl-xml/manual/family.owx");
         let (_, _) = read_ok(&mut ont_s.as_bytes());
     }
 }

src/io/owx/writer.rs

@@ -1120,7 +1120,7 @@ mod test {
 
     #[test]
     fn round_one_comment() {
-        assert_round(include_str!("../../ont/owl-xml/one-comment.owx"));
+        assert_round(include_str!("../../ont/owl-xml/comment.owx"));
     }
 
     #[test]
@@ -1483,6 +1483,6 @@ mod test {
 
     #[test]
     fn family() {
-        assert_round(include_str!("../../ont/owl-xml/family.owx"));
+        assert_round(include_str!("../../ont/owl-xml/manual/family.owx"));
     }
 }

src/io/rdf/reader.rs

@@ -764,13 +764,13 @@ impl<'a, A: ForIRI, AA: ForIndex<A>> OntologyParser<'a, A, AA> {
                     }
                 }
                 [[_, Term::OWL(VOWL::UnionOf), Term::BNode(bnodeid)],//: rustfmt hard line!
-                [_, Term::RDF(VRDF::Type), Term::RDFS(VRDFS::Datatype)]] =>
+                 [_, Term::RDF(VRDF::Type), Term::RDFS(VRDFS::Datatype)]] =>
                 {
-                   ok_some! {
-                       DataRange::DataUnionOf(
-                           self.fetch_dr_seq(bnodeid)?
-                       )
-                   }
+                    ok_some! {
+                        DataRange::DataUnionOf(
+                            self.fetch_dr_seq(bnodeid)?
+                        )
+                    }
                 }
                 [[_, Term::OWL(VOWL::DatatypeComplementOf), term],//:
                  [_, Term::RDF(VRDF::Type), Term::RDFS(VRDFS::Datatype)]] =>
@@ -2071,8 +2071,8 @@ mod test {
     }
 
     #[test]
-    fn one_subclass() {
-        compare("one-subclass");
+    fn subclass() {
+        compare("subclass");
     }
 
     #[test]
@@ -2189,7 +2189,7 @@ mod test {
         // comment a language and a datatype ("PlainLiteral") while
         // the RDF one gives it just the language, as literals can't
         // be both. Which is correct?
-        compare("one-comment");
+        compare("comment");
     }
 
     #[test]
@@ -2201,7 +2201,7 @@ mod test {
     fn broken_ontology_annotation () {
         // Some verisons of the OWL API do not include an
         // AnnotationProperty declaration. We should make this work.
-        let ont:SetOntology<_> = read_ok(&mut slurp_rdfont("broken-ontology-annotation").as_bytes()).into();
+        let ont:SetOntology<_> = read_ok(&mut slurp_rdfont("manual/broken-ontology-annotation").as_bytes()).into();
         let ont:ComponentMappedOntology<_, RcAnnotatedComponent> = ont.into();
         assert_eq!(ont.i().ontology_annotation().count(), 1);
         assert_eq!(ont.i().declare_annotation_property().count(), 0);
@@ -2570,7 +2570,7 @@ mod test {
 
     #[test]
     fn family_other() {
-        compare("family-other")
+        compare("manual/family-other")
     }
 
     #[test]

src/io/rdf/writer.rs

@@ -1689,8 +1689,8 @@ mod test {
     }
 
     #[test]
-    fn round_one_comment() {
-        assert_round(include_str!("../../ont/owl-rdf/one-comment.owl"));
+    fn round_comment() {
+        assert_round(include_str!("../../ont/owl-rdf/comment.owl"));
     }
 
     #[test]

src/ont/Makefile

@@ -0,0 +1,14 @@
+all:
+	$(MAKE) -C bubo
+
+all-and-test:
+	$(MAKE) -C bubo
+	cargo test
+
+clean: $(MAKE) -C bubo clean
+
+force-clean:
+	-rm owl-xml/*owx
+	-rm owl-rdf/*owl
+	-rm owl-ttl/*ttl
+	-rm owl-functional/*ofn

src/ont/README

@@ -0,0 +1,19 @@
+These are a series of test files in various OWL syntaxes.
+
+The files in all the owl-* directories are auto-generated from the
+bubo directory using the Tawny Bubo
+(https://github.com/phillord/tawny-bubo) with associated .clj files
+defining the ontology.
+
+To regenerate all files use "make" in either this directory or the
+bubo directory.
+
+Autogenerated files are added to the git repository for simplicity.
+
+
+There are a number of additional files in the directory `manual` which have been
+generated in other ways. Most of these are by hand, when a test needs
+to be broken or where the OWL API will not generate the file.
+
+Finally, `family` and `family-other` are generated by
+https://github.com/phillord/owl-primer.

src/ont/bubo/Makefile

@@ -28,4 +28,3 @@ clean:
 	-rm $(TARGETS)
 
 .PHONY: all clean
-

src/ont/bubo/annotation-domain.clj

@@ -0,0 +1,11 @@
+(clojure.core/load-file "ontology.clj")
+
+(defaproperty a)
+
+(add-axiom
+ o
+ (.getOWLAnnotationPropertyDomainAxiom
+  (owl-data-factory)
+  a (iri "http://www.example.com/d")))
+
+(save-all)

src/ont/bubo/annotation-on-transitive.clj

@@ -0,0 +1,7 @@
+(cc/load-file "ontology.clj")
+
+(defoproperty t
+  :characteristic [(annotate :transitive (label "Annotation on transitive"))])
+
+
+(save-all)

src/ont/bubo/annotation-range.clj

@@ -0,0 +1,11 @@
+(clojure.core/load-file "ontology.clj")
+
+(defaproperty a)
+
+(add-axiom
+ o
+ (.getOWLAnnotationPropertyRangeAxiom
+  (owl-data-factory)
+  a (iri "http://www.example.com/d")))
+
+(save-all)

src/ont/bubo/class-assertion.clj

@@ -0,0 +1,8 @@
+(cc/load-file "ontology.clj")
+
+
+(defclass A)
+(defindividual I :type A)
+
+
+(save-all)

src/ont/bubo/comment.clj

@@ -0,0 +1,7 @@
+(cc/load-file "ontology.clj")
+
+(defclass A
+  :comment "A comment")
+
+
+(save-all)

src/ont/bubo/data-exact-cardinality.clj

@@ -0,0 +1,12 @@
+(cc/load-file "ontology.clj")
+
+(defdproperty d)
+(defclass C
+  :super
+  (.getOWLDataExactCardinality
+   (owl-data-factory)
+   1
+   (#'tawny.owl/ensure-data-property d)
+   (#'tawny.owl/ensure-data-range (iri "http://www.w3.org/2001/XMLSchema#integer"))))
+
+(save-all)

src/ont/bubo/data-has-key.clj

@@ -0,0 +1,9 @@
+(clojure.core/load-file "ontology.clj")
+
+(defdproperty dp)
+
+
+(defclass C
+  :haskey dp)
+
+(save-all)

src/ont/bubo/data-has-value.clj

@@ -0,0 +1,7 @@
+(cc/load-file "ontology.clj")
+
+(defdproperty d)
+(defclass C
+  :super (has-value d "A Literal"))
+
+(save-all)

src/ont/bubo/data-max-cardinality.clj

@@ -0,0 +1,12 @@
+(cc/load-file "ontology.clj")
+
+(defdproperty d)
+(defclass C
+  :super
+  (.getOWLDataMaxCardinality
+   (owl-data-factory)
+   1
+   (#'tawny.owl/ensure-data-property d)
+   (#'tawny.owl/ensure-data-range (iri "http://www.w3.org/2001/XMLSchema#integer"))))
+
+(save-all)

src/ont/bubo/data-min-cardinality.clj

@@ -0,0 +1,12 @@
+(cc/load-file "ontology.clj")
+
+(defdproperty d)
+(defclass C
+  :super
+  (.getOWLDataMinCardinality
+   (owl-data-factory)
+   1
+   (#'tawny.owl/ensure-data-property d)
+   (#'tawny.owl/ensure-data-range (iri "http://www.w3.org/2001/XMLSchema#integer"))))
+
+(save-all)

src/ont/bubo/data-only.clj

@@ -0,0 +1,7 @@
+(cc/load-file "ontology.clj")
+
+(defdproperty d)
+(defclass C
+  :super (only d (iri "http://www.w3.org/2001/XMLSchema#integer")))
+
+(save-all)

src/ont/bubo/data-property-assertion.clj

@@ -0,0 +1,8 @@
+(cc/load-file "ontology.clj")
+
+(defdproperty dp)
+
+(defindividual I
+  :fact (fact dp "A literal"))
+
+(save-all)

src/ont/bubo/data-property-disjoint.clj

@@ -0,0 +1,6 @@
+(cc/load-file "ontology.clj")
+
+(defdproperty dp)
+(defdproperty dp1 :disjoint dp)
+
+(save-all)

src/ont/bubo/data-property-domain.clj

@@ -0,0 +1,7 @@
+(cc/load-file "ontology.clj")
+
+(defclass C)
+(defdproperty dp
+  :domain C)
+
+(save-all)

src/ont/bubo/data-property-equivalent.clj

@@ -0,0 +1,6 @@
+(cc/load-file "ontology.clj")
+
+(defdproperty dp)
+(defdproperty dp1 :equivalent dp)
+
+(save-all)

src/ont/bubo/data-property-functional.clj

@@ -0,0 +1,6 @@
+(cc/load-file "ontology.clj")
+
+(defdproperty dp
+  :characteristic :functional)
+
+(save-all)

src/ont/bubo/data-property-range.clj

@@ -0,0 +1,6 @@
+(cc/load-file "ontology.clj")
+
+(defdproperty dp
+  :range (iri "http://www.w3.org/2001/XMLSchema#real"))
+
+(save-all)

src/ont/bubo/data-property-sub.clj

@@ -0,0 +1,6 @@
+(cc/load-file "ontology.clj")
+
+(defdproperty dp)
+(defdproperty dp1 :super dp)
+
+(save-all)

src/ont/bubo/data-property.clj

@@ -0,0 +1,5 @@
+(cc/load-file "ontology.clj")
+
+(defdproperty c)
+
+(save-all)

src/ont/bubo/data-some.clj

@@ -0,0 +1,7 @@
+(cc/load-file "ontology.clj")
+
+(defdproperty d)
+(defclass C
+  :super (some d (iri "http://www.w3.org/2001/XMLSchema#integer")))
+
+(save-all)

src/ont/bubo/data-unqualified-exact.clj

@@ -0,0 +1,7 @@
+(cc/load-file "ontology.clj")
+
+(defdproperty d)
+(defclass C
+  :super (data-exactly 1 d))
+
+(save-all)

src/ont/bubo/datatype-alias.clj

@@ -0,0 +1,6 @@
+(cc/load-file "ontology.clj")
+
+(defdatatype D
+  :equivalent (iri "http://www.w3.org/2002/07/owl#real"))
+
+(save-all)

src/ont/bubo/datatype-complement.clj

@@ -0,0 +1,7 @@
+(cc/load-file "ontology.clj")
+
+(defdatatype D
+  :equivalent (data-not
+               (iri "http://www.w3.org/2002/07/owl#rational")))
+
+(save-all)