Changeset 74

Timestamp:

10/09/06 09:34:44 (2 years ago)

Author:

Jan-Klaas Kollhof

Message:

some work in experimental branch

Files:

• branches/experimental/jsolait/jsolait.js (modified) (2 diffs)
• branches/experimental/jsolait/jsolait.wsf (modified) (1 diff)
• branches/experimental/jsolait/lib/testing.js (modified) (1 diff)

branches/experimental/jsolait/jsolait.js

@@ -646 +646 @@
-            }
-        }else{
-
+
+
+
-        }
-    };
@@ -754 +756 @@
-            args.push(locals[key]);
-        }               
-
+
-        var modFn = new Function(argNames.join(","), source);
-            

branches/experimental/jsolait/jsolait.wsf

@@ -96 +96 @@
-            //get the base of the file to execute
-            var fileBase= fs.getParentFolderName(fileName);
-            
-            //make sure the search path is updated to include the fileBase
-            jsolait.moduleSearchURIs = [fileBase,  "%(baseURI)s/lib"];
-            
+            
+            //see if there are any jsolait config files in any of the parent folders
+            var parentFolder= fileBase;
+            while(parentFolder){
+                try{
+                    var src = jsolait.loadURI(parentFolder+'/.jsolait');
+                    try{
+                        var f = new Function('__baseURI__',src);
+                        f(parentFolder);
+                        break;
+                    }catch(e){
+                        print('error in .jsolait', parentFolder);
+                        break;
+                    }
+                }catch(e){
+                }
+                parentFolder=fs.getParentFolderName(parentFolder);
+            }
+
+
-            //change working dir to the file's location
-            //todo:is it OK to change cwd?

branches/experimental/jsolait/lib/testing.js

@@ -144 +144 @@
-
-/**
+    Tests a module by running each of the modules test_ methods;
+**/
+mod.testModule=function(modObj){
+    
+    for(var key in modObj){
+        if(key.slice(0,5)=='test_'){
+            print(mod.test(modObj.__name__+'.'+key, modObj[key]));
+        }
+    }
+};
+
+/**
-    Raised when an assertion fails.
-**/