Moving tests around in the AllTests suite and making the CakeSocket t…

…ests pass again
cakephp · Apr 23, 2011 · 682ec29 · 682ec29
1 parent 97b57e9
commit 682ec29
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/lib/Cake/tests/Case/AllTestsTest.php b/lib/Cake/tests/Case/AllTestsTest.php
@@ -35,6 +35,7 @@ public static function suite() {
 
 		$path = CORE_TEST_CASES . DS;
 
+		$suite->addTestFile($path . 'BasicsTest.php');
 		$suite->addTestFile($path . 'AllConsoleTest.php');
 		$suite->addTestFile($path . 'AllBehaviorsTest.php');
 		$suite->addTestFile($path . 'AllCacheTest.php');

diff --git a/lib/Cake/tests/Case/AllUtilityTest.php b/lib/Cake/tests/Case/AllUtilityTest.php
@@ -33,8 +33,6 @@ class AllUtilityTest extends PHPUnit_Framework_TestSuite {
  */
 	public static function suite() {
 		$suite = new CakeTestSuite('All Utility class tests');
-
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'BasicsTest.php');
 		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'Utility');
 		return $suite;
 	}

diff --git a/lib/Cake/tests/Case/Network/CakeSocketTest.php b/lib/Cake/tests/Case/Network/CakeSocketTest.php
@@ -170,17 +170,26 @@ function testSocketReading() {
 		$this->Socket->connect();
 		$this->assertEqual($this->Socket->read(26), null);
 
-		$config = array('host' => '127.0.0.1', 'timeout' => 0.5);
+		$config = array('host' => 'google.com', 'port' => 80, 'timeout' => 1);
 		$this->Socket = new CakeSocket($config);
 		$this->assertTrue($this->Socket->connect());
-		$this->assertFalse($this->Socket->read(1024 * 1024));
+		$this->assertEqual($this->Socket->read(26), null);
 		$this->assertEqual($this->Socket->lastError(), '2: ' . __d('cake_dev', 'Connection timed out'));
+	}
 
-		$config = array('host' => 'cakephp.org', 'port' => 80, 'timeout' => 20);
+/**
+ * testTimeOutConnection method
+ *
+ * @return void
+ */
+	function testTimeOutConnection() {
+		$config = array('host' => '127.0.0.1', 'timeout' => 0.5);
 		$this->Socket = new CakeSocket($config);
 		$this->assertTrue($this->Socket->connect());
-		$this->assertEqual($this->Socket->read(26), null);
-		$this->assertEqual($this->Socket->lastError(), null);
+
+		$config = array('host' => '127.0.0.1', 'timeout' => 0.00001);
+		$this->assertFalse($this->Socket->read(1024 * 1024));
+		$this->assertEqual($this->Socket->lastError(), '2: ' . __d('cake_dev', 'Connection timed out'));
 	}
 
 /**