adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing all console tests on windows

Browse source
This commit is contained in:
Jose Lorenzo Rodriguez 2011-06-21 12:38:25 -04:30
parent 552bd82b5b
commit b722693102
1 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
lib/Cake/Test/Case/Console/Command/ShellTest.php
View file

@ -344,11 +344,15 @@ class ShellTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testNl() { public function testNl() {
$this->assertEqual($this->Shell->nl(), "\n"); $newLine = '\n';
$this->assertEqual($this->Shell->nl(true), "\n"); if (DS === '\\') {
$newLine = "\r\n";
}
$this->assertEqual($this->Shell->nl(), $newLine);
$this->assertEqual($this->Shell->nl(true), $newLine);
$this->assertEqual($this->Shell->nl(false), ""); $this->assertEqual($this->Shell->nl(false), "");
$this->assertEqual($this->Shell->nl(2), "\n\n"); $this->assertEqual($this->Shell->nl(2), $newLine . $newLine);
$this->assertEqual($this->Shell->nl(1), "\n"); $this->assertEqual($this->Shell->nl(1), $newLine);
} }
/** /**
@ -592,13 +596,13 @@ class ShellTest extends CakeTestCase {
$this->Shell->interactive = false; $this->Shell->interactive = false;
$contents = "<?php\necho 'test';\r\n\$te = 'st';\r\n?>"; $contents = "<?php\r\necho 'test';\r\n\$te = 'st';\r\n?>";
$result = $this->Shell->createFile($file, $contents); $result = $this->Shell->createFile($file, $contents);
$this->assertTrue($result); $this->assertTrue($result);
$this->assertTrue(file_exists($file)); $this->assertTrue(file_exists($file));
$this->assertEqual(file_get_contents($file), $contents); $this->assertEqual(file_get_contents($file), $contents);
$contents = "<?php\necho 'another test';\r\n\$te = 'st';\r\n?>"; $contents = "<?php\r\necho 'another test';\r\n\$te = 'st';\r\n?>";
$result = $this->Shell->createFile($file, $contents); $result = $this->Shell->createFile($file, $contents);
$this->assertTrue($result); $this->assertTrue($result);
$this->assertTrue(file_exists($file)); $this->assertTrue(file_exists($file));
@ -615,33 +619,41 @@ class ShellTest extends CakeTestCase {
*/ */
public function testCreateFileWindowsInteractive() { public function testCreateFileWindowsInteractive() {
$this->skipIf(DIRECTORY_SEPARATOR === '/', 'testCreateFileWindowsInteractive supported on Windows only.'); $this->skipIf(DIRECTORY_SEPARATOR === '/', 'testCreateFileWindowsInteractive supported on Windows only.');
$path = TMP . 'shell_test'; $path = TMP . 'shell_test';
$file = $path . DS . 'file1.php'; $file = $path . DS . 'file1.php';
$Folder = new Folder($path, true); $Folder = new Folder($path, true);
$this->Shell->interactive = true; $this->Shell->interactive = true;
$this->Shell->Dispatch->expects($this->at(5)) $this->Shell->stdin->expects($this->at(0))
->method('getInput') ->method('read')
->will($this->returnValue('y'));
$this->Shell->Dispatch->expects($this->at(9))
->method('getInput')
->will($this->returnValue('n')); ->will($this->returnValue('n'));
$contents = "<?php\necho 'yet another test';\r\n\$te = 'st';\r\n?>"; $this->Shell->stdin->expects($this->at(1))
$result = $this->Shell->createFile($file, $contents); ->method('read')
$this->assertFalse($result); ->will($this->returnValue('y'));
$this->assertTrue(file_exists($file));
$this->assertNotEqual(file_get_contents($file), $contents);
$contents = "<?php\r\necho 'yet another test';\r\n\$te = 'st';\r\n?>";
$result = $this->Shell->createFile($file, $contents); $result = $this->Shell->createFile($file, $contents);
$this->assertTrue($result); $this->assertTrue($result);
$this->assertTrue(file_exists($file)); $this->assertTrue(file_exists($file));
$this->assertEqual(file_get_contents($file), $contents); $this->assertEqual(file_get_contents($file), $contents);
// no overwrite
$contents = 'new contents';
$result = $this->Shell->createFile($file, $contents);
$this->assertFalse($result);
$this->assertTrue(file_exists($file));
$this->assertNotEqual($contents, file_get_contents($file));
// overwrite
$contents = 'more new contents';
$result = $this->Shell->createFile($file, $contents);
$this->assertTrue($result);
$this->assertTrue(file_exists($file));
$this->assertEquals($contents, file_get_contents($file));
$Folder->delete(); $Folder->delete();
} }