Merge branch 'master' of git://git.sugarlabs.org/tutorius/mainline into tutorialADT

1 files changed, 5 insertions, 15 deletions

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)