implement tests

Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSLinkContainer/onChangeObjEvt.py

@@ -17,7 +17,7 @@ def equals(o, d):
   return True
 
 request = zmscontext.REQUEST
-lang = request['lang']
+lang = request.get('lang')
 if request.get('btn') == 'BTN_SAVE':
   align = zmscontext.attr('align')
   # Save.

Products/zms/standard.py

@@ -111,10 +111,10 @@ def initZMS(self, id, titlealt, title, lang, manage_lang, REQUEST):
 
   ##### Add ZMS ####
   from Products.zms import zms
-  zms.initZMS(homeElmnt, 'content', titlealt, title, lang, manage_lang, REQUEST)
-  zms.initContent(homeElmnt.content, 'content.default.zip', REQUEST)
+  content = zms.initZMS(homeElmnt, 'content', titlealt, title, lang, manage_lang, REQUEST)
+  zms.initContent(content, 'content.default.zip', REQUEST)
 
-  return "initZMS"
+  return content
 
 security.declarePublic('getPRODUCT_HOME')
 def getPRODUCT_HOME():

tests/test_rest_api.py

@@ -7,7 +7,7 @@
 
 # Product imports.
 from tests.zms_test_util import *
-from Products.zms import zms
+from Products.zms import standard
 
 # /Products/zms> python -m unittest discover -s unit_tests
 # /Products/zms> python -m unittest tests.test_rest_api.RestAPITest
@@ -18,14 +18,13 @@ class RestAPITest(ZMSTestCase):
   def setUp(self):
     folder = Folder('myzmsx')
     folder.REQUEST = MockHTTPRequest({'lang':'eng','preview':'preview'})
-    zmscontext = zms.initZMS(folder, 'content', 'titlealt', 'title', 'eng', 'eng', folder.REQUEST)
-    self.context = zmscontext
+    self.context = standard.initZMS(folder, 'content', 'titlealt', 'title', 'eng', 'eng', folder.REQUEST)
     print('[setUp] create %s'%self.temp_title)
-    self.folder = zmscontext.manage_addZMSCustom('ZMSFolder',{'title':self.temp_title,'titlealt':self.temp_title},zmscontext.REQUEST)
 
   def test_tree(self):
-    request = MockHTTPRequest({'REQUEST_METHOD':'GET','TraversalRequestNameStack':[self.folder.id]})
+    folder = self.context.getChildNodes(MockHTTPRequest(),'ZMSFolder')[0]
+    request = MockHTTPRequest({'REQUEST_METHOD':'GET','TraversalRequestNameStack':[folder.id]})
     name = '++rest_api'
     actual = self.context.__bobo_traverse__(request, name)(request)
-    self.assertTrue(actual.find('"id": "e1"') > 0)
-    self.assertTrue(actual.find('"meta_id": "ZMSFolder"') > 0)
+    self.assertTrue(actual.find('"id": "%s"'%folder.id) > 0)
+    self.assertTrue(actual.find('"meta_id": "%s"'%folder.meta_id) > 0)

tests/zms_test_util.py

@@ -30,6 +30,14 @@ def writeInfo(self, s):
     def writeError(self, s):
         self.context.write(logging.ERROR,s)
 
+class MockUser:
+
+    def __init__(self, id):
+        self.id = id
+
+    def getId(self):
+        return self.id
+
 class MockHTTPResponse:
 
     def __init__(self):
@@ -43,11 +51,14 @@ class MockHTTPRequest:
     def __init__(self, d={}, other={}):
         self.d = d
         self.other = other
+        self.set('AUTHENTICATED_USER',MockUser("test"))
         self.RESPONSE = MockHTTPResponse()
 
+    __getitem____roles = None
     def __getitem__(self, k, v=None):
         return self.get(k)
 
+    __setitem____roles = None
     def __setitem__(self, k, v):
         self.set(k,v)