add 'markTestSkipped' method to test suite, improves report

remicollet · remicollet · commit deca4fa30c07 · 2012-09-01T09:49:11.000+02:00
diff --git a/tests/TestRedis.php b/tests/TestRedis.php
@@ -389,7 +389,7 @@ public function testIncrByFloat()
     {
 	// incrbyfloat is new in 2.6.0
 	if (version_compare($this->version, "2.5.0", "lt")) {
-		return;
+		$this->markTestSkipped();
 	}
 
 	$this->redis->delete('key');
@@ -1632,7 +1632,7 @@ public function testInfoCommandStats() {
 
 	// INFO COMMANDSTATS is new in 2.6.0
 	if (version_compare($this->version, "2.5.0", "lt")) {
-		return;
+		$this->markTestSkipped();
 	}
 
 	$info = $this->redis->info("COMMANDSTATS");
@@ -2988,7 +2988,7 @@ private function checkSerializer($mode) {
     public function testDumpRestore() {
 
 		if (version_compare($this->version, "2.5.0", "lt")) {
-			return;
+			$this->markTestSkipped();
 		}
 
     	$this->redis->del('foo');
@@ -3053,7 +3053,7 @@ private function array_diff_recursive($aArray1, $aArray2) {
     public function testScript() {
 
 		if (version_compare($this->version, "2.5.0", "lt")) {
-			return;
+			$this->markTestSkipped();
 		}
 
 		// Flush any scripts we have
@@ -3085,7 +3085,7 @@ public function testScript() {
     public function testEval() {
 
 		if (version_compare($this->version, "2.5.0", "lt")) {
-			return;
+			$this->markTestSkipped();
 		}
 
     	// Basic single line response tests
@@ -3203,7 +3203,7 @@ public function testEval() {
     public function testEvalSHA() {
 
 		if (version_compare($this->version, "2.5.0", "lt")) {
-			return;
+			$this->markTestSkipped();
 		}
 
     	// Flush any loaded scripts
@@ -3301,7 +3301,7 @@ public function testReconnectSelect() {
 	public function testTime() {
 
 		if (version_compare($this->version, "2.5.0", "lt")) {
-			return;
+			$this->markTestSkipped();
 		}
 
 		$time_arr = $this->redis->time();
diff --git a/tests/test.php b/tests/test.php
@@ -4,6 +4,7 @@
 class TestSuite {
 
 	public static $errors = array();
+	public static $warnings = array();
 
 	protected function assertFalse($bool) {
 		$this->assertTrue(!$bool);
@@ -14,7 +15,6 @@ protected function assertTrue($bool) {
 			return;
 
 		$bt = debug_backtrace(false);
-		$count = count($bt);
 		self::$errors []= sprintf("Assertion failed: %s:%d (%s)\n",
 			$bt[0]["file"], $bt[0]["line"], $bt[1]["function"]);
 	}
@@ -24,12 +24,19 @@ protected function assertEquals($a, $b) {
 			return;
 
 		$bt = debug_backtrace(false);
-		$count = count($bt);
 		self::$errors []= sprintf("Assertion failed (%s !== %s): %s:%d (%s)\n",
 			print_r($a, true), print_r($b, true),
 			$bt[0]["file"], $bt[0]["line"], $bt[1]["function"]);
 	}
 
+	protected function markTestSkipped($msg='') {
+		$bt = debug_backtrace(false);
+		self::$warnings []= sprintf("Skipped test: %s:%d (%s) %s\n",
+			$bt[0]["file"], $bt[0]["line"], $bt[1]["function"], $msg);
+
+		throw new Exception($msg);
+	}
+
 	public static function run($className) {
 
 		$rc = new ReflectionClass($className);
@@ -43,11 +50,21 @@ public static function run($className) {
 
 			$count = count($className::$errors);
 			$rt = new $className;
-			$rt->setUp();
-			$rt->$name();
-			echo ($count === count($className::$errors)) ? "." : "F";
+			try {
+				$rt->setUp();
+				$rt->$name();
+				echo ($count === count($className::$errors)) ? "." : "F";
+			} catch (Exception $e) {
+				if ($e instanceof RedisException) {
+					$className::$errors[] = "Uncaught exception '".$e->getMessage()."' ($name)\n";
+					echo 'F';
+				} else {
+					echo 'S';
+				}
+			}
 		}
 		echo "\n";
+		echo implode('', $className::$warnings);
 
 		if(empty($className::$errors)) {
 			echo "All tests passed.\n";

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ public function testIncrByFloat()`
`389`	`389`	`{`
`390`	`390`	`// incrbyfloat is new in 2.6.0`
`391`	`391`	`if (version_compare($this->version, "2.5.0", "lt")) {`
`392`		`- return;`
	`392`	`+ $this->markTestSkipped();`
`393`	`393`	`}`
`394`	`394`
`395`	`395`	`$this->redis->delete('key');`
`@@ -1632,7 +1632,7 @@ public function testInfoCommandStats() {`
`1632`	`1632`
`1633`	`1633`	`// INFO COMMANDSTATS is new in 2.6.0`
`1634`	`1634`	`if (version_compare($this->version, "2.5.0", "lt")) {`
`1635`		`- return;`
	`1635`	`+ $this->markTestSkipped();`
`1636`	`1636`	`}`
`1637`	`1637`
`1638`	`1638`	`$info = $this->redis->info("COMMANDSTATS");`
`@@ -2988,7 +2988,7 @@ private function checkSerializer($mode) {`
`2988`	`2988`	`public function testDumpRestore() {`
`2989`	`2989`
`2990`	`2990`	`if (version_compare($this->version, "2.5.0", "lt")) {`
`2991`		`- return;`
	`2991`	`+ $this->markTestSkipped();`
`2992`	`2992`	`}`
`2993`	`2993`
`2994`	`2994`	`$this->redis->del('foo');`
`@@ -3053,7 +3053,7 @@ private function array_diff_recursive($aArray1, $aArray2) {`
`3053`	`3053`	`public function testScript() {`
`3054`	`3054`
`3055`	`3055`	`if (version_compare($this->version, "2.5.0", "lt")) {`
`3056`		`- return;`
	`3056`	`+ $this->markTestSkipped();`
`3057`	`3057`	`}`
`3058`	`3058`
`3059`	`3059`	`// Flush any scripts we have`
`@@ -3085,7 +3085,7 @@ public function testScript() {`
`3085`	`3085`	`public function testEval() {`
`3086`	`3086`
`3087`	`3087`	`if (version_compare($this->version, "2.5.0", "lt")) {`
`3088`		`- return;`
	`3088`	`+ $this->markTestSkipped();`
`3089`	`3089`	`}`
`3090`	`3090`
`3091`	`3091`	`// Basic single line response tests`
`@@ -3203,7 +3203,7 @@ public function testEval() {`
`3203`	`3203`	`public function testEvalSHA() {`
`3204`	`3204`
`3205`	`3205`	`if (version_compare($this->version, "2.5.0", "lt")) {`
`3206`		`- return;`
	`3206`	`+ $this->markTestSkipped();`
`3207`	`3207`	`}`
`3208`	`3208`
`3209`	`3209`	`// Flush any loaded scripts`
`@@ -3301,7 +3301,7 @@ public function testReconnectSelect() {`
`3301`	`3301`	`public function testTime() {`
`3302`	`3302`
`3303`	`3303`	`if (version_compare($this->version, "2.5.0", "lt")) {`
`3304`		`- return;`
	`3304`	`+ $this->markTestSkipped();`
`3305`	`3305`	`}`
`3306`	`3306`
`3307`	`3307`	`$time_arr = $this->redis->time();`