Migrated ConnectionManager to phpunit

cakephp · Jun 5, 2010 · fd4db41 · fd4db41
1 parent 7aa01c4
commit fd4db41
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -701,7 +701,7 @@ function fetchResult() {
  * @param string $fields
  * @param array $values
  */
-	protected function insertMulti($table, $fields, $values) {
+	public function insertMulti($table, $fields, $values) {
 		$primaryKey = $this->_getPrimaryKey($table);
 		$hasPrimaryKey = $primaryKey != null && (
 			(is_array($fields) && in_array($primaryKey, $fields)

diff --git a/cake/tests/cases/libs/model/connection_manager.test.php b/cake/tests/cases/libs/model/connection_manager.test.php
@@ -34,7 +34,7 @@ class ConnectionManagerTest extends CakeTestCase {
  * @return void
  */
 	function setUp() {
-		$this->ConnectionManager =& ConnectionManager::getInstance();
+		$this->ConnectionManager = ConnectionManager::getInstance();
 	}
 
 /**
@@ -79,12 +79,12 @@ function testEnumConnectionObjects() {
  */
 	function testGetDataSource() {
 		$connections = ConnectionManager::enumConnectionObjects();
-		$this->assertTrue(count(array_keys($connections) >= 1));
+		$this->assertTrue((bool)(count(array_keys($connections) >= 1)));
 
 		$source = ConnectionManager::getDataSource(key($connections));
 		$this->assertTrue(is_object($source));
 
-		$this->expectError(new PatternExpectation('/Non-existent data source/i'));
+		$this->expectError();
 
 		$source = ConnectionManager::getDataSource('non_existent_source');
 		$this->assertEqual($source, null);
@@ -212,7 +212,7 @@ function testGetSourceName() {
 
 		$this->assertEqual($result, $name);
 
-		$source =& new StdClass();
+		$source = new StdClass();
 		$result = ConnectionManager::getSourceName($source);
 		$this->assertEqual($result, null);
 	}
@@ -238,7 +238,7 @@ function testLoadDataSource() {
 		}
 
 		$connection = array('classname' => 'NonExistentDataSource', 'filename' => 'non_existent');
-		$this->expectError(new PatternExpectation('/Unable to import DataSource class/i'));
+		$this->expectError();
 
 		$loaded = ConnectionManager::loadDataSource($connection);
 		$this->assertEqual($loaded, null);
@@ -254,7 +254,7 @@ function testCreateDataSourceWithIntegrationTests() {
 		$name = 'test_created_connection';
 
 		$connections = ConnectionManager::enumConnectionObjects();
-		$this->assertTrue(count(array_keys($connections) >= 1));
+		$this->assertTrue((bool)(count(array_keys($connections) >= 1)));
 
 		$source = ConnectionManager::getDataSource(key($connections));
 		$this->assertTrue(is_object($source));