[ff-cvs] fenfire/org/fenfire fenmm/MMTextCursor.test mod...

[Tuomas J. Lukka]

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

Modified files:
        org/fenfire/fenmm: MMTextCursor.test 
        org/fenfire/modules/pp: PPActionsImpl.test 
        org/fenfire/structure: ff.test 
        org/fenfire/swamp: Graphs.test writer.test 
        org/fenfire/test: fen.py 
        org/fenfire/util: RDFUtil.test 
        org/fenfire/util/lava: RDFList.test Traversals.test 
        org/fenfire/view: TextNodeView.test papercanvas2d.test 

Log message:
        Fix tests

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenmm/MMTextCursor.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.test.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/structure/ff.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/Graphs.test.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/writer.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/test/fen.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/RDFUtil.test.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/lava/RDFList.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/lava/Traversals.test.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextNodeView.test.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/papercanvas2d.test.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/fenmm/MMTextCursor.test
diff -u fenfire/org/fenfire/fenmm/MMTextCursor.test:1.1 
fenfire/org/fenfire/fenmm/MMTextCursor.test:1.2
--- fenfire/org/fenfire/fenmm/MMTextCursor.test:1.1     Wed Aug 20 02:11:37 2003
+++ fenfire/org/fenfire/fenmm/MMTextCursor.test Fri Sep 12 04:38:19 2003
@@ -29,14 +29,14 @@
     """
     Test that the text cursor is moved correctly.
     """
-    fen = ff.test.fen.newFen()
+    (fen, ff_structure, contentFunction) = ff.test.fen.newFen()
     textstyle = vob.GraphicsAPI.getInstance().getTextStyle("sans", 0, 24)
-    textnodeview = ff.view.TextNodeView(fen.txtfunc, textstyle)
+    textnodeview = ff.view.TextNodeView(contentFunction, textstyle)
 
     note = "Lorem ipsum\ndolor sit amet, consetetur sadipscing elitr,  sed 
diam nonumy\nrmod tempor invidunt ut labore et dolore magna aliquyam erat, sed 
diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet 
clita kasd \nbergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. 
Lorem ipsum dolor sit amet, consetetur sadipscing elitr,  sed diam\nonumy 
eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam 
voluptua. At vero eos et accusam et justo duo dolores\n ea rebum. Stet\nlita 
kasd gubergren, no sea ta\nmata sanctus est Lorem ipsum dolor sit amet. Lorem 
ipsum dolor sit amet, consetetur sadipscing elitr,  sed diam nonumy eirmod 
tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At 
vero eos e\naccusam et justo duo dolores et ea re\nm. Stet clita kasd 
gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."
 
     node = ff.swamp.Nodes.N()
-    ff.util.AlphContent(fen).setText(node, note, 1)
+    ff.util.AlphContent(fen, ff_structure).setText(node, note, 1)
 
     p = textnodeview.f(fen.graph, node)
 
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.test
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.14 
fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.15
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.14      Wed Jun 11 
13:40:54 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.test   Fri Sep 12 04:38:19 2003
@@ -39,19 +39,22 @@
 
 
 def setUp():
-    print "set up for ppactionsimpl"
-    global fen, act
-    fen = fenfire.Fen()
-    fen.constgraph = fen.graph = fenfire.swamp.impl.HashGraph()
-    fen.txt = fenfire.impl.SimpleNodeContent(fen, 
-               alph.impl.StormAlph(
-                   storm.impl.TransientPool(
-                       java.util.HashSet())))
-    print "create ppactionsimpl"
-    act = PPActionsImpl(fen)
-    print "setup complete"
+    if 0:
+       print "set up for ppactionsimpl"
+       global fen, act
+       fen = fenfire.Fen()
+       fen.constgraph = fen.graph = fenfire.swamp.impl.HashGraph()
+       fen.txt = fenfire.impl.SimpleNodeContent(fen, 
+                   alph.impl.StormAlph(
+                       storm.impl.TransientPool(
+                           java.util.HashSet())))
+       print "create ppactionsimpl"
+       act = PPActionsImpl(fen)
+       print "setup complete"
 
-def testNewPaper():
+def ignore_testNewPaper():
+    """ Disabled: PPActions is not in use any more
+    """
     print "Test paper"
     paper = act.newPaper()
 
Index: fenfire/org/fenfire/structure/ff.test
diff -u fenfire/org/fenfire/structure/ff.test:1.1 
fenfire/org/fenfire/structure/ff.test:1.2
--- fenfire/org/fenfire/structure/ff.test:1.1   Wed Sep 10 09:00:47 2003
+++ fenfire/org/fenfire/structure/ff.test       Fri Sep 12 04:38:20 2003
@@ -30,7 +30,7 @@
 
     graph = ff.swamp.impl.HashGraph()
 
