[tracker] functional-tests: rebase test ontologies to latest basic

[Ivan Frade <ifrade src gnome org>]

commit cb175483bd9790b93df4a5053d7b6726062d26e7
Author: Ivan Frade <ivan frade nokia com>
Date:   Wed Oct 20 12:15:14 2010 +0300

    functional-tests: rebase test ontologies to latest basic
    
    To make sure we are testing ONLY the changes we want

 .../test-ontologies/add-class/91-test.ontology     |   31 ++++++++---
 .../test-ontologies/basic-future/91-test.ontology  |   19 ++++++-
 .../test-ontologies/cardinality/91-test.ontology   |   40 +++++++++++---
 .../test-ontologies/indexed/91-test.ontology       |   58 +++++++++++++++-----
 .../test-ontologies/notify/91-test.ontology        |   21 +++++++-
 .../property-range-int-to-string/91-test.ontology  |   46 +++++++++++-----
 .../property-range-string-to-date/91-test.ontology |   39 ++++++++++---
 7 files changed, 196 insertions(+), 58 deletions(-)
---
diff --git a/tests/functional-tests/test-ontologies/add-class/91-test.ontology b/tests/functional-tests/test-ontologies/add-class/91-test.ontology
index f57bc94..d07ed80 100644
--- a/tests/functional-tests/test-ontologies/add-class/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/add-class/91-test.ontology
@@ -21,13 +21,6 @@ test: a tracker:Namespace, tracker:Ontology ;
 
 test:A a rdfs:Class .
 
-# ***** TEST CHANGE *****
-test:D a rdfs:Class .
-
-test:E a rdfs:Class ;
-    rdfs:subClassOf test:A .
-# ***********************
-
 test:a_string a rdf:Property ;
     rdfs:comment "Property to test the conversions from string" ;
     rdfs:domain test:A ;
@@ -55,8 +48,14 @@ test:a_n_cardinality a rdf:Property ;
 test:a_superprop a rdf:Property ;
     rdfs:comment "To use as superproperty and test the superproperty changes in the subprop." ;
     rdfs:domain test:A ;
-    rdfs:range xsd:string .
- 
+    rdfs:range xsd:string ;
+    nrl:maxCardinality 1 .
+
+test:a_superprop_n a rdf:Property ;
+    rdfs:comment "To use as superproperty and test the superproperty changes in the subprop. cardinality N" ;
+    rdfs:domain test:A ;
+    rdfs:range xsd:string ;
+    nrl:maxCardinality 1 .
 
 test:B a rdfs:Class ;
     rdfs:subClassOf test:A .
@@ -68,4 +67,18 @@ test:c_subprop a rdf:Property ;
      rdfs:comment "To test changes in the superproperty" ;
      rdfs:subPropertyOf test:a_superprop ;
      rdfs:domain test:C ;
+     rdfs:range xsd:string ;
+     nrl:maxCardinality 1 .
+
+test:c_subprop_n a rdf:Property ;
+     rdfs:comment "To test changes in the superproperty" ;
+     rdfs:subPropertyOf test:a_superprop_n ;
+     rdfs:domain test:C ;
      rdfs:range xsd:string .
+
+# ***** TEST CHANGE *****
+test:D a rdfs:Class .
+
+test:E a rdfs:Class ;
+    rdfs:subClassOf test:A .
+# ***********************
diff --git a/tests/functional-tests/test-ontologies/basic-future/91-test.ontology b/tests/functional-tests/test-ontologies/basic-future/91-test.ontology
index 38d9b83..6d45f55 100644
--- a/tests/functional-tests/test-ontologies/basic-future/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/basic-future/91-test.ontology
@@ -16,7 +16,7 @@
 #     B   C
 #
 test: a tracker:Namespace, tracker:Ontology ;
-        nao:lastModified "2012-12-12T11:00:04Z" ;
+        nao:lastModified "2011-03-24T11:00:04Z" ;
         tracker:prefix "test" .
 
 test:A a rdfs:Class .
@@ -48,8 +48,14 @@ test:a_n_cardinality a rdf:Property ;
 test:a_superprop a rdf:Property ;
     rdfs:comment "To use as superproperty and test the superproperty changes in the subprop." ;
     rdfs:domain test:A ;
-    rdfs:range xsd:string .
- 
+    rdfs:range xsd:string ;
+    nrl:maxCardinality 1 .
+
+test:a_superprop_n a rdf:Property ;
+    rdfs:comment "To use as superproperty and test the superproperty changes in the subprop. cardinality N" ;
+    rdfs:domain test:A ;
+    rdfs:range xsd:string ;
+    nrl:maxCardinality 1 .
 
 test:B a rdfs:Class ;
     rdfs:subClassOf test:A .
