tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #828 from tractorcow/3.0-win-compatibility-fixes

Browse Source 
3.0 win compatibility fixes
This commit is contained in:
Sam Minnée 2012-09-26 21:14:38 -07:00
commit de8f06b711
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/core/manifest/ClassLoaderTest.php
View File

@ -37,13 +37,12 @@ class ClassLoaderTest extends SapphireTest {
} }
public function testGetItemPath() { public function testGetItemPath() {
$ds = DIRECTORY_SEPARATOR;
$loader = new SS_ClassLoader(); $loader = new SS_ClassLoader();
$loader->pushManifest($this->testManifest1); $loader->pushManifest($this->testManifest1);
$this->assertEquals( $this->assertEquals(
$this->baseManifest1 . $ds . 'module' . $ds . 'classes' . $ds . 'ClassA.php', realpath($this->baseManifest1 . '/module/classes/ClassA.php'),
$loader->getItemPath('ClassA') realpath($loader->getItemPath('ClassA'))
); );
$this->assertEquals( $this->assertEquals(
false, false,
@ -64,8 +63,8 @@ class ClassLoaderTest extends SapphireTest {
$loader->getItemPath('UnknownClass') $loader->getItemPath('UnknownClass')
); );
$this->assertEquals( $this->assertEquals(
$this->baseManifest2 . $ds . 'module' . $ds . 'classes' . $ds . 'OtherClassA.php', realpath($this->baseManifest2 . '/module/classes/OtherClassA.php'),
$loader->getItemPath('OtherClassA') realpath($loader->getItemPath('OtherClassA'))
); );
} }
} }

6
tests/dev/CSVParserTest.php
View File

@ -19,7 +19,7 @@ class CSVParserTest extends SapphireTest {
$this->assertEquals(array( $this->assertEquals(array(
"He's a good guy", "He's a good guy",
"She is awesome.\nSo awesome that she gets multiple rows and \"escaped\" strings in her biography", "She is awesome." . PHP_EOL . "So awesome that she gets multiple rows and \"escaped\" strings in her biography",
"Pretty old, with an escaped comma", "Pretty old, with an escaped comma",
"Unicode FTW"), $biographies); "Unicode FTW"), $biographies);
$this->assertEquals(array("31/01/1988","31/01/1982","31/01/1882","31/06/1982"), $birthdays); $this->assertEquals(array("31/01/1988","31/01/1982","31/01/1882","31/06/1982"), $birthdays);
@ -49,7 +49,7 @@ class CSVParserTest extends SapphireTest {
$this->assertEquals(array('John','Jane','Jamie','Järg'), $firstNames); $this->assertEquals(array('John','Jane','Jamie','Järg'), $firstNames);
$this->assertEquals(array( $this->assertEquals(array(
"He's a good guy", "He's a good guy",
"She is awesome.\nSo awesome that she gets multiple rows and \"escaped\" strings in her biography", "She is awesome." . PHP_EOL . "So awesome that she gets multiple rows and \"escaped\" strings in her biography",
"Pretty old, with an escaped comma", "Pretty old, with an escaped comma",
"Unicode FTW"), $biographies); "Unicode FTW"), $biographies);
$this->assertEquals(array("31/01/1988","31/01/1982","31/01/1882","31/06/1982"), $birthdays); $this->assertEquals(array("31/01/1988","31/01/1982","31/01/1882","31/06/1982"), $birthdays);
@ -77,7 +77,7 @@ class CSVParserTest extends SapphireTest {
$this->assertEquals(array( $this->assertEquals(array(
'Biography', 'Biography',
"He's a good guy", "He's a good guy",
"She is awesome.\nSo awesome that she gets multiple rows and \"escaped\" strings in her biography", "She is awesome." . PHP_EOL . "So awesome that she gets multiple rows and \"escaped\" strings in her biography",
"Pretty old, with an escaped comma", "Pretty old, with an escaped comma",
"Unicode FTW"), $biographies); "Unicode FTW"), $biographies);
$this->assertEquals(array("Birthday","31/01/1988","31/01/1982","31/01/1882","31/06/1982"), $birthdays); $this->assertEquals(array("Birthday","31/01/1988","31/01/1982","31/01/1882","31/06/1982"), $birthdays);