Add setup and tearDown methods that will be automatically called befo…

…re and after each test. Also add expected and actual values to Fail message.
kris-dey · Jun 14, 2013 · 1a4319a · 1a4319a
1 parent 433a288
commit 1a4319a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 21 deletions.
diff --git a/dist/builtin.js b/dist/builtin.js
diff --git a/src/lib/unittestgui/__init__.py b/src/lib/unittestgui/__init__.py
@@ -25,13 +25,23 @@ def __init__(self):
                 self.testlist.append(getattr(self,name))
                 testNames[name]=True
 
+    def setup(self):
+        pass
+
+    def tearDown(self):
+        pass
+
     def main(self):
         l = document.createElement('ul')
         self.resdiv.appendChild(l)
         self.resList = l
+
+
         for func in self.testlist:
             try:
+                self.setup()
                 func(self)
+                self.tearDown()
             except:
                 self.appendResult('Error')
                 self.numFailed += 1
@@ -40,84 +50,84 @@ def main(self):
 
     def assertEqual(self, actual, expected, feedback=""):
         res = actual==expected
-        self.appendResult(res,feedback)
+        self.appendResult(res,actual,expected, feedback)
 
     def assertNotEqual(actual, expected, feedback=""):
         res = actual != expected
-        self.appendResult(res,feedback)
+        self.appendResult(res,actual,expected,feedback)
 
     def assertTrue(self,x, feedback=""):
         res = x
-        self.appendResult(res,feedback)
+        self.appendResult(res,x,True,feedback)
 
     def assertFalse(self,x, feedback=""):
         res = not x
-        self.appendResult(res,feedback)
+        self.appendResult(res,x,False,feedback)
 
     def assertIs(self,a,b, feedback=""):
         res = a is b
-        self.appendResult(res,feedback)
+        self.appendResult(res,a,b,feedback)
 
     def assertIsNot(self,a,b, feedback=""):
         res = a is not b
-        self.appendResult(res,feedback)
+        self.appendResult(res,a,b,feedback)
 
     def assertIsNone(self,x, feedback=""):
         res = x is None
-        self.appendResult(res,feedback)
+        self.appendResult(res,x,None,feedback)
 
     def assertIsNotNone(self,x, feedback=""):
         res = x is not None
-        self.appendResult(res,feedback)
+        self.appendResult(res,x,None,feedback)
 
     def assertIn(self,a,b, feedback=""):
         res = a in b
-        self.appendResult(res,feedback)
+        self.appendResult(res,a,b,feedback)
 
     def assertNotIn(self,a,b, feedback=""):
         res = a not in b
-        self.appendResult(res,feedback)
+        self.appendResult(res,a,b,feedback)
 
     def assertIsInstance(self,a,b, feedback=""):
         res = isinstance(a,b)
-        self.appendResult(res,feedback)
+        self.appendResult(res,a,b,feedback)
 
     def assertNotIsInstance(self,a,b, feedback=""):
         res = not isinstance(a,b)
-        self.appendResult(res,feedback)
+        self.appendResult(res,a,b,feedback)
 
     def assertAlmostEqual(self,a,b, feedback=""):
         res = round(a-b,7) == 0
-        self.appendResult(res,feedback)
+        self.appendResult(res,a,b,feedback)
 
     def assertNotAlmostEqual(self,a,b, feedback=""):
         res = round(a-b,7) != 0
-        self.appendResult(res,feedback)
+        self.appendResult(res,a,b,feedback)
 
     def assertGreater(self,a,b, feedback=""):
         res = a > b
-        self.appendResult(res,feedback)
+        self.appendResult(res,a,b,feedback)
 
     def assertGreaterEqual(self,a,b, feedback=""):
         res = a >= b
-        self.appendResult(res,feedback)
+        self.appendResult(res,a,b,feedback)
 
     def assertLess(self,a,b, feedback=""):
         res = a < b
-        self.appendResult(res,feedback)
+        self.appendResult(res,a,b,feedback)
 
     def assertLessEqual(self,a,b, feedback=""):
         res = a <= b
-        self.appendResult(res,feedback)
+        self.appendResult(res,a,b,feedback)
 
-    def appendResult(self,res,feedback):
+    def appendResult(self,res,actual,expected,feedback):
         if res == 'Error':
             msg = 'Error'
         elif res:
             msg = 'Pass'
             self.numPassed += 1
         else:
-            msg = 'Fail:  ' + feedback
+            msg = 'Fail: expected %s got %s' % (str(actual),str(expected)) + feedback
             self.numFailed += 1
 
         pTag = document.createElement('li')