[tracker] functional-tests: Remove duplicated tests and update expected failure message

[Ivan Frade <ifrade src gnome org>]

commit cc1c626eaa2d3b3fb00b2a6a443988759f85ac21
Author: Ivan Frade <ivan frade nokia com>
Date:   Tue Nov 9 16:03:04 2010 +0200

    functional-tests: Remove duplicated tests and update expected failure message

 tests/functional-tests/17-ontology-changes.py |   41 +------------------------
 1 files changed, 1 insertions(+), 40 deletions(-)
---
diff --git a/tests/functional-tests/17-ontology-changes.py b/tests/functional-tests/17-ontology-changes.py
index 8ba51c6..2e68f41 100755
--- a/tests/functional-tests/17-ontology-changes.py
+++ b/tests/functional-tests/17-ontology-changes.py
@@ -275,7 +275,7 @@ class PropertyMaxCardinality1toN (OntologyChangeTestTemplate):
     Change cardinality of a property from 1 to N. There shouldn't be any data loss
     """
 
-    @expectedFailureBug ("New journal is gonna work it out")
+    @expectedFailureBug ("NB#202275")
     def test_property_cardinality_1_to_n (self):
         self.template_test_ontology_change ()
 
@@ -607,45 +607,6 @@ class OntologyRemovePropertyTest (OntologyChangeTestTemplate):
 
 class DomainIndexAddTest (OntologyChangeTestTemplate):
     """
-    Add tracker:domainIndex in properties
-    """
-    def test_DomainIndexAddTest (self):
-        self.template_test_ontology_change ()
-
-    def set_ontology_dirs (self):
-        self.FIRST_ONTOLOGY_DIR = "basic"
-        self.SECOND_ONTOLOGY_DIR = "add-domainIndex"
-
-    def insert_data (self):
-        self.instance_a = "test://ontology-changes/properties/add-domain-index/a"
-        self.tracker.update ("""
-            INSERT { <%s> a test:B ;
-                          test:a_string 'test-value' ;
-                          test:a_n_cardinality 'another-test-value'. }""" % (self.instance_a))
-
-        self.instance_b = "test://ontology-changes/properties/add-domain-index/b"
-        self.tracker.update ("""
-            INSERT { <%s> a test:C ;
-                          test:a_string 'test-value' ;
-                          test:a_n_cardinality 'another-test-value'. }""" % (self.instance_b))
-
-    def validate_status (self):
-        # Check the ontology
-        has_domainIndex = self.tracker.ask ("ASK { test:B tracker:domainIndex test:a_string }")
-        self.assertTrue (has_domainIndex)
-
-        has_domainIndex = self.tracker.ask ("ASK { test:C tracker:domainIndex test:a_n_cardinality }")
-        self.assertTrue (has_domainIndex)
-
-        # Check the data
-        dataok = self.tracker.ask ("ASK { <%s> test:a_string 'test-value' }" % (self.instance_a))
-        self.assertTrue (dataok)
-
-        dataok = self.tracker.ask ("ASK { <%s> test:a_n_cardinality 'another-test-value' }" % (self.instance_b))
-        self.assertTrue (dataok)
-
-class DomainIndexAddTest (OntologyChangeTestTemplate):
-    """
     Add tracker:domainIndex to a class and check there is no data loss.
     """
     def test_domain_index_add (self):