@@ -61,4 +67,11 @@ test:c_subprop a rdf:Property ;
      rdfs:comment "To test changes in the superproperty" ;
      rdfs:subPropertyOf test:a_superprop ;
      rdfs:domain test:C ;
+     rdfs:range xsd:string ;
+     nrl:maxCardinality 1 .
+
+test:c_subprop_n a rdf:Property ;
+     rdfs:comment "To test changes in the superproperty" ;
+     rdfs:subPropertyOf test:a_superprop_n ;
+     rdfs:domain test:C ;
      rdfs:range xsd:string .
diff --git a/tests/functional-tests/test-ontologies/cardinality/91-test.ontology b/tests/functional-tests/test-ontologies/cardinality/91-test.ontology
index 48f72b7..67d8c22 100644
--- a/tests/functional-tests/test-ontologies/cardinality/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/cardinality/91-test.ontology
@@ -40,20 +40,24 @@ test:a_int a rdf:Property ;
     nrl:maxCardinality 1 .
 
 # ******** TEST CHANGE ****
-
-test:a_n_cardinality a rdf:Property ;
-    rdfs:comment "This property has cardinality N in master";
-    nrl:maxCardinality 1 ;
-    rdfs:domain test:A ;
-    rdfs:range xsd:string .
-
+#test:a_n_cardinality a rdf:Property ;
+#    rdfs:comment "Property to test the cardinality changes" ;
+#    rdfs:domain test:A ;
+#    rdfs:range xsd:string .
+# Max cardinality N because is not specified
 # **************************
 
 test:a_superprop a rdf:Property ;
     rdfs:comment "To use as superproperty and test the superproperty changes in the subprop." ;
     rdfs:domain test:A ;
-    rdfs:range xsd:string .
- 
+    rdfs:range xsd:string ;
+    nrl:maxCardinality 1 .
+
+test:a_superprop_n a rdf:Property ;
+    rdfs:comment "To use as superproperty and test the superproperty changes in the subprop. cardinality N" ;
+    rdfs:domain test:A ;
+    rdfs:range xsd:string ;
+    nrl:maxCardinality 1 .
 
 test:B a rdfs:Class ;
     rdfs:subClassOf test:A .
@@ -65,4 +69,22 @@ test:c_subprop a rdf:Property ;
      rdfs:comment "To test changes in the superproperty" ;
      rdfs:subPropertyOf test:a_superprop ;
      rdfs:domain test:C ;
+     rdfs:range xsd:string ;
+     nrl:maxCardinality 1 .
+
+test:c_subprop_n a rdf:Property ;
+     rdfs:comment "To test changes in the superproperty" ;
+     rdfs:subPropertyOf test:a_superprop_n ;
+     rdfs:domain test:C ;
      rdfs:range xsd:string .
+
+# ******** TEST CHANGE ****
+
+test:a_n_cardinality a rdf:Property ;
+    rdfs:comment "This property has cardinality N in master";
+    nrl:maxCardinality 1 ;
+    rdfs:domain test:A ;
+    rdfs:range xsd:string .
+
+# **************************
+
diff --git a/tests/functional-tests/test-ontologies/indexed/91-test.ontology b/tests/functional-tests/test-ontologies/indexed/91-test.ontology
index 1dcf8c6..77c9fc5 100644
--- a/tests/functional-tests/test-ontologies/indexed/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/indexed/91-test.ontology
@@ -21,12 +21,13 @@ test: a tracker:Namespace, tracker:Ontology ;
 
 test:A a rdfs:Class .
 
-test:a_string a rdf:Property ;
-    rdfs:comment "Property to test the conversions from string" ;
-    rdfs:domain test:A ;
-    rdfs:range  xsd:string ;
-    tracker:indexed true ;
-    nrl:maxCardinality 1 .
+# ****** TEST CHANGE ***********
+#test:a_string a rdf:Property ;
+#    rdfs:comment "Property to test the conversions from string" ;
+#    rdfs:domain test:A ;
+#    rdfs:range  xsd:string ;
+#    nrl:maxCardinality 1 .
+# *******************************
 
 test:a_datetime a rdf:Property ;
     rdfs:comment "Property to test the changes string/date" ;
@@ -40,18 +41,25 @@ test:a_int a rdf:Property ;
     rdfs:range  xsd:integer ;
     nrl:maxCardinality 1 .
 
-test:a_n_cardinality a rdf:Property ;
-    rdfs:comment "Property to test the cardinality changes" ;
-    rdfs:domain test:A ;
-    tracker:indexed true ;
-    rdfs:range xsd:string .
+# ******* TEST CHANGE ***********
+#test:a_n_cardinality a rdf:Property ;
+#    rdfs:comment "Property to test the cardinality changes" ;
+#    rdfs:domain test:A ;
+#    rdfs:range xsd:string .
 # Max cardinality N because is not specified
