Additional Test for ModelTask

cakephp · Apr 30, 2009 · 8028722 · 8028722
1 parent aad2bd7
commit 8028722
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
@@ -53,6 +53,12 @@ class ModelTask extends Shell {
  * @access public
  */
 	var $tasks = array('DbConfig', 'Fixture');
+/**
+ * Holds tables found on connection.
+ *
+ * @var array
+ **/
+	var $__tables = array();
 /**
  * Execution method always used for tasks
  *

diff --git a/cake/tests/cases/console/libs/tasks/model.test.php b/cake/tests/cases/console/libs/tasks/model.test.php
@@ -100,7 +100,6 @@ function testListAll() {
 	function testGetName() {
 		$this->Task->setReturnValue('in', 1);
 
-		//test quit.
 		$this->Task->setReturnValueAt(0, 'in', 'q');
 		$this->Task->expectOnce('_stop');
 		$this->Task->getName('test_suite');
@@ -109,15 +108,33 @@ function testGetName() {
 		$result = $this->Task->getName('test_suite');
 		$expected = 'Article';
 		$this->assertEqual($result, $expected);
-		
+
 		$this->Task->setReturnValueAt(2, 'in', 2);
 		$result = $this->Task->getName('test_suite');
 		$expected = 'Comment';
 		$this->assertEqual($result, $expected);
-		
+
 		$this->Task->setReturnValueAt(3, 'in', 10);
 		$result = $this->Task->getName('test_suite');
 		$this->Task->expectOnce('err');
 	}
+
+/**
+ * Test table name interactions
+ *
+ * @return void
+ **/
+	function testGetTableName() {
+		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$result = $this->Task->getTable('Article', 'test_suite');
+		$expected = 'articles';
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(1, 'in', 'n');
+		$this->Task->setReturnValueAt(2, 'in', 'my_table');
+		$result = $this->Task->getTable('Article', 'test_suite');
+		$expected = 'my_table';
+		$this->assertEqual($result, $expected);
+	}
 }
 ?>