Fixing tests in ComponentCollection and HelperCollection as return of…

… trigger now depends on the triggered objects. Removing annoying test that broke anytime something changed in Model.
cakephp · Dec 12, 2010 · dc7ff89 · dc7ff89
1 parent bf22af6
commit dc7ff89
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/cake/tests/cases/libs/controller/component_collection.test.php b/cake/tests/cases/libs/controller/component_collection.test.php
@@ -150,7 +150,7 @@ function testTrigger() {
 		$this->mockObjects[] = $this->Components->TriggerMockCookie;
 		$this->mockObjects[] = $this->Components->TriggerMockSecurity;
 
-		$this->assertTrue($this->Components->trigger('startup', array(&$controller)));
+		$this->assertNull($this->Components->trigger('startup', array(&$controller)));
 	}
 
 /**
@@ -174,7 +174,7 @@ function testTriggerWithTriggerDisabledObjects() {
 		$this->mockObjects[] = $this->Components->TriggerMockSecurity;
 
 		$result = $this->Components->trigger('initialize', array(&$controller), array('triggerDisabled' => true));
-		$this->assertTrue($result);
+		$this->assertNull($result);
 	}
 
 /**
@@ -197,7 +197,7 @@ function testTriggerWithDisabledComponents() {
 
 		$this->Components->disable('TriggerMockSecurity');
 
-		$this->assertTrue($this->Components->trigger('startup', array(&$controller)));
+		$this->assertNull($this->Components->trigger('startup', array(&$controller)));
 	}
 
 /**

diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
@@ -2115,20 +2115,6 @@ function testMapReverse() {
 		$result = Set::reverse($class);
 		$this->assertEquals($result, $expected);
 
-		$model = new Model(array('id' => false, 'name' => 'Model', 'table' => false));
-		$expected = array(
-			'Behaviors' => array('modelName' => 'Model'),
-			'useDbConfig' => 'default', 'useTable' => false, 'displayField' => null, 'id' => false, 'data' => array(), 'table' => 'models', 'primaryKey' => 'id', 'validate' => array(),
-			'validationErrors' => array(), 'tablePrefix' => null, 'name' => 'Model', 'alias' => 'Model', 'tableToModel' => array(), 'logTransactions' => false, 'cacheQueries' => false,
-			'belongsTo' => array(), 'hasOne' =>  array(), 'hasMany' =>  array(), 'hasAndBelongsToMany' =>  array(), 'actsAs' => null, 'whitelist' =>  array(), 'cacheSources' => true,
-			'findQueryType' => null, 'recursive' => 1, 'order' => null, 'virtualFields' => array(),
-);
-		$result = Set::reverse($model);
-
-		ksort($result);
-		ksort($expected);
-		$this->assertEquals($result, $expected);
-
 		$class = new stdClass;
 		$class->User = new stdClass;
 		$class->User->id = 100;

diff --git a/cake/tests/cases/libs/view/helper_collection.test.php b/cake/tests/cases/libs/view/helper_collection.test.php
@@ -137,7 +137,7 @@ function testTrigger() {
 
 		$this->mockObjects[] = $this->Helpers->TriggerMockForm;
 
-		$this->assertTrue($this->Helpers->trigger('beforeRender', array('one', 'two')));
+		$this->assertNull($this->Helpers->trigger('beforeRender', array('one', 'two')));
 	}
 
 /**
@@ -163,7 +163,7 @@ function testTriggerWithDisabledHelpers() {
 
 		$this->Helpers->disable('TriggerMockForm');
 
-		$this->assertTrue($this->Helpers->trigger('beforeRender', array('one', 'two')));
+		$this->assertNull($this->Helpers->trigger('beforeRender', array('one', 'two')));
 	}
 
 /**