From 7aad5a2f6a93ae3385794f94f8b175c243165532 Mon Sep 17 00:00:00 2001
From: JCTutorius <charlie@tutorius-dev.(none)>
Date: Fri, 06 Nov 2009 02:21:08 +0000
Subject: Made change after Charlie code review.

---
(limited to 'tests')

diff --git a/tests/vaulttests.py b/tests/vaulttests.py
index 5fdb7f9..e45adcb 100644
--- a/tests/vaulttests.py
+++ b/tests/vaulttests.py
@@ -305,33 +305,7 @@ class VaultInterfaceTest(unittest.TestCase):
                 
         # If false, new metadata hasn't been found in the vault
         assert new_metadata_found == True, 'Modified metadata not found in the vault'
-        
-        
-    def test_get_tutorial_archive(self):
-        """
-        This test verify that the vault interface function get_tutorial_archive zip a tutorial and
-        return the zipped archive object succesfully.
-        """
-        # Create and save a tutorial
-        tutorial = Tutorial('test')
-        Vault.saveTutorial(tutorial, self.test_metadata_dict)
-        
-        bundler = TutorialBundler(self.save_test_guid)
-        
-        # Test get_tutorial_archive()
-        archive_object = Vault.get_tutorial_archive(self.save_test_guid)
-        
-        # Write the archive data as a new file
-        zip_path = str(self.save_test_guid) + '_test_.zip'
-        file = open(zip_path, 'wt')
-        file.write(archive_object)
-        file.close()
-        
-        # Test if new zip is valid
-        assert zipfile.is_zipfile(zip_path)
-        # Remove test file
-        os.remove(zip_path)
-        
+    
         
     def test_add_delete_get_path_resource(self):
         """
@@ -347,8 +321,6 @@ class VaultInterfaceTest(unittest.TestCase):
         resource_file = open(file_path, 'wt')
         resource_file.write('test')
         resource_file.close()
-        #image_path = os.path.join(os.getcwd(), 'tests', 'resources', 'icon.svg')
-        #assert os.path.isfile(image_path), 'cannot find the test image file'
 
         # Create and save a tutorial
         tutorial = Tutorial('test')
@@ -375,7 +347,44 @@ class VaultInterfaceTest(unittest.TestCase):
         
         # Check that the resource is not in the vault anymore
         assert os.path.isfile(os.path.join(tuto_path, 'resources', resource_id)) == False, 'image file found in vault when it should have been deleted.'
+    
+    def test_get_tutorial_archive(self):
+        """
+        This test verify that the vault interface function get_tutorial_archive zip a tutorial and
+        return the zipped archive object succesfully.
+        """
+        # Create and save a tutorial
+        tutorial = Tutorial('test')
+        Vault.saveTutorial(tutorial, self.test_metadata_dict)
+        
+        bundler = TutorialBundler(self.save_test_guid)
+        
+        # Add test ressources to the tutorial
+        test_path = os.path.join(os.getenv("HOME"),".sugar", 'default', 'tutorius', 'tmp')
+        if os.path.isdir(test_path) == True:
+            shutil.rmtree(os.path.join(os.getenv("HOME"),".sugar", 'default', 'tutorius', 'tmp'))
+        os.makedirs(test_path)
+        file_path = os.path.join(test_path, 'test_resource.svg')
+        resource_file = open(file_path, 'wt')
+        resource_file.write('test')
+        resource_file.close()
         
+        resource_id = Vault.add_resource(self.save_test_guid, file_path)
+        
+        # Test get_tutorial_archive()
+        archive_object = Vault.get_tutorial_archive(self.save_test_guid)
+        
+        # Write the archive data as a new file
+        zip_path = str(self.save_test_guid) + '_test_.zip'
+        file = open(zip_path, 'wt')
+        file.write(archive_object)
+        file.close()
+        
+        # Test if new zip is valid
+        assert zipfile.is_zipfile(zip_path)
+        # Remove test file
+        os.remove(zip_path)
+            
         
     
     def tearDown(self):
--
cgit v0.9.1