[Gzz-commits] fenfire/org/fenfire/view/buoy PPLinker.test

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/15 12:09:10

Modified files:
        org/fenfire/view/buoy: PPLinker.test 

Log message:
        The test runs - doesn't pass...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPLinker.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/buoy/PPLinker.test
diff -u fenfire/org/fenfire/view/buoy/PPLinker.test:1.4 
fenfire/org/fenfire/view/buoy/PPLinker.test:1.5
--- fenfire/org/fenfire/view/buoy/PPLinker.test:1.4     Mon Mar 31 07:37:47 2003
+++ fenfire/org/fenfire/view/buoy/PPLinker.test Tue Apr 15 12:09:10 2003
@@ -1,8 +1,9 @@
 #(c): Matti Katila
 
+from org import fenfire
+
 from org.fenfire.modules.pp import *
 from org.fenfire.vocab import PP
-from org.fenfire.impl import ModularSpace, SimpleVStreamTexter
 import org.fenfire.view.buoy
 from org.fenfire.util import URN5Namespace, Pair
 from org.nongnu.libvob.buoy import BuoyViewNodeType,\
@@ -14,26 +15,25 @@
 
 
 def setUp():
-    global model, space
-    model = jena.mem.ModelMem()
-    space = ModularSpace(SimpleVStreamTexter(
-        impl.FakeSpanMaker(),
-        impl.Enfilade1DImpl.Enfilade1DImplMaker()),
-                         model)
+    global fen
+    fen = fenfire.Fen()
+    fen.graph = fenfire.swamp.impl.HashGraph()
+    fen.txt = fenfire.impl.SimpleNodeContent(fen)
 
     global uriA, uriB
     global nodeA, nodeB
     urn = URN5Namespace()
     uriA = urn.generateId()
     uriB = urn.generateId()
-    nodeA = model.createResource(uriA)
-    nodeB = model.createResource(uriB)
+
+    nodeA = fenfire.swamp.Nodes.get(uriA)
+    nodeB = fenfire.swamp.Nodes.get(uriB)
 
     # assoc
-    nodeA.addProperty(PP.association, nodeB)
+    fen.graph.add(nodeA, PP.association, nodeB)
 
     global ppLinker
-    ppLinker = PPLinker(space)
+    ppLinker = PPLinker(fen)
 
 class NodeType(BuoyViewNodeType):
     def getSizde(self, linkId, anchor, wh):