From 81ff4a887a32b8de19eada77e4056982742f5bee Mon Sep 17 00:00:00 2001
From: Vladimir Kolesnikov <vladimir@free-sevastopol.com>
Date: Thu, 1 Aug 2013 13:08:43 +0300
Subject: [PATCH] Skip tests requiring MySQL if MySQL is not available

---
 unit-tests/CacheResultsetTest.php             | 37 +++++++++++++++++++
 unit-tests/ModelsBehaviorsTest.php            | 12 +++++-
 unit-tests/ModelsDynamicOperationsTest.php    |  5 +++
 unit-tests/ModelsEventsTest.php               | 15 ++++++++
 unit-tests/ModelsFindersTest.php              |  5 +++
 unit-tests/ModelsMassAssigmentTest.php        |  5 +++
 unit-tests/ModelsMetadataAdaptersTest.php     | 27 +++++++++++++-
 unit-tests/ModelsMetadataStrategyTest.php     | 10 +++++
 unit-tests/ModelsMultipleSourcesTest.php      | 12 +++++-
 unit-tests/ModelsQueryBuilderTest.php         | 10 +++++
 unit-tests/ModelsQueryParsingTest.php         | 21 ++++++++++-
 unit-tests/ModelsRelationsMagicTest.php       |  5 +++
 unit-tests/ModelsResultsetCacheStaticTest.php |  6 +++
 unit-tests/ModelsSerializeTest.php            |  5 +++
 unit-tests/ModelsSnapshotsTest.php            |  5 +++
 unit-tests/PaginatorTest.php                  | 23 ++++++++++--
 16 files changed, 196 insertions(+), 7 deletions(-)

