Fix unit tests
This commit is contained in:
parent
ceb5b918d7
commit
ada8d4e0c9
|
@ -12,17 +12,32 @@ class Test_Urlgenerator extends PHPUnit_Framework_TestCase {
|
||||||
/**
|
/**
|
||||||
* @small
|
* @small
|
||||||
* @brief test absolute URL construction
|
* @brief test absolute URL construction
|
||||||
* @dataProvider provideURLs
|
* @dataProvider provideDocRootURLs
|
||||||
*/
|
*/
|
||||||
function testGetAbsoluteURL($url, $expectedResult) {
|
function testGetAbsoluteURLDocRoot($url, $expectedResult) {
|
||||||
|
|
||||||
|
\OC::$WEBROOT = '';
|
||||||
$urlGenerator = new \OC\URLGenerator(null);
|
$urlGenerator = new \OC\URLGenerator(null);
|
||||||
$result = $urlGenerator->getAbsoluteURL($url);
|
$result = $urlGenerator->getAbsoluteURL($url);
|
||||||
|
|
||||||
$this->assertEquals($expectedResult, $result);
|
$this->assertEquals($expectedResult, $result);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function provideURLs() {
|
/**
|
||||||
|
* @small
|
||||||
|
* @brief test absolute URL construction
|
||||||
|
* @dataProvider provideSubDirURLs
|
||||||
|
*/
|
||||||
|
function testGetAbsoluteURLSubDir($url, $expectedResult) {
|
||||||
|
|
||||||
|
\OC::$WEBROOT = '/owncloud';
|
||||||
|
$urlGenerator = new \OC\URLGenerator(null);
|
||||||
|
$result = $urlGenerator->getAbsoluteURL($url);
|
||||||
|
|
||||||
|
$this->assertEquals($expectedResult, $result);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function provideDocRootURLs() {
|
||||||
return array(
|
return array(
|
||||||
array("index.php", "http://localhost/index.php"),
|
array("index.php", "http://localhost/index.php"),
|
||||||
array("/index.php", "http://localhost/index.php"),
|
array("/index.php", "http://localhost/index.php"),
|
||||||
|
@ -30,5 +45,14 @@ class Test_Urlgenerator extends PHPUnit_Framework_TestCase {
|
||||||
array("apps/index.php", "http://localhost/apps/index.php"),
|
array("apps/index.php", "http://localhost/apps/index.php"),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function provideSubDirURLs() {
|
||||||
|
return array(
|
||||||
|
array("index.php", "http://localhost/owncloud/index.php"),
|
||||||
|
array("/index.php", "http://localhost/owncloud/index.php"),
|
||||||
|
array("/apps/index.php", "http://localhost/owncloud/apps/index.php"),
|
||||||
|
array("apps/index.php", "http://localhost/owncloud/apps/index.php"),
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue