Changeset 2298 for trunk/modules/unit_test/libraries/Unit_Test.php

Timestamp:

03/13/2008 01:39:56 AM (10 months ago)

Author:

Geert

Message:

Fix #483

Files:

• trunk/modules/unit_test/libraries/Unit_Test.php (modified) (2 diffs)

trunk/modules/unit_test/libraries/Unit_Test.php

@@ -114 +114 @@
                                         $object = new $class;
 
-                                        // Run setup method
-                                        if ($setup === TRUE)
-                                        {
-                                                $object->setup();
-                                        }
-
-                                        // Run the actual test
                                         try
                                         {
+                                                // Run setup method
+                                                if ($setup === TRUE)
+                                                {
+                                                        $object->setup();
+                                                }
+
+                                                // Run the actual test
                                                 $object->$method_name();
+
+                                                // Run teardown method
+                                                if ($teardown === TRUE)
+                                                {
+                                                        $object->teardown();
+                                                }
 
                                                 // Test passed
@@ -142 +148 @@
                                         }
 
-                                        // Run teardown method
-                                        if ($teardown === TRUE)
-                                        {
-                                                $object->teardown();
-                                        }
-
                                         // Cleanup
                                         unset($object);