Skip to content
Permalink
Browse files

fixing up some tests. pretty much all greens for me.

  • Loading branch information...
gwoo
gwoo committed Jun 3, 2009
1 parent 5f2ee8f commit 303bc0fc896722c7a9822fd234218756df69ddbb
@@ -759,7 +759,7 @@ function __gc($expires = null) {
$expires = time();
}
$return = $model->deleteAll(array("$alias.expires <" => $expires), false, false);
$return = $model->deleteAll(array($model->alias . ".expires <" => $expires), false, false);
return $return;
}
}
@@ -532,15 +532,6 @@ function tearDown() {
Configure::write('viewPaths', $this->_viewPaths);
Configure::write('debug', $this->_debug);
}
/**
* tearDown method
*
* @access public
* @return void
*/
function tearDown() {
$_GET = $this->_get;
}
/**
* testParseParamsWithoutZerosAndEmptyPost method
*
@@ -68,15 +68,6 @@ function tearDown() {
Configure::write('Cache.disable', $this->_cacheDisable);
Cache::config('default');
}
/**
* tearDown method
*
* @access public
* @return void
*/
function tearDown() {
Cache::config('default');
}
/**
* testReadAndWriteCache method
*
@@ -68,15 +68,6 @@ function tearDown() {
Configure::write('Cache.disable', $this->_cacheDisable);
Cache::config('default');
}
/**
* tearDown method
*
* @access public
* @return void
*/
function tearDown() {
Cache::config('default');
}
/**
* testSettings method
*
@@ -4822,31 +4822,6 @@ function testFindNeighbors() {
$expected = array('prev' => $two, 'next' => null);
$this->assertEqual($result, $expected);
}
/**
* test findNeighbours() method
*
* @return void
* @access public
*/
function testFindNeighboursLegacy() {
$this->loadFixtures('User', 'Article');
$TestModel =& new Article();
$result = $TestModel->findNeighbours(null, 'Article.id', '2');
$expected = array('prev' => array('Article' => array('id' => 1)), 'next' => array('Article' => array('id' => 3)));
$this->assertEqual($result, $expected);
$result = $TestModel->findNeighbours(null, 'Article.id', '3');
$expected = array('prev' => array('Article' => array('id' => 2)), 'next' => array());
$this->assertEqual($result, $expected);
$result = $TestModel->findNeighbours(array('User.id' => 1), array('Article.id', 'Article.title'), 2);
$expected = array(
'prev' => array('Article' => array('id' => 1, 'title' => 'First Article')),
'next' => array('Article' => array('id' => 3, 'title' => 'Third Article')),
);
$this->assertEqual($result, $expected);
}
/**
* testFindCombinedRelations method
*
@@ -84,15 +84,6 @@ function tearDown() {
Configure::write('App.encoding', $this->_appEncoding);
ClassRegistry::flush();
}
/**
* tearDown method
*
* @access public
* @return void
*/
function tearDown() {
unset($this->Html);
}
/**
* testDocType method
*

0 comments on commit 303bc0f

Please sign in to comment.
You can’t perform that action at this time.