testcases showing the failing expression

programming-nu · Mar 29, 2012 · d318d45 · d318d45
1 parent 7024383
commit d318d45
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/nu/nu.nu b/nu/nu.nu
@@ -116,7 +116,7 @@
                     (if (not (eval expression))
                         (then (throw ((NSException alloc)
                                       initWithName:"NuAssertionFailure"
-                                      reason:(expression stringValue)
+                                      reason:,(*body stringValue)
                                       userInfo:nil)))))))
 
 ;; Allows mapping a function over multiple lists.

diff --git a/nu/test.nu b/nu/test.nu
@@ -42,8 +42,11 @@
 
      ;; By overriding this method, we detect each time a class is defined in Nu that inherits from this class.
      (+ (id) inheritedByClass:(id) testClass is
-        (unless $testClasses (set $testClasses (NSMutableSet set)))
-        ($testClasses addObject:testClass))
+	 (unless $testClasses (set $testClasses (NSMutableSet set)))
+	 ;; we need to check for the existence of testClass because reloading
+	 ;; a file with a class definition will call this again but with nil
+	 (if (testClass)
+	      $testClasses addObject:testClass))
 
      ;; The setup method is called before each test case is executed.
      ;; The default implementation does nothing.