Skip to content

Commit

Permalink
Fix tests around paths for windows.
Browse files Browse the repository at this point in the history
  • Loading branch information
euromark committed Apr 3, 2014
1 parent d33f210 commit 1b61a0c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions tests/TestCase/Core/AppTest.php
Expand Up @@ -121,7 +121,7 @@ public function testPathWithPlugins() {
Plugin::load('TestPlugin');

$result = App::path('Controller', 'TestPlugin');
$this->assertEquals($basepath . 'TestPlugin' . DS . 'Controller' . DS, $result[0]);
$this->assertPathEquals($basepath . 'TestPlugin' . DS . 'Controller' . DS, $result[0]);
}

/**
Expand Down Expand Up @@ -243,11 +243,11 @@ public function testPluginPath() {

$path = App::pluginPath('TestPlugin');
$expected = TEST_APP . 'Plugin' . DS . 'TestPlugin' . DS;
$this->assertEquals($expected, $path);
$this->assertPathEquals($expected, $path);

$path = App::pluginPath('TestPluginTwo');
$expected = TEST_APP . 'Plugin' . DS . 'TestPluginTwo' . DS;
$this->assertEquals($expected, $path);
$this->assertPathEquals($expected, $path);
}

/**
Expand All @@ -258,11 +258,11 @@ public function testPluginPath() {
public function testThemePath() {
$path = App::themePath('test_theme');
$expected = TEST_APP . 'TestApp' . DS . 'Template' . DS . 'Themed' . DS . 'TestTheme' . DS;
$this->assertEquals($expected, $path);
$this->assertPathEquals($expected, $path);

$path = App::themePath('TestTheme');
$expected = TEST_APP . 'TestApp' . DS . 'Template' . DS . 'Themed' . DS . 'TestTheme' . DS;
$this->assertEquals($expected, $path);
$this->assertPathEquals($expected, $path);
}

}
4 changes: 2 additions & 2 deletions tests/TestCase/Core/PluginTest.php
Expand Up @@ -221,10 +221,10 @@ public function testLoadNotFound() {
public function testPath() {
Plugin::load(array('TestPlugin', 'TestPluginTwo'));
$expected = TEST_APP . 'Plugin' . DS . 'TestPlugin' . DS;
$this->assertEquals(Plugin::path('TestPlugin'), $expected);
$this->assertPathEquals(Plugin::path('TestPlugin'), $expected);

$expected = TEST_APP . 'Plugin' . DS . 'TestPluginTwo' . DS;
$this->assertEquals(Plugin::path('TestPluginTwo'), $expected);
$this->assertPathEquals(Plugin::path('TestPluginTwo'), $expected);
}

/**
Expand Down

0 comments on commit 1b61a0c

Please sign in to comment.