diff --git a/unit-tests/CacheResultsetTest.php b/unit-tests/CacheResultsetTest.php
index 6fc3b2eebc6..6ac0efb519a 100644
--- a/unit-tests/CacheResultsetTest.php
+++ b/unit-tests/CacheResultsetTest.php
@@ -101,6 +101,11 @@ protected function _getCache($adapter='File'){
 
 	public function testCacheResultsetNormal()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$cache = $this->_getCache();
 
@@ -118,6 +123,11 @@ public function testCacheResultsetNormal()
 
 	public function testCacheResultsetBinding()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$cache = $this->_getCache();
 
@@ -142,6 +152,11 @@ public function testCacheResultsetBinding()
 
 	public function testCacheResultsetSimple()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$cache = $this->_getCache();
 
@@ -163,6 +178,11 @@ public function testCacheResultsetSimple()
 
 	public function testCacheResultsetSimpleNoComplete()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$cache = $this->_getCache();
 
@@ -184,6 +204,11 @@ public function testCacheResultsetSimpleNoComplete()
 
 	public function testCacheResultsetSimpleNoComplex()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$cache = $this->_getCache();
 
@@ -205,6 +230,12 @@ public function testCacheResultsetSimpleNoComplex()
 
 	public function testCacheResultsetSimpleMemcached()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
+
 		if (!class_exists('Memcache')) {
 			$this->markTestSkipped("Memcache class does not exist, test skipped");
 			return;
@@ -286,6 +317,12 @@ public function testCacheResultsetSimpleMemcached()
 
 	public function testCacheResultsetSimpleLibmemcached()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
+
 		if (!class_exists('Memcached')) {
 			$this->markTestSkipped("Memcached class does not exist, test skipped");
 			return;
diff --git a/unit-tests/ModelsBehaviorsTest.php b/unit-tests/ModelsBehaviorsTest.php
index bc2685efd0a..0912b975134 100644
--- a/unit-tests/ModelsBehaviorsTest.php
+++ b/unit-tests/ModelsBehaviorsTest.php
@@ -62,6 +62,11 @@ protected function _prepareDI()
 
 	public function testBehaviorsTimestampable()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped("Test skipped");
+			return;
+		}
 
 		$this->_prepareDI();
 
@@ -74,6 +79,11 @@ public function testBehaviorsTimestampable()
 
 	public function testBehaviorsSoftDelete()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped("Test skipped");
+			return;
+		}
 
 		$this->_prepareDI();
 
@@ -85,4 +95,4 @@ public function testBehaviorsSoftDelete()
 		$this->assertEquals(News\Subscribers::count(), $number);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/unit-tests/ModelsDynamicOperationsTest.php b/unit-tests/ModelsDynamicOperationsTest.php
index 72909cf3d42..433d898ea9d 100644
--- a/unit-tests/ModelsDynamicOperationsTest.php
+++ b/unit-tests/ModelsDynamicOperationsTest.php
@@ -59,6 +59,11 @@ protected function _getDI()
 
 	public function testModelsMysql()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$di = $this->_getDI();
 
diff --git a/unit-tests/ModelsEventsTest.php b/unit-tests/ModelsEventsTest.php
index 964d2442947..3877333b2ae 100644
--- a/unit-tests/ModelsEventsTest.php
+++ b/unit-tests/ModelsEventsTest.php
@@ -75,6 +75,11 @@ protected function _prepareDI(&$trace)
 
 	public function testEventsCreate()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$trace = array();
 
@@ -118,6 +123,11 @@ public function testEventsCreate()
 
 	public function testEventsUpdate()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$trace = array();
 
@@ -163,6 +173,11 @@ public function testEventsUpdate()
 
 	public function testEventsDelete()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$trace = array();
 
diff --git a/unit-tests/ModelsFindersTest.php b/unit-tests/ModelsFindersTest.php
index cfad05fe76c..020de524eec 100644
--- a/unit-tests/ModelsFindersTest.php
+++ b/unit-tests/ModelsFindersTest.php
@@ -58,6 +58,11 @@ protected function _getDI()
 
 	public function testModels()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$di = $this->_getDI();
 
diff --git a/unit-tests/ModelsMassAssigmentTest.php b/unit-tests/ModelsMassAssigmentTest.php
index 08dfdc64ed8..999aa8fd766 100644
--- a/unit-tests/ModelsMassAssigmentTest.php
+++ b/unit-tests/ModelsMassAssigmentTest.php
@@ -58,6 +58,11 @@ protected function _getDI()
 
 	public function testModels()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$di = $this->_getDI();
 
diff --git a/unit-tests/ModelsMetadataAdaptersTest.php b/unit-tests/ModelsMetadataAdaptersTest.php
index 7b398bee936..4294811c5a7 100644
--- a/unit-tests/ModelsMetadataAdaptersTest.php
+++ b/unit-tests/ModelsMetadataAdaptersTest.php
@@ -109,6 +109,11 @@ protected function _getDI()
 
 	public function testMetadataMemory()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$di = $this->_getDI();
 
@@ -132,9 +137,14 @@ public function testMetadataMemory()
 
 	public function testMetadataSession()
 	{
-
 		@session_start();
 
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
+
 		$di = $this->_getDI();
 
 		$di->set('modelsMetadata', function(){
@@ -165,6 +175,11 @@ public function testMetadataSession()
 
 	public function testMetadataApc()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		if (!function_exists('apc_fetch')) {
 			$this->markTestSkipped('apc extension is not loaded');
@@ -201,6 +216,11 @@ public function testMetadataApc()
 
 	public function testMetadataXcache()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		if (!function_exists('xcache_get')) {
 			$this->markTestSkipped('xcache extension is not loaded');
@@ -237,6 +257,11 @@ public function testMetadataXcache()
 
 	public function testMetadataFiles()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$di = $this->_getDI();
 
diff --git a/unit-tests/ModelsMetadataStrategyTest.php b/unit-tests/ModelsMetadataStrategyTest.php
index 1a107d79986..e6f12481062 100644
--- a/unit-tests/ModelsMetadataStrategyTest.php
+++ b/unit-tests/ModelsMetadataStrategyTest.php
@@ -106,6 +106,11 @@ protected function _getDI()
 
 	public function testMetadataDatabaseIntrospection()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$di = $this->_getDI();
 
@@ -128,6 +133,11 @@ public function testMetadataDatabaseIntrospection()
 
 	public function testMetadataAnnotations()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$di = $this->_getDI();
 
diff --git a/unit-tests/ModelsMultipleSourcesTest.php b/unit-tests/ModelsMultipleSourcesTest.php
index c665a38ab3b..2e044dac241 100644
--- a/unit-tests/ModelsMultipleSourcesTest.php
+++ b/unit-tests/ModelsMultipleSourcesTest.php
@@ -71,6 +71,11 @@ protected function _prepareDI()
 
 	public function testSourcesStatic()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->marktestSkipped('Test skipped');
+			return;
+		}
 
 		$this->_prepareDI();
 
@@ -89,6 +94,11 @@ public function testSourcesStatic()
 
 	public function testSourcesInstance()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->marktestSkipped('Test skipped');
+			return;
+		}
 
 		$this->_prepareDI();
 
@@ -96,4 +106,4 @@ public function testSourcesInstance()
 		$this->assertFalse($robot->save());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/unit-tests/ModelsQueryBuilderTest.php b/unit-tests/ModelsQueryBuilderTest.php
index bf5ec2fceae..662cd059532 100644
--- a/unit-tests/ModelsQueryBuilderTest.php
+++ b/unit-tests/ModelsQueryBuilderTest.php
@@ -67,6 +67,11 @@ protected function _getDI()
 
 	public function testAction()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped("Test skipped");
+			return;
+		}
 
 		$di = $this->_getDI();
 
@@ -261,6 +266,11 @@ public function testAction()
 
 	public function testIssue701()
 	{
+		if (empty($configMysql)) {
+			$this->markTestSkipped("Test skipped");
+			return;
+		}
+
 		$di = $this->_getDI();
 
 		$builder = new Builder();
diff --git a/unit-tests/ModelsQueryParsingTest.php b/unit-tests/ModelsQueryParsingTest.php
index 5aaf104d7ba..b5e1c5ed2e3 100644
--- a/unit-tests/ModelsQueryParsingTest.php
+++ b/unit-tests/ModelsQueryParsingTest.php
@@ -67,6 +67,11 @@ protected function _getDI()
 
 	public function testSelectParsing()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$di = $this->_getDI();
 
@@ -6740,6 +6745,11 @@ public function testSelectParsing()
 
 	public function testInsertParsing()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$di = $this->_getDI();
 
@@ -7100,6 +7110,11 @@ public function testInsertParsing()
 
 	public function testUpdateParsing()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$di = $this->_getDI();
 
@@ -7692,10 +7707,14 @@ public function testUpdateParsing()
 
 	public function testDeleteParsing()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$di = $this->_getDI();
 
-
 		$expected = array(
 			'tables' => array(
 				'robots',
diff --git a/unit-tests/ModelsRelationsMagicTest.php b/unit-tests/ModelsRelationsMagicTest.php
index ea0f3ad9d11..1ac7ea349f4 100644
--- a/unit-tests/ModelsRelationsMagicTest.php
+++ b/unit-tests/ModelsRelationsMagicTest.php
@@ -63,6 +63,11 @@ public function testModelsMysql()
 		$di = $this->_getDI();
 
 		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
+
 		$connection = new Phalcon\Db\Adapter\Pdo\Mysql($configMysql);
 
 		$di->set('db', $connection);
diff --git a/unit-tests/ModelsResultsetCacheStaticTest.php b/unit-tests/ModelsResultsetCacheStaticTest.php
index 130a7ed87f0..1dbcb044492 100644
--- a/unit-tests/ModelsResultsetCacheStaticTest.php
+++ b/unit-tests/ModelsResultsetCacheStaticTest.php
@@ -51,6 +51,12 @@ public function setUp()
 
 	public function testOverrideStaticCache()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
+
 		Phalcon\DI::reset();
 
 		$di = new Phalcon\DI();
diff --git a/unit-tests/ModelsSerializeTest.php b/unit-tests/ModelsSerializeTest.php
index dcf8781a963..8c17381bee8 100644
--- a/unit-tests/ModelsSerializeTest.php
+++ b/unit-tests/ModelsSerializeTest.php
@@ -62,6 +62,11 @@ protected function _prepareDI()
 
 	public function testSerialize()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$this->_prepareDI();
 
diff --git a/unit-tests/ModelsSnapshotsTest.php b/unit-tests/ModelsSnapshotsTest.php
index fdb02070d5d..db8dc347d96 100644
--- a/unit-tests/ModelsSnapshotsTest.php
+++ b/unit-tests/ModelsSnapshotsTest.php
@@ -59,6 +59,11 @@ protected function _getDI()
 
 	public function testModelsMysql()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$di = $this->_getDI();
 
diff --git a/unit-tests/PaginatorTest.php b/unit-tests/PaginatorTest.php
index 27d3e4bb154..dd42e0edc44 100644
--- a/unit-tests/PaginatorTest.php
+++ b/unit-tests/PaginatorTest.php
@@ -224,6 +224,12 @@ public function testArrayPaginator_t445()
 
 	public function testModelPaginator()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
+
 		$this->_loadDI();
 
 		$personnes = Personnes::find();
@@ -280,6 +286,12 @@ public function testModelPaginator()
 
 	public function testModelPaginatorBind()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
+
 		$this->_loadDI();
 
 		$personnes = Personnes::find(array(
@@ -311,13 +323,18 @@ public function testModelPaginatorBind()
 
 	public function testQueryBuilderPaginator()
 	{
+		require 'unit-tests/config.db.php';
+		if (empty($configMysql)) {
+			$this->markTestSkipped('Test skipped');
+			return;
+		}
 
 		$di = $this->_loadDI();
 
 		$builder = $di['modelsManager']->createBuilder()
-	        		->columns('cedula, nombres')
-	        		->from('Personnes')
-	        		->orderBy('cedula');
+					->columns('cedula, nombres')
+					->from('Personnes')
+					->orderBy('cedula');
 
 		$paginator = new Phalcon\Paginator\Adapter\QueryBuilder(array(
 			"builder" => $builder,