Merge branch 'jc_support' into mike

Conflicts:

	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/coretests.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py

1 files changed, 128 insertions, 2 deletions

diff --git a/src/sugar/tutorius/tests/coretests.py b/src/sugar/tutorius/tests/coretests.py
index 1d864f9..c27846d 100644
--- a/src/sugar/tutorius/tests/coretests.py
+++ b/src/sugar/tutorius/tests/coretests.py
@@ -29,8 +29,7 @@ and event filters. Those are in their separate test module
 import unittest
 
 import logging
-import sugar.activity
-from sugar.tutorius.actions import Action, OnceWrapper
+from sugar.tutorius.actions import Action, OnceWrapper, ClickAction, TypeTextAction
 from sugar.tutorius.core import *
 from sugar.tutorius.filters import *
 
@@ -73,6 +72,44 @@ class TrueWhileActiveAction(Action):
         
     def undo(self):
         self.active = False
+        
+class ClickableWidget():
+    """
+    This class fakes a widget with a clicked() method
+    """
+    def __init__(self):
+        self.click_count = 0
+        
+    def clicked(self):
+        self.click_count += 1
+      
+class FakeTextEntry():
+    """
+    This class fakes a widget with an insert_text() method
+    """
+    def __init__(self):
+        self.text_lines = []
+        self.last_entered_line = ""
+        self.displayed_text = ""
+        
+    def insert_text(self, text, index):
+        self.last_entered_line = text
+        self.text_lines.append(text)
+        self.displayed_text = self.displayed_text[0:index] + text + self.displayed_text[index+1:]
+
+class FakeParentWidget():
+    """
+    This class fakes a widet container, it implements the get_children() method
+    """
+    def __init__(self):
+        self._children = []
+        
+    def add_child(self, child):
+        self._children.append(child)
+        
+    def get_children(self):
+        return self._children
+
 
 
 
@@ -112,7 +149,96 @@ class FakeEventFilter(TriggerEventFilter):
         self.tutorial.set_state(event_filter.get_next_state())
     
 
+class ClickActionTests(unittest.TestCase):
+    """
+    Test class for click action
+    """
+    def test_do_action(self):
+        activity = FakeParentWidget()
+        widget = ClickableWidget()
+        activity.add_child(widget)
+        ObjectStore().activity = activity
+        
+        action = ClickAction("0.0")
+        
+        assert widget == ObjectStore().activity.get_children()[0],\
+            "The clickable widget isn't reachable from the object store \
+            the test cannot pass"
+        
+        action.do()
+        
+        assert widget.click_count == 1, "clicked() should have been called by do()"
+        
+        action.do()
+        
+        assert widget.click_count == 2, "clicked() should have been called by do()"
 
+    def test_undo(self):
+        activity = FakeParentWidget()
+        widget = ClickableWidget()
+        activity.add_child(widget)
+        ObjectStore().activity = activity
+        
+        action = ClickAction("0.0")
+        
+        assert widget == ObjectStore().activity.get_children()[0],\
+            "The clickable widget isn't reachable from the object store \
+            the test cannot pass"
+        
+        action.undo()
+        
+        #There is no undo for this action so the test should not fail
+        assert True
+        
+        
+
+class TypeTextActionTests(unittest.TestCase):
+    """
+    Test class for type text action
+    """
+    def test_do_action(self):
+        activity = FakeParentWidget()
+        widget = FakeTextEntry()
+        activity.add_child(widget)
+        ObjectStore().activity = activity
+
+        test_text = "This is text"
+       
+        
+        action = TypeTextAction("0.0", test_text)
+        
+        assert widget == ObjectStore().activity.get_children()[0],\
+            "The clickable widget isn't reachable from the object store \
+            the test cannot pass"
+        
+        action.do()
+        
+        assert widget.last_entered_line == test_text, "insert_text() should have been called by do()"
+        
+        action.do()
+        
+        assert widget.last_entered_line == test_text, "insert_text() should have been called by do()"
+        assert len(widget.text_lines) == 2, "insert_text() should have been called twice"
+
+    def test_undo(self):
+        activity = FakeParentWidget()
+        widget = FakeTextEntry()
+        activity.add_child(widget)
+        ObjectStore().activity = activity
+
+        test_text = "This is text"
+       
+        
+        action = TypeTextAction("0.0", test_text)
+        
+        assert widget == ObjectStore().activity.get_children()[0],\
+            "The clickable widget isn't reachable from the object store \
+            the test cannot pass"
+        
+        action.undo()
+        
+        #There is no undo for this action so the test should not fail
+        assert True
 
 # State testing class
 class StateTest(unittest.TestCase):