Added an image surface cache for incoming protozoans

1 files changed, 28 insertions, 23 deletions

diff --git a/test_suite.py b/test_suite.py
index a33c587..e634b33 100644
--- a/test_suite.py
+++ b/test_suite.py
@@ -94,7 +94,6 @@ class TestKandidModel(unittest.TestCase):
     def test_task(self):
         global _test_task_completed_count
         _test_task_completed_count = 0
-        gtk.gdk.threads_init()
         ka_task.GeneratorTask(self.task_1, self.on_completed).start()
         time.sleep(5)
         self.assertTrue(ka_task.GeneratorTask.is_completed())
@@ -105,7 +104,7 @@ class TestKandidModel(unittest.TestCase):
         #self.assertEqual(1, _test_task_completed_count)
 
     def task_1(self, *args, **kwargs):
-        ka_task.GeneratorTask.leave()
+#!!        ka_task.GeneratorTask.leave()
         print 'leave 1', _test_task_completed_count
 
     def task_2(self, *args, **kwargs):
@@ -532,16 +531,19 @@ class TestKandidModel(unittest.TestCase):
         recalled_model = model_population.read_file(kandid.TESTMODEL)
         
     def test_incomming1(self):
-        incoming = ka_incoming.KandidIncoming(3)
-        self.assertEqual(0, len(incoming.incoming_protozoans))
+        main_view = gtk.HBox()
+        widget = ka_widget.KandidWidget(main_view)
+        #TODO gtk main loop is not running. KandidIncoming.task_render will not be executed
+        incoming = ka_incoming.KandidIncoming(3, widget.getWidget_tree())
+        self.assertEqual(0, len(incoming.incoming_id))
         protozoon1 = model_protozoon.Protozoon()
         protozoon1.randomize()
         incoming.append_protozoon(protozoon1)
-        self.assertEqual(1, len(incoming.incoming_protozoans))
+        self.assertEqual(1, len(incoming.incoming_id))
         self.assertEqual(protozoon1.get_unique_id(), 
-                         incoming.incoming_protozoans[0].get_unique_id())
+                         incoming.at_index(0)[0].get_unique_id())
         incoming.decline_protozoon(0)
-        self.assertEqual(0, len(incoming.incoming_protozoans))
+        self.assertEqual(0, len(incoming.incoming_id))
 
     def test_incomming3(self):
         protozoon1 = model_protozoon.Protozoon()
@@ -552,8 +554,10 @@ class TestKandidModel(unittest.TestCase):
         protozoon3.randomize()
 
         capacity = 3
-        incoming = ka_incoming.KandidIncoming(capacity)
-        self.assertEqual(0, len(incoming.incoming_protozoans))
+        main_view = gtk.HBox()
+        widget = ka_widget.KandidWidget(main_view)
+        incoming = ka_incoming.KandidIncoming(capacity, widget.getWidget_tree())
+        self.assertEqual(0, len(incoming.incoming_id))
 
         self.render_incoming(incoming, capacity)
         incoming.append_protozoon(protozoon1)
@@ -562,28 +566,28 @@ class TestKandidModel(unittest.TestCase):
         self.render_incoming(incoming, capacity)
         incoming.append_protozoon(protozoon3)
         self.render_incoming(incoming, capacity)
-        self.assertEqual(3, len(incoming.incoming_protozoans))
+        self.assertEqual(3, len(incoming.incoming_id))
         self.assertEqual(protozoon1.get_unique_id(), 
-                         incoming.incoming_protozoans[0].get_unique_id())
+                         incoming.at_index(0)[0].get_unique_id())
         self.assertEqual(protozoon2.get_unique_id(), 
-                         incoming.incoming_protozoans[1].get_unique_id())
+                         incoming.at_index(1)[0].get_unique_id())
         self.assertEqual(protozoon3.get_unique_id(), 
-                         incoming.incoming_protozoans[2].get_unique_id())
+                         incoming.at_index(2)[0].get_unique_id())
         
         incoming.decline_protozoon(0)
-        self.assertEqual(2, len(incoming.incoming_protozoans))
+        self.assertEqual(2, len(incoming.incoming_id))
         self.assertEqual(protozoon2.get_unique_id(), 
-                         incoming.incoming_protozoans[0].get_unique_id())
+                         incoming.at_index(0)[0].get_unique_id())
         self.assertEqual(protozoon3.get_unique_id(), 
-                         incoming.incoming_protozoans[1].get_unique_id())
+                         incoming.at_index(1)[0].get_unique_id())
 
         incoming.decline_protozoon(1)
-        self.assertEqual(1, len(incoming.incoming_protozoans))
+        self.assertEqual(1, len(incoming.incoming_id))
         self.assertEqual(protozoon2.get_unique_id(), 
-                         incoming.incoming_protozoans[0].get_unique_id())
+                         incoming.at_index(0)[0].get_unique_id())
 
         incoming.decline_protozoon(0)
-        self.assertEqual(0, len(incoming.incoming_protozoans))
+        self.assertEqual(0, len(incoming.incoming_id))
 
         protozoon4 = model_protozoon.Protozoon()
         protozoon4.randomize()
@@ -591,13 +595,13 @@ class TestKandidModel(unittest.TestCase):
         incoming.append_protozoon(protozoon2)
         incoming.append_protozoon(protozoon3)
         incoming.append_protozoon(protozoon4)
-        self.assertEqual(3, len(incoming.incoming_protozoans))
+        self.assertEqual(3, len(incoming.incoming_id))
         self.assertEqual(protozoon2.get_unique_id(), 
-                         incoming.incoming_protozoans[0].get_unique_id())
+                         incoming.at_index(0)[0].get_unique_id())
         self.assertEqual(protozoon3.get_unique_id(), 
-                         incoming.incoming_protozoans[1].get_unique_id())
+                         incoming.at_index(1)[0].get_unique_id())
         self.assertEqual(protozoon4.get_unique_id(), 
-                         incoming.incoming_protozoans[2].get_unique_id())
+                         incoming.at_index(2)[0].get_unique_id())
         
     def render_incoming(self, incoming, capacity):
         for index in range(capacity):
@@ -674,6 +678,7 @@ Activity
 
 ka_debug.info('starting TestSuite')
 ka_debug.err('testing error message channel.')
+gtk.gdk.threads_init()
 alltests = unittest.TestSuite((\
                  unittest.makeSuite(TestKandidModel), \
                              ))