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

cakephp · Jun 3, 2009 · 303bc0f · 303bc0f
1 parent 5f2ee8f
commit 303bc0f
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 62 deletions.
diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php
@@ -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;
 	 }
 }

diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php
@@ -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
  *

diff --git a/cake/tests/cases/libs/cache/apc.test.php b/cake/tests/cases/libs/cache/apc.test.php
@@ -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
  *

diff --git a/cake/tests/cases/libs/cache/xcache.test.php b/cake/tests/cases/libs/cache/xcache.test.php
@@ -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
  *

diff --git a/cake/tests/cases/libs/model/model.test.php b/cake/tests/cases/libs/model/model.test.php
@@ -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
  *

diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -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
  *