Moving testGenerateInnerJoinAssociationQuery out from DboSourceTest

cakephp · Nov 4, 2010 · f2f378c · f2f378c
1 parent 605a6b1
commit f2f378c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 deletions.
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
@@ -1002,4 +1002,33 @@ function &_prepareAssociationQuery(&$model, &$queryData, $binding) {
 		$result = array_merge(array('linkModel' => &$linkModel), compact('type', 'assoc', 'assocData', 'external'));
 		return $result;
 	}
+
+/**
+ * testGenerateInnerJoinAssociationQuery method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateInnerJoinAssociationQuery() {
+		$test = $this->getMock('DboMysql', array('connect', '_execute', 'execute'));
+		$this->Model = $this->getMock('TestModel9', array('getDataSource'));
+		$this->Model->expects($this->any())
+			->method('getDataSource')
+			->will($this->returnValue($test));
+
+		$this->Model->TestModel8 = $this->getMock('TestModel8', array('getDataSource'));
+		$this->Model->TestModel8->expects($this->any())
+			->method('getDataSource')
+			->will($this->returnValue($test));
+
+		$test->expects($this->at(0))->method('execute')
+			->with(new PHPUnit_Framework_Constraint_PCREMatch('/`TestModel9` LEFT JOIN `test_model8`/'));
+
+		$test->expects($this->at(1))->method('execute')
+			->with(new PHPUnit_Framework_Constraint_PCREMatch('/`TestModel9` INNER JOIN `test_model8`/'));
+
+		$test->read($this->Model, array('recursive' => 1));
+		$this->Model->belongsTo['TestModel8']['type'] = 'INNER';
+		$test->read($this->Model, array('recursive' => 1));
+	}
 }
diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -117,30 +117,6 @@ function tearDown() {
 		unset($this->Model);
 	}
 
-/**
- * testGenerateInnerJoinAssociationQuery method
- *
- * @access public
- * @return void
- */
-	function testGenerateInnerJoinAssociationQuery() {
-		$this->Model = new TestModel9();
-		$test = ConnectionManager::create('test2', $this->__config);
-		$this->Model->setDataSource('test2');
-		$this->Model->TestModel8 = new TestModel8();
-		$this->Model->TestModel8->setDataSource('test2');
-
-		$this->testDb->read($this->Model, array('recursive' => 1));
-		$result = $this->testDb->getLastQuery();
-		$this->assertPattern('/`TestModel9` LEFT JOIN `' . $this->testDb->fullTableName('test_model8', false) . '`/', $result);
-
-		$this->Model->belongsTo['TestModel8']['type'] = 'INNER';
-		$this->testDb->read($this->Model, array('recursive' => 1));
-		$result = $this->testDb->getLastQuery();
-		$this->assertPattern('/`TestModel9` INNER JOIN `' . $this->testDb->fullTableName('test_model8', false) . '`/', $result);
-
-	}
-
 /**
  * testGenerateAssociationQuerySelfJoinWithConditionsInHasOneBinding method
  *