-    ffinstance = ff.structure.Ff(graph, 
+    ffinstance = ff.structure.Ff.create(graph, 
                alph.impl.StormAlph(
                    storm.impl.TransientPool(
                        java.util.HashSet())))
@@ -51,13 +51,13 @@
     node2 = ff.swamp.Nodes.get(ns.generateId())
 
 def testPutGet():
-    ffinstance.set(node1, enf1)
-    assert fen.getContent(fen.constgraph,node1).equals(enf1)
-    assert fen.getContent(fen.constgraph,node2).length() == 0
+    ffinstance.setContent(node1, enf1)
+    assert ffinstance.getContent(node1).equals(enf1)
+    assert ffinstance.getContent(node2).length() == 0
 
-    snc.set(node1, enf2)
-    assert fen.getContent(fen.constgraph,node1).equals(enf2)
-    assert fen.getContent(fen.constgraph,node2).length() == 0
+    ffinstance.setContent(node1, enf2)
+    assert ffinstance.getContent(node1).equals(enf2)
+    assert ffinstance.getContent(node2).length() == 0
 
 #def testWhat():
 #    snc.set(node1, enf1)
Index: fenfire/org/fenfire/swamp/Graphs.test
diff -u fenfire/org/fenfire/swamp/Graphs.test:1.11 
fenfire/org/fenfire/swamp/Graphs.test:1.12
--- fenfire/org/fenfire/swamp/Graphs.test:1.11  Sat Sep  6 08:46:54 2003
+++ fenfire/org/fenfire/swamp/Graphs.test       Fri Sep 12 04:38:20 2003
@@ -95,9 +95,9 @@
 
 
 def testRealContentSaveLoad():
-    fen = ff.test.fen.newFen()
+    (fen, ff_structure, contentFunction) = ff.test.fen.newFen()
     g = fen.graph
-    cont = ff.util.AlphContent(fen)
+    cont = ff.util.AlphContent(fen, ff_structure)
 
     node = ff.swamp.Nodes.N()
     cont.setText(node, 'test', 0)
@@ -113,11 +113,11 @@
     #### Load
     m = jena.mem.ModelMem()
     m = m.read(java.io.FileReader(file), None)
-    fen.graph = fen.constgraph = ff.swamp.Graphs.toGraph(m)
-
-    cont = ff.util.AlphContent(fen)
+    readGraph = ff.swamp.Graphs.toGraph(m)
+    (fen, ff_structure, contentFunction) = ff.test.fen.newFen(readGraph)
+    cont = ff.util.AlphContent(fen, ff_structure)
     
-    assert 'test' == cont.getText(fen.graph, node)
+    assert 'test' == cont.getText(node)
     
     #### clean
     os.system('rm '+file)
Index: fenfire/org/fenfire/swamp/writer.test
diff -u fenfire/org/fenfire/swamp/writer.test:1.3 
fenfire/org/fenfire/swamp/writer.test:1.4
--- fenfire/org/fenfire/swamp/writer.test:1.3   Sat Sep  6 08:46:54 2003
+++ fenfire/org/fenfire/swamp/writer.test       Fri Sep 12 04:38:20 2003
@@ -91,9 +91,9 @@
 
 
 def testRealContentSaveLoad():
-    fen = ff.test.fen.newFen()
+    (fen, ff_structure, contentFunction) = ff.test.fen.newFen()
     g = fen.graph
-    cont = ff.util.AlphContent(fen)
+    cont = ff.util.AlphContent(fen, ff_structure)
 
     node = ff.swamp.Nodes.N()
     cont.setText(node, 'test', 0)
@@ -107,11 +107,11 @@
     #### Load
     m = jena.mem.ModelMem()
     m = m.read(java.io.FileReader(file), None)
-    fen.graph = fen.constgraph = ff.swamp.Graphs.toGraph(m)
-
-    cont = ff.util.AlphContent(fen)
+    readGraph = ff.swamp.Graphs.toGraph(m)
+    (fen, ff_structure, contentFunction) = ff.test.fen.newFen(readGraph)
+    cont = ff.util.AlphContent(fen, ff_structure)
     
-    assert 'test' == cont.getText(fen.graph, node)
+    assert 'test' == cont.getText(node)
     
     #### clean
     os.system('rm '+file)
Index: fenfire/org/fenfire/test/fen.py
diff -u fenfire/org/fenfire/test/fen.py:1.3 fenfire/org/fenfire/test/fen.py:1.4
--- fenfire/org/fenfire/test/fen.py:1.3 Wed Jun 11 13:00:24 2003
+++ fenfire/org/fenfire/test/fen.py     Fri Sep 12 04:38:21 2003
@@ -27,13 +27,14 @@
 from org.nongnu import alph
 from org.nongnu import storm
 
-def newFen():
+def newFen(graph = None):
     pool = storm.impl.TransientPool(java.util.HashSet())
     myalph = alph.impl.StormAlph(pool)
 
     fen = ff.Fen()
-    fen.graph = fen.constgraph = ff.swamp.impl.HashGraph()
-    fen.txt = ff.impl.SimpleNodeContent(fen, myalph);
-    fen.txtfunc = fen.txt.getNodeFunction()
-    fen.enfiladeOverlap = fen.txt.getTransclusionIndex()
-    return fen
+    if graph == None:
+       graph = ff.swamp.impl.HashGraph()
+    fen.graph = fen.constgraph = graph
+    ff_structure = ff.structure.Ff.create(fen.graph, myalph);
+    fen.enfiladeOverlap = ff_structure.getTransclusionIndex()
+    return (fen, ff_structure, ff.structure.Ff.ContentFunction(ff_structure))
Index: fenfire/org/fenfire/util/RDFUtil.test
diff -u fenfire/org/fenfire/util/RDFUtil.test:1.6 
fenfire/org/fenfire/util/RDFUtil.test:1.7
--- fenfire/org/fenfire/util/RDFUtil.test:1.6   Wed Jun 11 13:00:24 2003
+++ fenfire/org/fenfire/util/RDFUtil.test       Fri Sep 12 04:38:21 2003
@@ -20,8 +20,7 @@
 # 
 
 
-from org import fenfire
-from org.fenfire.swamp import Nodes
+from org import fenfire as ff
 from org.fenfire.vocab import RDF
 from org.fenfire.util import URN5Namespace, Pair, RDFUtil
 from org.nongnu.libvob.buoy import BuoyViewNodeType,\
@@ -39,15 +38,10 @@
 
 def setUp():
     global fen, act
-    fen = fenfire.Fen()
-    fen.constgraph = fen.graph = fenfire.swamp.impl.HashGraph()
-    fen.txt = fenfire.impl.SimpleNodeContent(fen, 
-               alph.impl.StormAlph(
-                   storm.impl.TransientPool(
-                       java.util.HashSet())))
+    (fen, ff_structure, contentFunction) = ff.test.fen.newFen()
 
 def testNewObjWithType():
-    type = Nodes.get('This is a test type')
+    type = ff.swamp.Nodes.get('This is a test type')
 
     obj = RDFUtil.N(fen.graph, type)
 
Index: fenfire/org/fenfire/util/lava/RDFList.test
diff -u fenfire/org/fenfire/util/lava/RDFList.test:1.2 
fenfire/org/fenfire/util/lava/RDFList.test:1.3
--- fenfire/org/fenfire/util/lava/RDFList.test:1.2      Tue Aug 26 14:42:35 2003
+++ fenfire/org/fenfire/util/lava/RDFList.test  Fri Sep 12 04:38:21 2003
@@ -9,7 +9,7 @@
     if dbg: print s
 
 def testList():
-    fen = ff.test.fen.newFen()
+    (fen, ff_structure, contentFunction) = ff.test.fen.newFen()
     l = ff.util.lava.RDFList(fen, 'testObj')
     
     ### test type
Index: fenfire/org/fenfire/util/lava/Traversals.test
diff -u fenfire/org/fenfire/util/lava/Traversals.test:1.5 
fenfire/org/fenfire/util/lava/Traversals.test:1.6
--- fenfire/org/fenfire/util/lava/Traversals.test:1.5   Sun Aug 24 17:30:50 2003
+++ fenfire/org/fenfire/util/lava/Traversals.test       Fri Sep 12 04:38:21 2003
@@ -9,7 +9,7 @@
         return 1
 
     findShortestPath = Traversals.findShortestPath
-    fen = ff.test.fen.newFen()
+    (fen, ff_structure, contentFunction) = ff.test.fen.newFen()
     cg = fen.constgraph
     p = ff.swamp.Nodes.N()
 
@@ -36,7 +36,7 @@
     assert equalSeq(findShortestPath(b, p, d, cg), [a,d]) # test shortcut use
 
 def testIsConnected():
-    fen = ff.test.fen.newFen()
+    (fen, ff_structure, contentFunction) = ff.test.fen.newFen()
     p = ff.swamp.Nodes.N()
 
     a = ff.swamp.Nodes.N()
@@ -88,7 +88,7 @@
     def getNodes(fen):
         return fen.constgraph.findN_XAA_Iter() # not realistic!
 
-    fen = ff.test.fen.newFen()
+    (fen, ff_structure, contentFunction) = ff.test.fen.newFen()
     p = ff.swamp.Nodes.N()
     q = ff.swamp.Nodes.N()
 
Index: fenfire/org/fenfire/view/TextNodeView.test
diff -u fenfire/org/fenfire/view/TextNodeView.test:1.9 
fenfire/org/fenfire/view/TextNodeView.test:1.10
--- fenfire/org/fenfire/view/TextNodeView.test:1.9      Sun Aug 17 17:01:15 2003
+++ fenfire/org/fenfire/view/TextNodeView.test  Fri Sep 12 04:38:21 2003
@@ -39,10 +39,10 @@
     vs = gfx.getvs()
 
     # Create fen with swamps.
-    fen = ff.test.fen.newFen()
+    (fen, ff_structure, contentFunction) = ff.test.fen.newFen()
 
     textstyle = vob.GraphicsAPI.getInstance().getTextStyle("sans", 0, 24)
-    textnodeview = ff.view.TextNodeView(fen.txtfunc, textstyle)
+    textnodeview = ff.view.TextNodeView(contentFunction, textstyle)
     view = ff.view.CanvasView2D(fen, textnodeview)
     view.cull = 1
     paperview = ff.view.PaperView2D(view)
@@ -50,7 +50,7 @@
     note = ff.swamp.Nodes.N()
     paper = ff.util.RDFUtil.N(fen.graph, ff.vocab.CANVAS2D.Canvas)
     fen.graph.add(paper, ff.vocab.STRUCTLINK.linkedTo, note)
-    ff.util.AlphContent(fen).setText(note, '', 1)
+    ff.util.AlphContent(fen, ff_structure).setText(note, '', 1)
 
     mainNode = ff.view.buoy.MainNode2D(paper, paperview, None)
 
@@ -71,9 +71,9 @@
     """
     Test that locating the text cursor works back and forth.
     """
-    fen = ff.test.fen.newFen()
+    (fen, ff_structure, contentFunction) = ff.test.fen.newFen()
     textstyle = vob.GraphicsAPI.getInstance().getTextStyle("sans", 0, 24)
-    textnodeview = ff.view.TextNodeView(fen.txtfunc, textstyle)
+    textnodeview = ff.view.TextNodeView(contentFunction, textstyle)
 
     note = "Lorem ipsum dolor sit amet, consetetur sadipscing elitr,  sed diam 
nonumy \nrmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam 
voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita 
kasd \nbergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem 
ipsum dolor sit amet, consetetur sadipscing elitr,  sed diam\nonumy eirmod 
tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At 
vero eos et accusam et justo duo dolores \n ea rebum. Stet\nlita kasd 
gubergren, no sea ta\nmata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum 
dolor sit amet, consetetur sadipscing elitr,  sed diam nonumy eirmod tempor 
invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero 
eos e\naccusam et justo duo dolores et ea re\nm. Stet clita kasd gubergren, no 
sea takimata sanctus est Lorem ipsum dolor sit amet."
 
Index: fenfire/org/fenfire/view/papercanvas2d.test
diff -u fenfire/org/fenfire/view/papercanvas2d.test:1.15 
fenfire/org/fenfire/view/papercanvas2d.test:1.16
--- fenfire/org/fenfire/view/papercanvas2d.test:1.15    Sun Aug 17 15:50:10 2003
+++ fenfire/org/fenfire/view/papercanvas2d.test Fri Sep 12 04:38:21 2003
@@ -47,8 +47,8 @@
 
     ################ Create the fen, set up data
 
-    fen = ff.test.fen.newFen()
-    con = ff.util.AlphContent(fen)
+    (fen, ff_structure, contentFunction) = ff.test.fen.newFen()
+    con = ff.util.AlphContent(fen, ff_structure)
 
     nodec = ff.util.RDFUtil.N(fen.graph, CANVAS2D.Canvas)
     node1 = ff.swamp.Nodes.N()
@@ -71,7 +71,7 @@
     vs = getvs()
 
     textnodeview = ff.view.TextNodeView(
-       fen.txtfunc, 
+       contentFunction, 
        vs.gfxapi.getTextStyle("Sans", 0, 50),
        1)