Changeset 8

Timestamp:

10/20/05 18:05:13 (3 years ago)

Author:

Jan-Klaas Kollhof

Message:

added some unit testing to testing module, improved supr handling(reverted to old version, some changes to exception class

Files:

• jsolait/trunk/jsolait/jsolait.js (modified) (8 diffs)
• jsolait/trunk/jsolait/jsolait.wsf (modified) (1 diff)
• jsolait/trunk/jsolait/lib/jsonrpc.js (modified) (3 diffs)
• jsolait/trunk/jsolait/lib/lang.js (modified) (4 diffs)
• jsolait/trunk/jsolait/lib/sets.js (modified) (3 diffs)
• jsolait/trunk/jsolait/lib/testing.js (modified) (2 diffs)
• jsolait/trunk/jsolait/lib/urllib.js (modified) (3 diffs)
• jsolait/trunk/jsolait/lib/xml.js (modified) (2 diffs)
• jsolait/trunk/jsolait/lib/xmlrpc.js (modified) (4 diffs)

jsolait/trunk/jsolait/jsolait.js

@@ -171 +171 @@
-        }
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    //execute the scope of the class
-
+
+
+
+
+
+
+
+
+
-    return NewClass;
-};    
+
-Class.toString = function(){
-    return "[object Class]";
-};
+
-Class.__createProto__=function(){ 
-    throw "Can't use Class as a super class.";
@@ -262 +242 @@
-    throw "Can't use Module as a super class.";
-};
+
+    
-/**
-    Base class for all module-Exceptions.
@@ -275 +257 @@
-    publ.__init__=function(msg, trace){
-        this.name = this.constructor.__name__;
-
+''+
-        this.trace = trace;
-    };
-    
+    
-    publ.toString=function(){
-
-
+
-        return s;
-    };
@@ -288 +270 @@
-        @return The error trace.
-    **/
-
-
-
-
+
+
+
+
+
-        if(this.trace){
-            if(this.trace.toTraceString){
- this.trace.toTraceString(
+'\n\n'+ this.trace.toTraceString(indent + 8
-            }else{
- this.trace + 'sdfsdf'
+(this.trace +'\n').indent(indent)
-            }
-        }
-        return s;
-    };
+    
+   
-    
-    ///The name of the Exception.
@@ -322 +307 @@
-    **/
-    publ.__init__=function(module, trace){
-(this).__init__(
+.__init__.call(this, 
-        this.failedModule = module;
-    };
@@ -426 +411 @@
-        **/
-        publ.__init__=function(sourceURI, trace){
-(this).__init__(
+.__init__.call(this, 
-            this.sourceURI = sourceURI;
-        };
@@ -504 +489 @@
-        **/
-        publ.__init__=function(moduleName, moduleURIs, trace){
-(this).__init__(
+.__init__.call(this, 
-            this.moduleName = moduleName;
-            this.moduleURIs = moduleURIs;
@@ -761 +746 @@
-        return s;
-    };
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    ///Tests the module.
-    mod.test=function(){

jsolait/trunk/jsolait/jsolait.wsf

@@ -159 +159 @@
-                        if(modl.__main__){
-                            //todo find arguments
-
+
+
+
+
+
-                        }
-                        return;

jsolait/trunk/jsolait/lib/jsonrpc.js

@@ -37 +37 @@
-        */
-        publ.__init__= function(status){
-(this).__init__(
+.__init__.call(this, 
-            this.status = status;
-        };
@@ -55 +55 @@
-        */
-        publ.__init__= function(msg, s, trace){
-(this).__init__(
+.__init__.call(this, 
-            this.source = s;
-        };
@@ -71 +71 @@
-        */
-        publ.__init__= function(err, trace){
-(this).__init__(
+.__init__.call(this, 
-        };
-    });

jsolait/trunk/jsolait/lib/lang.js

@@ -384 +384 @@
-        
-        publ.__init__=function(s, globalNode){
-(this).__init__(
+.__init__.call(this, 
-            globalNode = globalNode === undefined ? new mod.GlobalNode() : globalNode;
-            this.currentNode=globalNode;
@@ -1011 +1011 @@
-    mod.Compressor=Class(mod.Tokenizer, function(publ,supr){
-        publ.__init__=function(source){
-(this).__init__(
+.__init__.call(this, 
-            this.wsNeeded=false;
-        };
@@ -1166 +1166 @@
-    mod.__main__=function(){
-        //var s='switch(a){\n case "as":\n\na=2;\nbreak;case "df":\nbreak;   } a.';
-
+t
-        var filenames= ['jsolait.js', 
-                'lib/codecs.js',  
@@ -1202 +1202 @@
-});
-
+
+

jsolait/trunk/jsolait/lib/sets.js

@@ -56 +56 @@
-                iterable = iterable.split("");
-            }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        };
-        
@@ -164 +174 @@
-        };
-        
+        publ.__equals__=function(setObj){
+            if(setObj instanceof publ.constructor){
+                return this.equals(setObj);
+            }else{
+                return false;
+            }
+        };
+        
-        /**
-            Creates a new set containing all elements of set and setObj (newSet = set | setObj).
@@ -309 +327 @@
-    
-    mod.__main__=function(){
-
-
-
-
-
-
-
-
-
+
-        
-        var s1=new mod.Set("0123456");
-        var s2=new mod.Set("3456789");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    };
-});

jsolait/trunk/jsolait/lib/testing.js

@@ -47 +47 @@
-    };
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    };
-    
+    mod.AssertFailed=Class(mod.Exception, function(publ,supr){
+        publ.__init__=function(comment, failMsg){
+            this.failMessage = failMsg;
+            this.comment = comment;
+            supr.__init__.call(this, "%s failed: %s".format(comment, failMsg));
+        }
+    });
+    
+    mod.assert=function(comment, value, failMsg){
+        if(typeof comment == 'boolean'){
+            failMsg=value;
+            value = comment;
+            comment ='';
+        }
+        
+        if(value!==true){
+            throw new mod.AssertFailed(comment, failMsg===undefined ? "Expected true but found: %s".format(value) : failMsg);
+        }
+    }
+    
+    mod.assertTrue=function(comment, value){
+        if(arguments.length==1){
+            value = comment;
+            comment ='';
+        }
+        mod.assert(comment, value===true, "Expected true but found: %s".format(value));            
+    }
+    
+    mod.assertFalse=function(comment, value){
+        if(arguments.length==1){
+            value = comment;
+            comment ='';
+        }
+        mod.assert(comment, value===false, "Expected false but found: %s".format(value));            
+    }
+    
+    mod.assertEquals=function(comment, value1, value2){
+        if(arguments.length==2){
+            value2=value1;
+            value1 = comment;
+            comment ='';
+        }
+        if((value1 != null) && (value1.__equals__) || ((value2 != null) && (value2.__equals__))){
+            mod.assert(comment, value1.__equals__(value2), "Expected (using __equals__) %s === %s.".format(value1, value2));            
+        }else{
+            mod.assert(comment, value1  === value2, "Expected %s === %s.".format(value1, value2));            
+        }
+    }
+    
+    mod.assertNotEquals=function(comment, value1, value2){
+        if(arguments.length==2){
+            value2=value1;
+            value1 = comment;
+            comment ='';
+        }
+        if((value1 != null) && (value1.__equals__) || ((value2 != null) && (value2.__equals__))){
+            mod.assert(comment, ! value1.__equals__(value2), "Expected (using __equals__) %s !== %s.".format(value1, value2));            
+        }else{
+            mod.assert(comment, value1  !== value2, "Expected %s !== %s.".format(value1, value2));            
+        }
+    }
+    
+    mod.assertNull=function(comment, value){
+        if(arguments.length==1){
+            value = comment;
+            comment ='';
+        }
+        mod.assert(comment, value===null, "Expected %s === null.".format(value));
+    }
+    
+    mod.assertNotNull=function(comment, value){
+        if(arguments.length==1){
+            value = comment;
+            comment ='';
+        }
+        mod.assert(comment, value !==null, "Expected %s !== null.".format(value));
+    }
+    
+    mod.assertUndefined=function(comment, value){
+        if(arguments.length==1){
+            value = comment;
+            comment ='';
+        }
+        mod.assert(comment, value===undefined, "Expected %s === undefined.".format(value));
+    }
+    
+    mod.assertNotUndefined=function(comment, value){
+        if(arguments.length==1){
+            value = comment;
+            comment ='';
+        }
+        mod.assert(comment, value!==undefined, "Expected %s !== undefined".format(value));
+    }
+    
+    mod.assertNaN=function(comment, value){
+        if(arguments.length==1){
+            value = comment;
+            comment ='';
+        }
+        mod.assert(comment, isNaN(value)===true, "Expected %s === NaN.".format(value));
+    }
+    
+    mod.assertNotNaN=function(comment, value){
+        if(arguments.length==1){
+            value = comment;
+            comment ='';
+        }
+        mod.assert(comment, isNaN(value)!==true, "Expected %s !== NaN".format(value));
+    }
+    
+    mod.fail=function(){
+        
+    }
+        
-    mod.objectKeys=function(obj){
-        var keys=[];
@@ -84 +207 @@
-        return keys;
-    };
+    
+    mod.__main__=function(){
+        print(mod.test(function(){
+            mod.assert(true);
+            mod.assertTrue(true);
+            mod.assertFalse(false);
+            mod.assertNull(null);
+            mod.assertNotNull(undefined);
+            mod.assertNotNull('');
+            mod.assertNotNull({});
+            mod.assertNotNull(0);
+            mod.assertUndefined(undefined);
+            mod.assertNotUndefined(null);
+            mod.assertNaN(NaN);
+            mod.assertNotNaN(435);
+            mod.assertEquals(1,1);
+            mod.assertEquals("a","a");
+            mod.assertEquals(null,null);
+            mod.assertEquals(undefined,undefined);
+            mod.assertEquals(mod,mod);
+            mod.assertNotEquals(1,2);
+            mod.assertNotEquals(null,undefined);
+            mod.assertNotEquals(mod,{});
+        }));
+    }
-});
+
+

jsolait/trunk/jsolait/lib/urllib.js

@@ -36 +36 @@
-        */
-        publ.__init__=function(trace){
-(this).__init__(
+.__init__.call(this, 
-        };
-    });
@@ -49 +49 @@
-        */
-        publ.__init__=function(trace){
-(this).__init__(
+.__init__.call(this, 
-        };
-    });
@@ -62 +62 @@
-        */
-        publ.__init__ = function(trace){
-(this).__init__(
+.__init__.call(this, 
-        };
-    });

jsolait/trunk/jsolait/lib/xml.js

@@ -41 +41 @@
-        */
-        publ.__init__=function(trace){
-(this).__init__(
+.__init__.call(this, 
-        };
-    });
@@ -54 +54 @@
-        */
-        publ.__init__=function(xml,trace){
-(this).__init__(
+.__init__.call(this, 
-            this.xml = xml;
-        };

jsolait/trunk/jsolait/lib/xmlrpc.js

@@ -39 +39 @@
-        */
-        publ.__init__= function(status){
-(this).__init__(
+.__init__.call(this, 
-            this.status = status;
-        };
@@ -57 +57 @@
-        */
-        publ.__init__= function(msg, xml, trace){
-(this).__init__(
+.__init__.call(this, 
-            this.xml = xml;
-        };
@@ -73 +73 @@
-        */
-        publ.__init__= function(faultCode, faultString){
-(this).__init__(
+.__init__.call(this, 
-            this.faultCode = faultCode;
-            this.faultString = faultString;
@@ -812 +812 @@
-
-
-test
+__main__
-        var s = new mod.ServiceProxy("http://jsolait.net/test.py",['echo']);
-        print("creating ServiceProxy object using introspection for method construction...\n");