+# *******************************
 
 test:a_superprop a rdf:Property ;
     rdfs:comment "To use as superproperty and test the superproperty changes in the subprop." ;
     rdfs:domain test:A ;
-    rdfs:range xsd:string .
- 
+    rdfs:range xsd:string ;
+    nrl:maxCardinality 1 .
+
+test:a_superprop_n a rdf:Property ;
+    rdfs:comment "To use as superproperty and test the superproperty changes in the subprop. cardinality N" ;
+    rdfs:domain test:A ;
+    rdfs:range xsd:string ;
+    nrl:maxCardinality 1 .
 
 test:B a rdfs:Class ;
     rdfs:subClassOf test:A .
@@ -63,4 +71,28 @@ test:c_subprop a rdf:Property ;
      rdfs:comment "To test changes in the superproperty" ;
      rdfs:subPropertyOf test:a_superprop ;
      rdfs:domain test:C ;
+     rdfs:range xsd:string ;
+     nrl:maxCardinality 1 .
+
+test:c_subprop_n a rdf:Property ;
+     rdfs:comment "To test changes in the superproperty" ;
+     rdfs:subPropertyOf test:a_superprop_n ;
+     rdfs:domain test:C ;
      rdfs:range xsd:string .
+
+# ******* TEST CHANGE ***********
+test:a_n_cardinality a rdf:Property ;
+    rdfs:comment "Property to test the cardinality changes. indexed is false in basic" ;
+    rdfs:domain test:A ;
+    tracker:indexed true ;
+    rdfs:range xsd:string .
+# Max cardinality N because is not specified
+
+test:a_string a rdf:Property ;
+    rdfs:comment "Property to test the conversions from string" ;
+    rdfs:domain test:A ;
+    rdfs:range  xsd:string ;
+    tracker:indexed true ;
+    nrl:maxCardinality 1 .
+
+# *******************************
diff --git a/tests/functional-tests/test-ontologies/notify/91-test.ontology b/tests/functional-tests/test-ontologies/notify/91-test.ontology
index 28fa153..e8ac793 100644
--- a/tests/functional-tests/test-ontologies/notify/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/notify/91-test.ontology
@@ -19,8 +19,12 @@ test: a tracker:Namespace, tracker:Ontology ;
         nao:lastModified "2010-03-24T11:00:04Z" ;
         tracker:prefix "test" .
 
+# ***** TEST CHANGE ******
+# test:A a rdfs:Class .
+
 test:A a rdfs:Class ;
        tracker:notify true .
+# ***************************
 
 test:a_string a rdf:Property ;
     rdfs:comment "Property to test the conversions from string" ;
@@ -49,8 +53,14 @@ test:a_n_cardinality a rdf:Property ;
 test:a_superprop a rdf:Property ;
     rdfs:comment "To use as superproperty and test the superproperty changes in the subprop." ;
     rdfs:domain test:A ;
-    rdfs:range xsd:string .
- 
+    rdfs:range xsd:string ;
+    nrl:maxCardinality 1 .
+
+test:a_superprop_n a rdf:Property ;
+    rdfs:comment "To use as superproperty and test the superproperty changes in the subprop. cardinality N" ;
+    rdfs:domain test:A ;
+    rdfs:range xsd:string ;
+    nrl:maxCardinality 1 .
 
 test:B a rdfs:Class ;
     rdfs:subClassOf test:A .
@@ -62,4 +72,11 @@ test:c_subprop a rdf:Property ;
      rdfs:comment "To test changes in the superproperty" ;
      rdfs:subPropertyOf test:a_superprop ;
      rdfs:domain test:C ;
+     rdfs:range xsd:string ;
+     nrl:maxCardinality 1 .
+
+test:c_subprop_n a rdf:Property ;
+     rdfs:comment "To test changes in the superproperty" ;
+     rdfs:subPropertyOf test:a_superprop_n ;
+     rdfs:domain test:C ;
      rdfs:range xsd:string .
diff --git a/tests/functional-tests/test-ontologies/property-range-int-to-string/91-test.ontology b/tests/functional-tests/test-ontologies/property-range-int-to-string/91-test.ontology
index 51caed8..c44145c 100644
--- a/tests/functional-tests/test-ontologies/property-range-int-to-string/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/property-range-int-to-string/91-test.ontology
@@ -33,17 +33,13 @@ test:a_datetime a rdf:Property ;
     rdfs:range  xsd:dateTime ;
     nrl:maxCardinality 1 .
 
