Conjunto de mudanças 6484 no repositório publico

Timestamp:

13/06/2012 15:55:27 (9 anos atrás)

Autor:

mazza

Mensagem:

testes ajustados

Localização:

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/tests

Arquivos:

• testintegration.py (modificado) (6 diffs)
• testunitboxes.py (modificado) (1 diff)

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/tests/testintegration.py

@@ -6 +6 @@
 from plone.testing.z2 import Browser
 from zExceptions import NotFound
+from plone.app.testing import login, SITE_OWNER_NAME, SITE_OWNER_PASSWORD
 
 from il.portalinterlegis.browser.boxes import BoxManager
@@ -16 +17 @@
 
     layer = IL_PORTALINTERLEGIS_INTEGRATION_TESTING
+
     def setUp(self):
         self.app = self.layer['app']
@@ -21 +23 @@
         self.qi_tool = getToolByName(self.portal, 'portal_quickinstaller')
 
-    def browser(self, path=None):
+    def new_browser(self, path=None, as_admin=False):
         browser = Browser(self.app)
         browser.handleErrors = False
+        if as_admin:
+            browser.open(self.url("login_form"))
+            browser.getControl(name='__ac_name').value = SITE_OWNER_NAME
+            browser.getControl(name='__ac_password').value = SITE_OWNER_PASSWORD
+            browser.getControl(name='submit').click()
         browser.open(self.url(path))
         return browser
@@ -47 +54 @@
 
     def test_tabs_na_home(self):
-        browser = self.browser()
+        browser = self.new_browser()
         dom = self.dom(browser)
         self.assertEqual([u'O Interlegis',
@@ -76 +83 @@
 
         def use_box_form(title, subtitle, text, num):
-            browser = self.browser(boxmanager._box_name_for_url(num))
+            browser = self.new_browser(boxmanager._box_name_for_url(num), as_admin=True)
             browser.getControl(name='form.widgets.title').value = title
             browser.getControl(name='form.widgets.subtitle').value = subtitle
@@ -91 +98 @@
     def test_box_forms_numbers_begin_from_1_not_zero(self):
         with self.assertRaises(NotFound):
-            browser = self.browser(BoxManager(ISimpleBox)._box_name_for_url(0))
+            browser = self.new_browser(BoxManager(ISimpleBox)._box_name_for_url(0), as_admin=True)
 
     def test_box_forms_are_limited(self):
         with self.assertRaises(NotFound):
-            browser = self.browser(BoxManager(ISimpleBox)._box_name_for_url(1000000))
+            browser = self.new_browser(BoxManager(ISimpleBox)._box_name_for_url(1000000), as_admin=True)
 
     def test_box_form_cannot_be_created_after_initialization(self):
         BoxManager(ISimpleBox).build_form(99) # try to build a box form in an arbitrary moment
         with self.assertRaises(NotFound):
-            browser = self.browser(BoxManager(ISimpleBox)._box_name_for_url(99))
+            browser = self.new_browser(BoxManager(ISimpleBox)._box_name_for_url(99), as_admin=True)
 

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/tests/testunitboxes.py

@@ -39 +39 @@
     def test_row(self):
         context = object()
-        with patch.object(BoxManager, 'html') as mock:
+        with patch.object(BoxManager, 'html') as mock_html:
+            with patch.object(BoxManager, '_box_key') as mock_box_key:
 
-            @return_values(mock, ['\n      %s' % s for s in ['AAA', 'BBB', 'CCC', 'DDD']])
-            def side_effect(c, n):
-                self.assertIs(context, c)
+                @return_values(mock_html, ['\n      %s' % s for s in ['AAA', 'BBB', 'CCC', 'DDD']])
+                def side_effect(c, n):
+                    self.assertIs(context, c)
 
-            self.assertEqual('''
+                from itertools import count
+                numbers = count(1)
+                @return_values(mock_box_key, [1, 2, 3, 4])
+                def side_effect(n):
+                    self.assertIs(numbers.next(), n)
+
+                self.assertEqual('''
   <div class="dt-row">
-    <div class="dt-cell dt-position-0 dt-width-1">
+    <div id="1" class=" dt-cell dt-position-0 dt-width-1">
       AAA
     </div>
-    <div class="dt-cell dt-position-1 dt-width-2">
+    <div id="2" class=" dt-cell dt-position-1 dt-width-2">
       BBB
     </div>
-    <div class="dt-cell dt-position-3 dt-width-3">
+    <div id="3" class=" dt-cell dt-position-3 dt-width-3">
       CCC
     </div>
-    <div class="dt-cell dt-position-6 dt-width-1">
+    <div id="4" class=" dt-cell dt-position-6 dt-width-1">
       DDD
     </div>
   </div>
-''', row_html(context, [(1, _, _), (2, _, _), (3, _, _), (1, _, _)] ))
+''', row_html(context, [(1, _, 1), (2, _, 2), (3, _, 3), (1, _, 4)] ))