Conjunto de mudanças 6586 no repositório publico

Timestamp:

29/06/2012 20:26:01 (9 anos atrás)

Autor:

mazza

Mensagem:

teste: paineis de carrosseis diferentes sao independentes

Localização:

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

Arquivos:

• browser/boxes/carousel.py (modificado) (1 diff)
• tests/testunitcarousel.py (modificado) (1 diff)

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/browser/boxes/carousel.py

@@ -39 +39 @@
         panels = self.panels
         for i in range(NUMBER_OF_PRE_CREATED_BOXES):
-            if i not in panels and Box(ICarouselItem, number).is_empty(self.context):
+            if i not in panels and Box(ICarouselItem, i).is_empty(self.context):
                 panels.insert(0, i)
+                # this marks the slot as used
+                # to avoid conflicts between panels of two carousels
+                Box(ICarouselItem, i).get_data(self.context)
                 break
 

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

@@ -65 +65 @@
 '''.strip('\n'), Carousel(0, context).render())
             IAnnotations.assert_called_with(context)
+
+    def test_multiple_carousel_panels_are_independant(self):
+        """Make sure the panels of different carousels do not mix
+        with one another after edit operations.
+        """
+        annotations = {}
+        context = object()
+        with patch('il.portalinterlegis.browser.boxes.manager.IAnnotations') as IAnnotations:
+            IAnnotations.return_value = annotations
+            carousel_0 = Carousel(0, context)
+            carousel_1 = Carousel(1, context)
+
+            carousel_0.add_item()
+            carousel_0.add_item()
+            carousel_0.add_item()
+            self.assertEqual(carousel_0.panels, [2, 1, 0])
+            self.assertEqual(carousel_1.panels, [])
+            carousel_0.remove_item('zzzzz_1')
+            self.assertEqual(carousel_0.panels, [2, 0])
+            self.assertEqual(carousel_1.panels, [])
+            carousel_1.add_item()
+            carousel_1.add_item()
+            self.assertEqual(carousel_0.panels, [2, 0])
+            self.assertEqual(carousel_1.panels, [3, 1])
+            carousel_1.remove_item('zzzzz_3')
+            self.assertEqual(carousel_0.panels, [2, 0])
+            self.assertEqual(carousel_1.panels, [1])
+            carousel_0.add_item()
+            carousel_0.add_item()
+            carousel_1.add_item()
+            self.assertEqual(carousel_0.panels, [4, 3, 2, 0])
+            self.assertEqual(carousel_1.panels, [5, 1])