Changeset 91

Timestamp:

07/10/04 16:25:22 (9 years ago)

Author:

tim

Message:

got the tests working from inside yaml.tests

Location:

trunk/yaml

Files:

• klass.py (modified) (1 diff)
• tests/TestingSuite (copied) (copied from trunk/tests/TestingSuite)
• tests/YamlTest.py (copied) (copied from trunk/tests/YamlTest.py)
• tests/here.py (copied) (copied from trunk/tests/here.py)
• tests/test.py (copied) (copied from trunk/tests/test.py)
• tests/testClasses.py (modified) (2 diffs)
• tests/testPullParser.py (modified) (1 diff)
• tests/testQuery.py (modified) (1 diff)
• tests/testValidatingParser.py (modified) (1 diff)
• tests/testYpath.py (modified) (1 diff)

trunk/yaml/klass.py

@@ -4 +4 @@
 class DefaultResolver:
     def resolveType(self, data, typestring):
-        match = re.match('!!(.*?)\.(.*)', typestring)
-        if not match:
+        match = re.match('!!(.*)\.(.*?)', typestring)
+        moduleName = '.'.join(typestring.split('.')[:-1])
+        className = typestring.split('.')[-1]
+        if moduleName == '' or className == '':
             raise "Invalid private type specifier"
-        (modname, classname) = match.groups()
-        return makeClass(modname, classname, data)
+        (moduleName, classname) = match.groups()
+        return makeClass(moduleName, className, data)
 
 def makeClass(module, classname, dict):

trunk/yaml/tests/testClasses.py

@@ -17 +17 @@
 def simpleObjectYaml():
     return flushLeft("""
-        --- !!__main__.SimpleObject
+        --- !!yaml.tests.testClasses.SimpleObject
         x: 100
         y: 20
@@ -123 +123 @@
         """
         yamlData = flushLeft("""
-            --- !!__main__.TestConfig
+            --- !!yaml.tests.testClasses.TestConfig
             tester: showell
             hitcount: 42

trunk/yaml/tests/testPullParser.py

@@ -2 +2 @@
 from here import flushLeft
 from test import assertEquals
-from TestPushDumper import mockEvents
+from testPushDumper import mockEvents
 from yaml import load
 

trunk/yaml/tests/testQuery.py

@@ -60 +60 @@
 class Test(YamlTest.YamlTest):
     def testQuery(self):
-        doc = yaml.loadFile("TestQueryData.yml").next()
+        doc = yaml.loadFile("./yaml/tests/testQueryData.yml").next()
         for test in doc['tests']:
             if not test.has_key('ignore'):

trunk/yaml/tests/testValidatingParser.py

@@ -2 +2 @@
 from here import flushLeft
 from test import assertEquals, assertError
-from TestPullParser import mockParser, Loader
+from testPullParser import mockParser, Loader
 from yaml import load
 

trunk/yaml/tests/testYpath.py

@@ -6 +6 @@
     def testYpath(self):
         try:    
-            for test in yaml.loadFile("./TestingSuite/ypath.yml"):
+            for test in yaml.loadFile("./yaml/tests/TestingSuite/ypath.yml"):
                 if not test.has_key('ignore'):
                     expr = test['ypath']