Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

3.0 win compatibility fixes
  • Loading branch information...
commit de8f06b7118eb57cc5f89265b04949e086cd86c5 2 parents 6114883 + d54ef36
@sminnee sminnee authored
View
9 tests/core/manifest/ClassLoaderTest.php
@@ -37,13 +37,12 @@ public function testExclusive() {
}
public function testGetItemPath() {
- $ds = DIRECTORY_SEPARATOR;
$loader = new SS_ClassLoader();
$loader->pushManifest($this->testManifest1);
$this->assertEquals(
- $this->baseManifest1 . $ds . 'module' . $ds . 'classes' . $ds . 'ClassA.php',
- $loader->getItemPath('ClassA')
+ realpath($this->baseManifest1 . '/module/classes/ClassA.php'),
+ realpath($loader->getItemPath('ClassA'))
);
$this->assertEquals(
false,
@@ -64,8 +63,8 @@ public function testGetItemPath() {
$loader->getItemPath('UnknownClass')
);
$this->assertEquals(
- $this->baseManifest2 . $ds . 'module' . $ds . 'classes' . $ds . 'OtherClassA.php',
- $loader->getItemPath('OtherClassA')
+ realpath($this->baseManifest2 . '/module/classes/OtherClassA.php'),
+ realpath($loader->getItemPath('OtherClassA'))
);
}
}
View
6 tests/dev/CSVParserTest.php
@@ -19,7 +19,7 @@ public function testParsingWithHeaders() {
$this->assertEquals(array(
"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",
"Unicode FTW"), $biographies);
$this->assertEquals(array("31/01/1988","31/01/1982","31/01/1882","31/06/1982"), $birthdays);
@@ -49,7 +49,7 @@ public function testParsingWithHeadersAndColumnMap() {
$this->assertEquals(array('John','Jane','Jamie','Järg'), $firstNames);
$this->assertEquals(array(
"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",
"Unicode FTW"), $biographies);
$this->assertEquals(array("31/01/1988","31/01/1982","31/01/1882","31/06/1982"), $birthdays);
@@ -77,7 +77,7 @@ public function testParsingWithExplicitHeaderRow() {
$this->assertEquals(array(
'Biography',
"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",
"Unicode FTW"), $biographies);
$this->assertEquals(array("Birthday","31/01/1988","31/01/1982","31/01/1882","31/06/1982"), $birthdays);
Please sign in to comment.
Something went wrong with that request. Please try again.