Changeset 8652 for trunk/UnitTestContrib/lib/Unit/TestCase.pm

Timestamp:

08/22/10 15:07:44 (21 months ago)

Author:

MichaelTempest

Message:

Item2286: Give more helpful error messages

File:

• trunk/UnitTestContrib/lib/Unit/TestCase.pm (modified) (6 diffs)

trunk/UnitTestContrib/lib/Unit/TestCase.pm

@@ -266 +266 @@
 sub assert_str_equals {
     my ( $this, $expected, $got, $mess ) = @_;
-    $this->assert_not_null($expected);
-    $this->assert_not_null($got);
+    $this->assert_not_null( $expected, "Expected value may not be null" );
+    $this->assert_not_null( $got,
+        $mess || "Expected:'$expected'\n But got null value\n" );
     $this->assert( $expected eq $got,
         $mess || "Expected:'$expected'\n But got:'$got'\n" );
@@ -282 +283 @@
 sub assert_str_not_equals {
     my ( $this, $expected, $got, $mess ) = @_;
-    $this->assert_not_null($expected);
-    $this->assert_not_null($got);
+    $this->assert_not_null($expected, "Expected value may not be null");
+    $this->assert_not_null( $got,
+        $mess || "Expected:'$expected'\n But got null value\n" );
     $this->assert( $expected ne $got,
         $mess || "Expected:'$expected'\n And got:'$got'\n" );
@@ -298 +300 @@
 sub assert_num_equals {
     my ( $this, $expected, $got, $mess ) = @_;
-    $this->assert_not_null($expected);
-    $this->assert_not_null($got);
+    $this->assert_not_null( $expected, "Expected value may not be null" );
+    $this->assert_not_null( $got,
+        $mess || "Expected:'$expected'\n But got null value\n" );
     $this->assert( $expected == $got,
         $mess || "Expected:'$expected'\n But got:'$got'\n" );
@@ -314 +317 @@
 sub assert_num_not_equals {
     my ( $this, $expected, $got, $mess ) = @_;
-    $this->assert_not_null($expected);
-    $this->assert_not_null($got);
+    $this->assert_not_null( $expected, "Expected value may not be null" );
+    $this->assert_not_null( $got,
+        $mess || "Expected:'$expected'\n But got null value\n" );
     $this->assert( $expected != $got,
         $mess || "Expected:'$expected'\n But got:'$got'\n" );
@@ -330 +334 @@
 sub assert_matches {
     my ( $this, $expected, $got, $mess ) = @_;
-    $this->assert_not_null($expected);
-    $this->assert_not_null($got);
+    $this->assert_not_null( $expected, "Expected value may not be null" );
+    $this->assert_not_null( $got,
+        $mess || "Expected:'$expected'\n But got null value\n" );
     if ( $] < 5.010 ) {
 
@@ -358 +363 @@
 sub assert_does_not_match {
     my ( $this, $expected, $got, $mess ) = @_;
-    $this->assert_not_null($expected);
-    $this->assert_not_null($got);
+    $this->assert_not_null( $expected, "Expected value may not be null" );
+    $this->assert_not_null( $got,
+        $mess || "Expected:'$expected'\n But got null value\n" );
     if ( $] < 5.010 ) {