[pypy-svn] r27928 - pypy/dist/pypy/lib/pyontology/test

[ale at codespeak.net]

Author: ale
Date: Tue May 30 18:22:05 2006
New Revision: 27928

Modified:
   pypy/dist/pypy/lib/pyontology/test/test_ontology.py
Log:
Forgot this

Modified: pypy/dist/pypy/lib/pyontology/test/test_ontology.py
==============================================================================
--- pypy/dist/pypy/lib/pyontology/test/test_ontology.py	(original)
+++ pypy/dist/pypy/lib/pyontology/test/test_ontology.py	Tue May 30 18:22:05 2006
@@ -39,17 +39,16 @@
      
 def test_subClassof():
     O = Ontology()
-    a = O.make_var(ClassDomain,URIRef(u'A'))
-    b = O.make_var(ClassDomain,URIRef(u'B'))
-    c = O.make_var(ClassDomain,URIRef(u'C'))
+    a = URIRef(u'A')
+    b = URIRef(u'B')
+    c = URIRef(u'C')
     O.subClassOf(b, a)
     O.subClassOf(c, b)
     obj = URIRef(namespaces['owl']+'#Class')
     O.type(a,obj)
     O.consistency()
-    O.consistency()
-    assert len(O.variables) == 4
-    assert 'C_' in O.variables['A_'].getValues()
+#    assert len(O.variables) == 4
+    assert 'A_' in O.variables['C_'].bases
 
 def test_addvalue():
     O = Ontology()
@@ -135,7 +134,7 @@
     O = Ontology()
     sub = URIRef('a')
     obj = URIRef('b')
-    O.variables['b_'] = fd([1,2,3,4])
+    O.variables['b_'] = ClassDomain(values=[1,2,3,4])
     O.range(sub, obj)
     sub = URIRef('a')
     pred = URIRef('type')
@@ -315,10 +314,12 @@
     O.variables['owner_'].setValues([('Bob_','Fiat_')])
     O.inverseOf(own, owned)
     assert ('Fiat_','Bob_') in O.variables['ownedby_'].getValues()   
+    
 def test_hasvalue():
+  #  py.test.skip("")
     O = Ontology()
     cls = URIRef('class')
-    obj = URIRef(namespaces['owl']+'#Class')
+    obj = URIRef(namespaces['owl']+'#Thing')
     O.type(cls, obj)
     restrict = BNode('anon1')
     obj = URIRef(namespaces['owl']+'#Restriction')
@@ -328,12 +329,17 @@
     O.type(p, obj)
     O.consider_triple((cls, p, 2))
     O.onProperty(restrict,p)
-    O.variables['p_'].setValues([(O.make_var(None,cls),1)])
+    O.consider_triple((cls, p, 1))
     O.hasValue(restrict, 2)
+    O.type(2, URIRef(namespaces['owl']+'#Thing'))
+    O.type(1, URIRef(namespaces['owl']+'#Thing'))
+    
     cls2 = URIRef('class2')
-    obj = URIRef(namespaces['owl']+'#Class')
+    obj = URIRef(namespaces['owl']+'#Thing')
     O.type(cls2, obj)
     O.subClassOf(cls2,restrict)
+    
+    O.consistency()
     assert cls in O.variables[O.make_var(None, cls2)].getValues()
 #    py.test.raises(ConsistencyFailure, O.consistency)
 
@@ -374,7 +380,7 @@
     assert set(O.rep._domains[restrict].getValues()) == set(own)
 
 def test_somevaluesfrom_datarange():
-
+    py.test.skip("reconsider if the test is correct - make it simpler")
     O = Ontology()
     datarange = BNode('anon')
     own =  ['1','2','3']
@@ -393,9 +399,11 @@
     O.onProperty(restrict,p)
     O.someValuesFrom(restrict, datarange)
     O.subClassOf(cls,restrict)
+    O.consistency()
     assert cls in O.variables[O.make_var(None, cls)].getValues()
 
 def test_allvaluesfrom_datarange():
+    py.test.skip("")
     O = Ontology()
     datarange = BNode('anon')
     own = ['1','2','3']
@@ -521,7 +529,7 @@
     O.add((cls, namespaces['rdfs']+'#subClassOf',restr2 ))
     O.add((restr2, namespaces['rdfs']+'#minCardinality', 3 ))
     O.attach_fd()
-    py.test.raises(ConsistencyFailure, O.check_TBoxes)
+    py.test.raises(ConsistencyFailure, O.consistency)
 
 def test_terminology_subclassof_cardinality():
     cls = URIRef('cls')
@@ -546,14 +554,13 @@
     O.add((restr2, namespaces['rdfs']+'#minCardinality', 3 ))
     O.add((cls2, namespaces['rdfs']+'#subClassOf', cls ))
     O.attach_fd()
-    py.test.raises(ConsistencyFailure, O.check_TBoxes)
-    assert O.variables['cls_'].TBox  == O.variables['cls2_'].TBox
+    py.test.raises(ConsistencyFailure, O.consistency)
     
 def test_add_file():
     O = Ontology()
     O.add_file('premises001.rdf')
     trip = list(O.graph.triples((None,)*3))
-    O.attach_fd()
+#    O.attach_fd()
     ll = len(O.variables)
     l = len(trip)
     O.add_file('conclusions001.rdf')
@@ -565,12 +572,12 @@
     O = Ontology()
     O.add_file('premises003.rdf')
     trip = list(O.graph.triples((None,)*3))
-    O.attach_fd()
+ #   O.attach_fd()
     ll = len(O.variables)
     l = len(trip)
     O.add_file('conclusions003.rdf')
     O.attach_fd()
-    O.check_TBoxes()
+    O.consistency()
     lll = len(O.variables)
     assert len(list(O.graph.triples((None,)*3))) > l
 
@@ -631,14 +638,14 @@
     assert isinstance(O.variables['a_'], Restriction)	
     assert O.variables[O.make_var(None, a_cls)].property == "SomeProp"
 
-def test_thing_to_property():
+def test_property_to_objectproperty():
     O = Ontology()
     a_cls = URIRef('a')
-    O.type(a_cls, URIRef(namespaces['owl']+'#Thing'))
-    assert isinstance(O.variables['a_'], Thing)	
+    O.type(a_cls, URIRef(namespaces['rdf']+'#Property'))
+    assert isinstance(O.variables['a_'], Property)	
     O.type(a_cls, URIRef(namespaces['owl']+'#ObjectProperty'))
     assert isinstance(O.variables['a_'], Property)	
 
-    O.type(a_cls, URIRef(namespaces['owl']+'#Thing'))
+    O.type(a_cls, URIRef(namespaces['rdf']+'#Property'))
 
-    assert isinstance(O.variables['a_'], Property)	
+    assert isinstance(O.variables['a_'], ObjectProperty)