Merge pull request #862 from sjinks/tests

Use markTestSkipped() instead of echo
phalcon · Jul 17, 2013 · 76e5a80 · 76e5a80
2 parents d551b09 + f64ffe5
commit 76e5a80
Show file tree

Hide file tree

Showing 20 changed files with 87 additions and 72 deletions.
diff --git a/unit-tests/CacheResultsetTest.php b/unit-tests/CacheResultsetTest.php
@@ -195,7 +195,7 @@ public function testCacheResultsetSimpleNoComplex()
 	public function testCacheResultsetSimpleMemcached()
 	{
 		if (!class_exists('Memcache')) {
-			echo "Memcache class does not exist, test skipped\n";
+			$this->markTestSkipped("Memcache class does not exist, test skipped");
 			return;
 		}
 

diff --git a/unit-tests/CollectionsEventsTest.php b/unit-tests/CollectionsEventsTest.php
@@ -44,7 +44,7 @@ public function collectionsAutoloader($className)
 	public function testCollectionsEvents()
 	{
 		if (!class_exists('Mongo')) {
-			echo "Mongo class does not exist, test skipped\n";
+			$this->markTestSkipped("Mongo class does not exist, test skipped");
 			return;
 		}
 

diff --git a/unit-tests/CollectionsSerializeTest.php b/unit-tests/CollectionsSerializeTest.php
@@ -44,7 +44,7 @@ public function collectionsAutoloader($className)
 	public function testCollectionsEvents()
 	{
 		if (!class_exists('Mongo')) {
-			echo "Mongo class does not exist, test skipped\n";
+			$this->markTestSkipped("Mongo class does not exist, test skipped");
 			return;
 		}
 

diff --git a/unit-tests/CollectionsTest.php b/unit-tests/CollectionsTest.php
@@ -43,7 +43,7 @@ public function collectionsAutoloader($className)
 	public function testCollections()
 	{
 		if (!class_exists('Mongo')) {
-			echo "Mongo class does not exist, test skipped\n";
+			$this->markTestSkipped("Mongo class does not exist, test skipped");
 			return;
 		}
 

diff --git a/unit-tests/DbBindTest.php b/unit-tests/DbBindTest.php
@@ -29,7 +29,7 @@ public function testDbBindMysql()
 
 		require 'unit-tests/config.db.php';
 		if (empty($configMysql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -46,7 +46,7 @@ public function testDbBindPostgresql()
 
 		require 'unit-tests/config.db.php';
 		if (empty($configPostgresql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -62,7 +62,7 @@ public function testDbBindSqlite()
 
 		require 'unit-tests/config.db.php';
 		if (empty($configSqlite)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 

diff --git a/unit-tests/DbDescribeTest.php b/unit-tests/DbDescribeTest.php
@@ -510,7 +510,7 @@ public function testDbMysql()
 
 		require 'unit-tests/config.db.php';
 		if (empty($configMysql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -616,7 +616,7 @@ public function testDbPostgresql()
 
 		require 'unit-tests/config.db.php';
 		if (empty($configPostgresql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -709,7 +709,7 @@ public function testDbSqlite()
 
 		require 'unit-tests/config.db.php';
 		if (empty($configSqlite)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 

diff --git a/unit-tests/DbProfilerTest.php b/unit-tests/DbProfilerTest.php
@@ -73,7 +73,7 @@ public function testDbMysql()
 
 		require 'unit-tests/config.db.php';
 		if (empty($configMysql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -87,7 +87,7 @@ public function testDbPostgresql()
 
 		require 'unit-tests/config.db.php';
 		if (empty($configPostgresql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -101,7 +101,7 @@ public function testDbSqlite()
 
 		require 'unit-tests/config.db.php';
 		if (empty($configSqlite)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 

diff --git a/unit-tests/DbTest.php b/unit-tests/DbTest.php
@@ -31,7 +31,7 @@ public function testDbMysql()
 			$this->_executeTests($connection);
 		}
 		else {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 		}
 	}
 
@@ -44,15 +44,15 @@ public function testDbPostgresql()
 			$this->_executeTests($connection);
 		}
 		else {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 		}
 	}
 
 	public function testDbPostgresqlSchemas()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configPostgresql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -94,7 +94,7 @@ public function testDbSqlite()
 			$this->_executeTests($connection);
 		}
 		else {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 		}
 
 	}
@@ -246,7 +246,7 @@ protected function _executeTests($connection)
 
 		//Transactions without savepoints.
 		$connection->setNestedTransactionsWithSavepoints(false);
-		
+
 		$success = $connection->begin(); // level 1 - real
 		$this->assertTrue($success);
 
@@ -308,7 +308,7 @@ protected function _executeTests($connection)
 		$this->assertTrue($success);
 
 		$success = $connection->rollback(); // rollback - real rollback
-		$this->assertTrue($success);		
+		$this->assertTrue($success);
 	}
 
 }
diff --git a/unit-tests/ModelsCalculationsTest.php b/unit-tests/ModelsCalculationsTest.php
@@ -60,7 +60,7 @@ public function testCalculationsMysql()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configMysql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -80,7 +80,7 @@ public function testCalculationsPostgresql()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configPostgresql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -100,7 +100,7 @@ public function testCalculationsSqlite()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configSqlite)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 

diff --git a/unit-tests/ModelsCriteriaTest.php b/unit-tests/ModelsCriteriaTest.php
@@ -60,7 +60,7 @@ public function testModelsMysql()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configMysql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -80,7 +80,7 @@ public function testModelsPostgresql()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configPostgresql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -100,7 +100,7 @@ public function testModelsSQLite()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configSqlite)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 

diff --git a/unit-tests/ModelsForeignKeysTest.php b/unit-tests/ModelsForeignKeysTest.php
@@ -60,7 +60,7 @@ public function testForeignKeysMysql()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configMysql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -79,7 +79,7 @@ public function testForeignKeysPostgresql()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configPostgresql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -98,7 +98,7 @@ public function testForeignKeysSqlite()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configSqlite)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 

diff --git a/unit-tests/ModelsHydrationTest.php b/unit-tests/ModelsHydrationTest.php
@@ -60,7 +60,7 @@ public function testModelsMysql()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configMysql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -80,7 +80,7 @@ public function testModelsPostgresql()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configPostgresql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -100,7 +100,7 @@ public function testModelsSQLite()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configSqlite)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 

diff --git a/unit-tests/ModelsMetadataTest.php b/unit-tests/ModelsMetadataTest.php
@@ -58,7 +58,7 @@ public function testMetadataMysql()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configMysql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -77,7 +77,7 @@ public function testMetadataPostgresql()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configPostgresql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -95,7 +95,7 @@ public function testMetadataSqlite()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configSqlite)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 

diff --git a/unit-tests/ModelsQueryExecuteTest.php b/unit-tests/ModelsQueryExecuteTest.php
@@ -64,7 +64,7 @@ public function testExecuteMysql()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configMysql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -90,7 +90,7 @@ public function testExecutePostgresql()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configPostgresql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -116,7 +116,7 @@ public function testExecuteSqlite()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configSqlite)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 

diff --git a/unit-tests/ModelsRelationsTest.php b/unit-tests/ModelsRelationsTest.php
@@ -61,7 +61,7 @@ public function testModelsMysql()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configMysql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -81,7 +81,7 @@ public function testModelsPostgresql()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configPostgresql)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}
 
@@ -101,7 +101,7 @@ public function testModelsSqlite()
 	{
 		require 'unit-tests/config.db.php';
 		if (empty($configSqlite)) {
-			echo "Skipped\n";
+			$this->markTestSkipped("Skipped");
 			return;
 		}