-
-# ***** TEST CHANGE *********
-
-test:a_int a rdf:Property ;
-    rdfs:comment "This property is integer in basic here is string" ;
-    rdfs:domain test:A ;
-    rdfs:range  xsd:string ;
-    nrl:maxCardinality 1 .
-
-# ****************************
-
+# ******* TEST CHANGE *********
+#test:a_int a rdf:Property ;
+#    rdfs:comment "Property to test the changes string/int" ;
+#    rdfs:domain test:A ;
+#    rdfs:range  xsd:integer ;
+#    nrl:maxCardinality 1 .
+# *****************************
 
 test:a_n_cardinality a rdf:Property ;
     rdfs:comment "Property to test the cardinality changes" ;
@@ -54,8 +50,14 @@ test:a_n_cardinality a rdf:Property ;
 test:a_superprop a rdf:Property ;
     rdfs:comment "To use as superproperty and test the superproperty changes in the subprop." ;
     rdfs:domain test:A ;
-    rdfs:range xsd:string .
- 
+    rdfs:range xsd:string ;
+    nrl:maxCardinality 1 .
+
+test:a_superprop_n a rdf:Property ;
+    rdfs:comment "To use as superproperty and test the superproperty changes in the subprop. cardinality N" ;
+    rdfs:domain test:A ;
+    rdfs:range xsd:string ;
+    nrl:maxCardinality 1 .
 
 test:B a rdfs:Class ;
     rdfs:subClassOf test:A .
@@ -67,4 +69,22 @@ test:c_subprop a rdf:Property ;
      rdfs:comment "To test changes in the superproperty" ;
      rdfs:subPropertyOf test:a_superprop ;
      rdfs:domain test:C ;
+     rdfs:range xsd:string ;
+     nrl:maxCardinality 1 .
+
+test:c_subprop_n a rdf:Property ;
+     rdfs:comment "To test changes in the superproperty" ;
+     rdfs:subPropertyOf test:a_superprop_n ;
+     rdfs:domain test:C ;
      rdfs:range xsd:string .
+
+
+# ***** TEST CHANGE *********
+
+test:a_int a rdf:Property ;
+    rdfs:comment "This property is integer in basic here is string" ;
+    rdfs:domain test:A ;
+    rdfs:range  xsd:string ;
+    nrl:maxCardinality 1 .
+
+# ****************************
diff --git a/tests/functional-tests/test-ontologies/property-range-string-to-date/91-test.ontology b/tests/functional-tests/test-ontologies/property-range-string-to-date/91-test.ontology
index ca3bad8..cb83360 100644
--- a/tests/functional-tests/test-ontologies/property-range-string-to-date/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/property-range-string-to-date/91-test.ontology
@@ -21,13 +21,13 @@ test: a tracker:Namespace, tracker:Ontology ;
 
 test:A a rdfs:Class .
 
-# ****** TEST CHANGE *****
-test:a_string a rdf:Property ;
-    rdfs:comment "This is string in the original ontology, now date" ;
-    rdfs:domain test:A ;
-    rdfs:range  xsd:dateTime ;
-    nrl:maxCardinality 1 .
-# *************************
+# ***** TEST CHANGE *****
+#test:a_string a rdf:Property ;
+#    rdfs:comment "Property to test the conversions from string" ;
+#    rdfs:domain test:A ;
+#    rdfs:range  xsd:string ;
+#    nrl:maxCardinality 1 .
+# ************************
 
 test:a_datetime a rdf:Property ;
     rdfs:comment "Property to test the changes string/date" ;
@@ -50,8 +50,14 @@ test:a_n_cardinality a rdf:Property ;
 test:a_superprop a rdf:Property ;
     rdfs:comment "To use as superproperty and test the superproperty changes in the subprop." ;
     rdfs:domain test:A ;
-    rdfs:range xsd:string .
- 
+    rdfs:range xsd:string ;
+    nrl:maxCardinality 1 .
+
+test:a_superprop_n a rdf:Property ;
+    rdfs:comment "To use as superproperty and test the superproperty changes in the subprop. cardinality N" ;
+    rdfs:domain test:A ;
+    rdfs:range xsd:string ;
+    nrl:maxCardinality 1 .
 
 test:B a rdfs:Class ;
     rdfs:subClassOf test:A .
@@ -63,4 +69,19 @@ test:c_subprop a rdf:Property ;
      rdfs:comment "To test changes in the superproperty" ;
      rdfs:subPropertyOf test:a_superprop ;
      rdfs:domain test:C ;
+     rdfs:range xsd:string ;
+     nrl:maxCardinality 1 .
+
+test:c_subprop_n a rdf:Property ;
+     rdfs:comment "To test changes in the superproperty" ;
+     rdfs:subPropertyOf test:a_superprop_n ;
+     rdfs:domain test:C ;
      rdfs:range xsd:string .
+
+# ****** TEST CHANGE *****
+test:a_string a rdf:Property ;
+    rdfs:comment "This is string in the original ontology, now date" ;
+    rdfs:domain test:A ;
+    rdfs:range  xsd:dateTime ;
+    nrl:maxCardinality 1 .
+# *************************