Merge of jc and origin jc

Merge branch 'jc' of ssh://bobthebuilder.mine.nu:8080/home/git into jc

Conflicts:

	source/external/source/sugar-toolkit/src/sugar/activity/activity.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/Makefile.am
	source/external/source/sugar-toolkit/src/sugar/tutorius/bundler.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py

2 files changed, 69 insertions, 24 deletions

diff --git a/src/sugar/tutorius/tests/bundlertests.py b/src/sugar/tutorius/tests/bundlertests.py
new file mode 100644
index 0000000..8da2310
--- /dev/null
+++ b/src/sugar/tutorius/tests/bundlertests.py
@@ -0,0 +1,65 @@
+# Copyright (C) 2009, Tutorius.org
+# Copyright (C) 2009, Charles-Etienne Carriere <iso.swiffer@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+"""
+Bundler tests
+
+This module contains all the tests for the storage mecanisms for tutorials
+This mean testing savins and loading tutorial, .ini file management and
+adding ressources to tutorial
+"""
+
+import unittest
+import os
+import uuid
+
+from sugar.tutorius import bundler
+
+class TutorialBundlerTests(unittest.TestCase):
+    
+    def setUp(self):
+        
+        #generate a test GUID
+        self.test_guid = uuid.uuid1()
+        self.guid_path = os.path.join(bundler._get_store_root(),str(self.test_guid))
+        os.mkdir(self.guid_path)
+        
+        self.ini_file = os.path.join(self.guid_path, "meta.ini")
+        
+        f = open(self.ini_file,'w')
+        f.write("[GENERAL_METADATA]")
+        f.write(os.linesep)
+        f.write("GUID:")
+        f.write(str(self.test_guid))
+        f.close()
+        
+    def tearDown(self):
+        os.remove(self.ini_file)
+        os.rmdir(self.guid_path)
+        
+    def test_add_ressource(self):
+        bund = bundler.TutorialBundler(self.test_guid)
+
+        temp_file = open("test.txt",'w')
+        temp_file.write('test')
+        temp_file.close()
+
+        bund.add_resource("test.txt")
+        
+        assert os.path.exists(os.path.join(self.guid_path,"test.txt")), "add_ressource did not create the file"
+        
+if __name__ == "__main__":
+    unittest.main()
\ No newline at end of file
diff --git a/src/sugar/tutorius/tests/run-tests.py b/src/sugar/tutorius/tests/run-tests.py
index 2e200c2..0c9219b 100755
--- a/src/sugar/tutorius/tests/run-tests.py
+++ b/src/sugar/tutorius/tests/run-tests.py
@@ -10,17 +10,10 @@ sys.path.insert(0,
 )
 
 FULL_PATH = os.path.join(INSTALL_PATH,"sugar/tutorius")
-SUBDIRS = ["uam"]
 GLOB_PATH = os.path.join(FULL_PATH,"*.py")
 import unittest
 from glob import glob
 
-def report_files():
-    ret = glob(GLOB_PATH)
-    for dir in SUBDIRS:
-        ret += glob(os.path.join(FULL_PATH,dir,"*.py"))
-    return ret
-
 import sys
 if __name__=='__main__':
     if "--coverage" in sys.argv:
@@ -35,38 +28,25 @@ if __name__=='__main__':
         import gtkutilstests
         import overlaytests
         import linear_creatortests
-        import actiontests
-        import uamtests
-        import filterstests
-        import constraintstests
-        import propertiestests
-
+        import serializertests
+        
         suite = unittest.TestSuite()
         suite.addTests(unittest.findTestCases(coretests))
         suite.addTests(unittest.findTestCases(servicestests))
         suite.addTests(unittest.findTestCases(gtkutilstests))
         suite.addTests(unittest.findTestCases(overlaytests))
         suite.addTests(unittest.findTestCases(linear_creatortests))
-        suite.addTests(unittest.findTestCases(actiontests))
-        suite.addTests(unittest.findTestCases(uamtests))
-        suite.addTests(unittest.findTestCases(filterstests))
-        suite.addTests(unittest.findTestCases(constraintstests))
-        suite.addTests(unittest.findTestCases(propertiestests))
-
+        suite.addTests(unittest.findTestCases(serializertests))	
         
         runner = unittest.TextTestRunner()
         runner.run(suite)
         coverage.stop()
-        coverage.report(report_files())
+        coverage.report(glob(GLOB_PATH))
         coverage.erase()
     else:
         from coretests import *
         from servicestests import *
         from gtkutilstests import *
         from overlaytests import *
-        from actiontests import *
-        from linear_creatortests import *
-        from uamtests import *
-        from filterstests import *
 
         unittest.main()