Merge branch 'master' of git://git.sugarlabs.org/tutorius/simpoirs-clone

Conflicts:
	src/extensions/tutoriusremote.py
	tutorius/TProbe.py
	tutorius/creator.py

1 files changed, 42 insertions, 0 deletions

diff --git a/tests/constraintstests.py b/tests/constraintstests.py
index 4e19a92..a5ccf26 100644
--- a/tests/constraintstests.py
+++ b/tests/constraintstests.py
@@ -240,5 +240,47 @@ class FileConstraintTest(unittest.TestCase):
         except FileConstraintError:
             pass
 
+class ResourceConstraintTest(unittest.TestCase):
+    def test_valid_names(self):
+        name1 = "file_" + unicode(uuid.uuid1()) + ".png"
+        name2 = unicode(uuid.uuid1()) + "_" + unicode(uuid.uuid1()) + ".extension"
+        name3 = "/home/user/.sugar/_random/new_image1231_" + unicode(uuid.uuid1()).upper() + ".mp3"
+        name4 = "a_" + unicode(uuid.uuid1())
+        name5 = ""
+    
+        cons = ResourceConstraint()
+        
+        # All of those names should pass without exceptions
+        cons.validate(name1)
+        cons.validate(name2)
+        cons.validate(name3)
+        cons.validate(name4)
+        cons.validate(name5)
+
+    def test_invalid_names(self):
+        bad_name1 = ".jpg"
+        bad_name2 = "_.jpg"
+        bad_name3 = "_" + unicode(uuid.uuid1())
+
+        cons = ResourceConstraint()
+        
+        try:
+            cons.validate(bad_name1)
+            assert False, "%s should not be a valid resource name" % bad_name1
+        except ResourceConstraintError:
+            pass
+
+        try:
+            cons.validate(bad_name2)
+            assert False, "%s should not be a valid resource name" % bad_name2
+        except ResourceConstraintError:
+            pass
+
+        try:
+            cons.validate(bad_name3)
+            assert False, "%s should not be a valid resource name" % bad_name3
+        except ResourceConstraintError:
+            pass
+
 if __name__ == "__main__":
     unittest.main()