[Gzz-commits] fenfire/org/fenfire/loom SimpleView.test WheelV...

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/03/04 07:02:51

Modified files:
        org/fenfire/loom: SimpleView.test WheelView.test 

Log message:
        Use setUp() method in tests

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/SimpleView.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/WheelView.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/loom/SimpleView.test
diff -u fenfire/org/fenfire/loom/SimpleView.test:1.3 
fenfire/org/fenfire/loom/SimpleView.test:1.4
--- fenfire/org/fenfire/loom/SimpleView.test:1.3        Tue Mar  4 06:17:19 2003
+++ fenfire/org/fenfire/loom/SimpleView.test    Tue Mar  4 07:02:50 2003
@@ -24,17 +24,24 @@
 from org.fenfire.test.gfx import getvs
 from com.hp.hpl.mesa.rdf import jena
 
-model = jena.mem.ModelMem()
-p = model.createProperty("http://fenfire.org/2003/02/test#";, "test-property")
-r = model.createResource()
-s = model.createResource()
-t = model.createResource()
-u = model.createResource()
-v = model.createResource()
-w = model.createResource()
+def setUp():
+    global model, p, r, s, t, u, v, w
+    global nodes, dirs, props
+    global view
 
-nodes, dirs, props = {}, {}, {}
+    model = jena.mem.ModelMem()
+    p = model.createProperty("http://fenfire.org/2003/02/test#";, 
"test-property")
+    r = model.createResource()
+    s = model.createResource()
+    t = model.createResource()
+    u = model.createResource()
+    v = model.createResource()
+    w = model.createResource()
 
+    nodes, dirs, props = {}, {}, {}
+
+    view = gzz.loom.SimpleView(NodeView())
+    
 class NodeView(gzz.loom.NodeView):
     def render(self, vs, cs, node, prop, dir):
         nodes[node] = cs
@@ -44,8 +51,6 @@
 class Cmp(java.util.Comparator):
     def compare(self, r1, r2):
         return [t,r,s,v,u,w].index(r1) - [t,r,s,v,u,w].index(r2)
-
-view = gzz.loom.SimpleView(NodeView())
 
 def testNullRotation():
     r.addProperty(p, s)
Index: fenfire/org/fenfire/loom/WheelView.test
diff -u fenfire/org/fenfire/loom/WheelView.test:1.3 
fenfire/org/fenfire/loom/WheelView.test:1.4
--- fenfire/org/fenfire/loom/WheelView.test:1.3 Tue Mar  4 06:17:19 2003
+++ fenfire/org/fenfire/loom/WheelView.test     Tue Mar  4 07:02:50 2003
@@ -25,17 +25,24 @@
 from org.fenfire.test.gfx import getvs
 from com.hp.hpl.mesa.rdf import jena
 
-model = jena.mem.ModelMem()
-p = model.createProperty("http://fenfire.org/2003/02/test#";, "test-property")
-r = model.createResource()
-s = model.createResource()
-t = model.createResource()
-u = model.createResource()
-v = model.createResource()
-w = model.createResource()
+def setUp():
+    global model, p, r, s, t, u, v, w
+    global nodes, dirs, props
+    global view
+    
+    model = jena.mem.ModelMem()
+    p = model.createProperty("http://fenfire.org/2003/02/test#";, 
"test-property")
+    r = model.createResource()
+    s = model.createResource()
+    t = model.createResource()
+    u = model.createResource()
+    v = model.createResource()
+    w = model.createResource()
 
-nodes, dirs, props = {}, {}, {}
+    nodes, dirs, props = {}, {}, {}
 
+    view = gzz.loom.WheelView(NodeView())
+    
 class NodeView(gzz.loom.NodeView):
     def render(self, vs, cs, node, prop, dir):
         nodes[node] = cs
@@ -45,8 +52,6 @@
 class Cmp(java.util.Comparator):
     def compare(self, r1, r2):
         return [t,r,s,v,u,w].index(r1) - [t,r,s,v,u,w].index(r2)
-
-view = gzz.loom.WheelView(NodeView())
 
 
 def distance(p1, p2):