created mock and test runner for workshop

3 files changed, 148 insertions, 4 deletions

diff --git a/activity/Workshop.activity/WorkshopModel.py b/activity/Workshop.activity/WorkshopModel.py
index 22be6b5..fdfa21b 100644
--- a/activity/Workshop.activity/WorkshopModel.py
+++ b/activity/Workshop.activity/WorkshopModel.py
@@ -4,7 +4,7 @@ WorkshopModel
 This module is the model of the Workshop Activity
 """
 
-class WorkshopActivity():
+class WorkshopModel():
     def __init__(self,view):
         self.view = view
 
@@ -15,7 +15,7 @@ class WorkshopActivity():
 
         @param keyword the keyword for the query
         """
-            pass
+        pass
 
     def delete_tutorial(self,tutorial):
         """
@@ -60,7 +60,7 @@ class Tutorial():
     def __init__(self,metadata_dict):
         self.__original_dict = metadata_dict
         self.__update_dict = metadata_dict
-        if 'Description' in self.__orgininal_dict:
+        if 'Description' in self.__original_dict:
             self.__description = self.__original_dict['Description']
         else:
             self.__description = None
@@ -80,7 +80,7 @@ class Tutorial():
         else:
             self.__published_state = None
 
-        if 'TutorialId' in self._original_dict:
+        if 'TutorialId' in self.__original_dict:
             self.__id = original_state['TutorialId']
         else:
             self.__id = None
diff --git a/activity/tests/mocks.py b/activity/tests/mocks.py
new file mode 100644
index 0000000..fd3a49c
--- /dev/null
+++ b/activity/tests/mocks.py
@@ -0,0 +1,125 @@
+import WorkshopModel
+import WorkshopController
+import Workshop
+
+class ViewMock(Workshop.WorkshopView):
+    """
+    Mock for the Workshop View
+
+    This mock contains a call list in which the name of the called function are added in the order they were called
+    """
+    def __init__(self):
+        Workshop.WorkshopView.__init__(self)
+        self.__call_list =[]
+
+#method for handling the call list
+    def get_call_list(self):
+        return self.__call_list
+
+    def clear_call_list(self):
+        self.__call_list = []
+
+    call_list = property(get_call_list)
+
+#method from the WorkshopView
+    def set_tutorial_list(self,tutorial_list):
+        self.__call_list.append('set_tutorial_list')
+
+    def change_sorting(self,sorting_key):
+        self.__call_list.append('change_sorting')
+
+    def refresh_tutorial_info(self):
+        self.__call_list.append('refresh_tutorial_info')
+
+    def toggle_tutorial_publish(self,tutorial,published):
+        self.__call_list.append('toggle_tutorial_publish')
+
+    def display_detail(self,tutorial):
+        self.__call_list.append('display_detail')
+
+    def display_main_view(self):
+        self.__call_list.append('display_main_view')
+
+    def display_info_dialog(self,tutorial):
+        self.__call_list.append('display_info_dialog')
+
+class WorkshopControllerMock(WorkshopController.WorkshopController):
+    def __init__(self,view,model):
+        WorkshopController.WorkshopController.__init__(self,view,model)
+        self.__call_list =[]
+
+#method for handling the call list
+    def get_call_list(self):
+        return self.__call_list
+
+    def clear_call_list(self):
+        self.__call_list = []
+
+    call_list = property(get_call_list)
+
+#method from the WorkshopCOntroller
+    def tutorial_query(self,widget,keyword):
+        self.__call_list.append('tutorial_query')
+
+    def sort_selection_changed(self,widget,sort):
+        self.__call_list.append('sort_selection_changed')
+
+    def launch_tutorial_triggered(self,widget,tutorial):
+        self.__call_list.append('launch_tutorial_triggered')
+
+    def show_details(self,widget,tutorial):
+        self.__call_list.append('show_details')
+
+    def back_pressed(self,widget,data):
+        self.__call_list.append('back_pressed')
+
+    def edit_tutorial(self,widget,data):
+        self.__call_list.append('edit_tutorial')
+    
+    def rate_tutorial(self,widget,data):
+        self.__call_list.append('rate_tutorial')
+    
+    def update_tutorial(self,widget,tutorial):
+        self.__call_list.append('update_tutorial')
+            
+    def info_tutorial(self,widget,tutorial):
+        self.__call_list.append('info_tutorial')
+
+    def delete_tutorial(self,widget,tutorial):
+        self.__call_list.append('delete_tutorial')
+
+    def publish_tutorial(self,widget,tutorial):
+        self,__call_list.append('publish_tutorial')
+
+    def unpublish_tutorial(self,widget,tutorial):
+        self,__call_list.append('unpublish_tutorial')
+
+class WorkshopModelMock(WorkshopModel.WorkshopModel):
+    def __init__(self,view):
+        WorkshopModel.WorkshopModel(self,view)
+        self.__call_list =[]
+
+#method for handling the call list
+    def get_call_list(self):
+        return self.__call_list
+
+    def clear_call_list(self):
+        self.__call_list = []
+
+    call_list = property(get_call_list)
+
+
+    def query(self,keyword):
+        self.__call_list.append('query')
+
+    def delete_tutorial(self,tutorial):
+        self._call_list.append('delete_tutorial')
+
+    def update_tutorial_infos(self,tutorial,new_infos):
+        self.__call_list.append('update_tutorial_infos')
+
+    def publish_tutorial(self,tutorial):
+        self.__call_list.append('publish_tutorial')
+    
+    def unpublish_tutorial(self,tutorial):
+        self.__call_list.append('unpublish_tutorial')
diff --git a/activity/tests/run-tests.py b/activity/tests/run-tests.py
new file mode 100644
index 0000000..6eada11
--- /dev/null
+++ b/activity/tests/run-tests.py
@@ -0,0 +1,19 @@
+ACTIVITY_PATH = "../Workshop.activity/"
+
+import os, sys
+sys.path.insert(0,os.path.abspath(ACTIVITY_PATH))
+
+import unittest
+
+if __name__ == '__main__':
+    import WorkshopModel
+    import WorkshopController
+    import Workshop
+    import mocks
+
+
+    suite = unittest.TestSuite()
+    #suite.addTests(unittest.findTestCases())
+
+    runner = unittest.TextTestRunner()
+    runner.run(suite)