New test for linking of non-existing and existing properties via a form.

The idea of the test is to track all create and set operations and
afterwards compare that they occurred as expected. Sorry for the
peculiar syntax for the expected updates to the database -- this should
be one line for each update...

An a bug-fix: I've reverted a change from April in
roundup/cgi/actions.py that broke linking of messages to issues. The
tests above now catch that. I couldn't figure out what the change was
meant for, sorry if I broke something here.

Author: Ralf Schlatterbeck

roundup/cgi/actions.py

@@ -1,6 +1,7 @@
-#$Id: actions.py,v 1.67 2007-05-07 14:03:30 schlatterbeck Exp $
+#$Id: actions.py,v 1.68 2007-05-08 20:54:56 schlatterbeck Exp $
 
 import re, cgi, StringIO, urllib, Cookie, time, random, csv, codecs
+import sys
 
 from roundup import hyperdb, token, date, password
 from roundup.i18n import _
@@ -371,12 +372,10 @@ def _editnodes(self, all_props, all_links):
                 # link item to link to doesn't (and won't) exist
                 continue
 
-            for vcn, vid in vlist:
-                if vid == '-1': vid = None
-                if not (vid or all_props.has_key((vcn, vid))):
+            for value in vlist:
+                if not all_props.has_key(value):
                     # link item to link to doesn't (and won't) exist
                     continue
-                value = (vcn, vid)
                 deps.setdefault((cn, nodeid), []).append(value)
                 links.setdefault(value, []).append((cn, nodeid, propname))
 

test/test_actions.py

@@ -225,6 +225,59 @@ def opendb(username):
 
         self.assertLoginLeavesMessages([], 'foo', 'right')
 
+class EditItemActionTestCase(ActionTestCase):
+    def setUp(self):
+        ActionTestCase.setUp(self)
+        self.result = []
+        class AppendResult:
+            def __init__(inner_self, name):
+                inner_self.name = name
+            def __call__(inner_self, *args, **kw):
+                self.result.append((inner_self.name, args, kw))
+                if inner_self.name == 'set':
+                    return kw
+                return '17'
+
+        self.client.db.security.hasPermission = true
+        self.client.classname = 'issue'
+        self.client.base = 'http://tracker/'
+        self.client.nodeid = '4711'
+        self.client.template = 'item'
+        self.client.db.classes.create = AppendResult('create')
+        self.client.db.classes.set = AppendResult('set')
+        self.client.db.classes.getprops = lambda: \
+            ({'messages':hyperdb.Multilink('msg'), 'content':hyperdb.String()})
+        self.action = EditItemAction(self.client)
+
+    def testMessageAttach(self):
+        expect = \
+            [ ('create',(),{'content':'t'})
+            , ('set',('4711',), {'messages':['23','42','17']})
+            ]
+        self.client.db.classes.get = lambda a, b:['23','42']
+        self.client.parsePropsFromForm = lambda: \
+            ( {('msg','-1'):{'content':'t'},('issue','4711'):{}}
+            , [('issue','4711','messages',[('msg','-1')])]
+            )
+        try :
+            self.action.handle()
+        except Redirect, msg:
+            pass
+        self.assertEqual(expect, self.result)
+
+    def testLinkExisting(self):
+        expect = [('set',('4711',),{'messages':['23','42','1']})]
+        self.client.db.classes.get = lambda a, b:['23','42']
+        self.client.parsePropsFromForm = lambda: \
+            ( {('issue','4711'):{},('msg','1'):{}}
+            , [('issue','4711','messages',[('msg','1')])]
+            )
+        try :
+            self.action.handle()
+        except Redirect, msg:
+            pass
+        self.assertEqual(expect, self.result)
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(RetireActionTestCase))
@@ -233,6 +286,7 @@ def test_suite():
     suite.addTest(unittest.makeSuite(ShowActionTestCase))
     suite.addTest(unittest.makeSuite(CollisionDetectionTestCase))
     suite.addTest(unittest.makeSuite(LoginTestCase))
+    suite.addTest(unittest.makeSuite(EditItemActionTestCase))
     return suite
 
 if __name__ == '__main__':