From 660a5bd1e0a24d83fc963a83097b540bc2f28eaa Mon Sep 17 00:00:00 2001
From: Simon Poirier <simpoir@gmail.com>
Date: Sat, 24 Oct 2009 22:09:31 +0000
Subject: test fixing

---
(limited to 'tests')

diff --git a/tests/coretests.py b/tests/coretests.py
index 4d5055e..b9e04e5 100644
--- a/tests/coretests.py
+++ b/tests/coretests.py
@@ -28,7 +28,7 @@ and event filters. Those are in their separate test module
 
 import unittest
 
-import copy
+from copy import deepcopy
 import logging
 from sugar.tutorius.actions import *
 from sugar.tutorius.addon import *
@@ -275,22 +275,21 @@ class StateTest(unittest.TestCase):
         assert not(st1 == st2), "Different state names should give different states"
         st2.name = "Identical"
 
-        st3 = copy.deepcopy(st1)
+        st3 = deepcopy(st1)
         st3.add_action(addon.create("BubbleMessage", "Hi!", [128,264]))
 
         assert not (st1 == st3), "States having a different number of actions should be different"
 
-        st4 = copy.deepcopy(st1)
-        st4.add_event_filter(addon.create("GtkWidgetEventFilter", "next_state", "0.0.1.1.2.2.3", "clicked"))
+        st4 = deepcopy(st1)
+        st4.add_event_filter(addon.create("GtkWidgetEventFilter", "0.0.1.1.2.2.3", "clicked"), "next_state")
 
         assert not (st1 == st4), "States having a different number of events should be different"
 
-        st5 = copy.deepcopy(st1)
+        st5 = deepcopy(st1)
         st5._event_filters = []
     
-        st5.add_event_filter(addon.create("GtkWidgetEventFilter", "other_state", "0.1.2.3.4.1.2", "pressed"))
+        st5.add_event_filter(addon.create("GtkWidgetEventFilter", "0.1.2.3.4.1.2", "pressed"), "other_state")
 
-        #import rpdb2; rpdb2.start_embedded_debugger('pass')
         assert not (st1 == st5), "States having the same number of event filters" \
              + " but those being different should be different"
 
@@ -523,7 +522,7 @@ class FSMTest(unittest.TestCase):
 
         fsm.add_action(act1)
 
-        fsm2 = copy.deepcopy(fsm)
+        fsm2 = deepcopy(fsm)
 
         assert fsm == fsm2
 
@@ -548,7 +547,7 @@ class FSMTest(unittest.TestCase):
         fsm.add_state(st1)
         fsm.add_state(st2)
 
-        fsm4 = copy.deepcopy(fsm)
+        fsm4 = deepcopy(fsm)
 
         assert fsm == fsm4
 
diff --git a/tests/filterstests.py b/tests/filterstests.py
index c45f924..ee6033b 100644
--- a/tests/filterstests.py
+++ b/tests/filterstests.py
@@ -32,20 +32,10 @@ from gtkutilstests import SignalCatcher
 
 class BaseEventFilterTests(unittest.TestCase):
     """Test the behavior of the Base EventFilter class"""
-    def test_properties(self):
-        """Test EventFilter properties"""
-        e = EventFilter("NEXTSTATE")
-
-        assert e.next_state == "NEXTSTATE", "next_state should have value used in constructor"
-
-        e.next_state = "NEWSTATE"
-
-        assert e.next_state == "NEWSTATE", "next_state should have been changed by setter"
-
 
     def test_callback(self):
         """Test the callback mechanism"""
-        e = EventFilter("Next")
+        e = EventFilter()
         s = SignalCatcher()
 
         #Trigger the do_callback, shouldn't do anything
@@ -79,7 +69,7 @@ class TestTimerEvent(unittest.TestCase):
         ctx = gobject.MainContext()
         main = gobject.MainLoop(ctx)
 
-        e = addon.create('TimerEvent', "Next", 2) # 2 seconds should be enough :s
+        e = addon.create('TimerEvent', 2) # 2 seconds should be enough :s
         s = SignalCatcher()
 
         e.install_handlers(s.callback)
@@ -122,7 +112,7 @@ class TestTimerEvent(unittest.TestCase):
         ctx = gobject.MainContext()
         main = gobject.MainLoop(ctx)
 
-        e = addon.create('TimerEvent', "Next", 2) # 2 seconds should be enough :s
+        e = addon.create('TimerEvent', 2) # 2 seconds should be enough :s
         s = SignalCatcher()
 
         e.install_handlers(s.callback)
@@ -169,7 +159,7 @@ class TestGtkWidgetEventFilter(unittest.TestCase):
         self.top.add(self.btn1)
     
     def test_install(self):
-        h = addon.create('GtkWidgetEventFilter', "Next","0","whatever")
+        h = addon.create('GtkWidgetEventFilter', "0","whatever")
         try:
             h.install_handlers(None)
 
@@ -178,7 +168,7 @@ class TestGtkWidgetEventFilter(unittest.TestCase):
             assert True, "Install should have failed"
 
     def test_button_clicks(self):
-        h = addon.create('GtkWidgetEventFilter', "Next","0.0","clicked")
+        h = addon.create('GtkWidgetEventFilter', "0.0","clicked")
         s = SignalCatcher()
 
         h.install_handlers(s.callback, activity=self.top)
--
cgit v0.9.1