aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/App/AppManagerTest.php29
-rw-r--r--tests/lib/AppFramework/Routing/RoutingTest.php141
-rw-r--r--tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php25
-rw-r--r--tests/lib/Share20/ManagerTest.php1
4 files changed, 106 insertions, 90 deletions
diff --git a/tests/lib/App/AppManagerTest.php b/tests/lib/App/AppManagerTest.php
index 1a5d6c648a1..5b6fedb1cc2 100644
--- a/tests/lib/App/AppManagerTest.php
+++ b/tests/lib/App/AppManagerTest.php
@@ -338,6 +338,35 @@ class AppManagerTest extends TestCase {
$this->assertEquals(\OC::$SERVERROOT . '/apps/files', $this->manager->getAppPath('files'));
}
+ public function testGetAppPathSymlink() {
+ $fakeAppDirname = sha1(uniqid('test', true));
+ $fakeAppPath = sys_get_temp_dir() . '/' . $fakeAppDirname;
+ $fakeAppLink = \OC::$SERVERROOT . '/' . $fakeAppDirname;
+
+ mkdir($fakeAppPath);
+ if (symlink($fakeAppPath, $fakeAppLink) === false) {
+ $this->markTestSkipped('Failed to create symlink');
+ }
+
+ // Use the symlink as the app path
+ \OC::$APPSROOTS[] = [
+ 'path' => $fakeAppLink,
+ 'url' => \OC::$WEBROOT . '/' . $fakeAppDirname,
+ 'writable' => false,
+ ];
+
+ $fakeTestAppPath = $fakeAppPath . '/' . 'test-test-app';
+ mkdir($fakeTestAppPath);
+
+ $generatedAppPath = $this->manager->getAppPath('test-test-app');
+
+ rmdir($fakeTestAppPath);
+ unlink($fakeAppLink);
+ rmdir($fakeAppPath);
+
+ $this->assertEquals($fakeAppLink . '/test-test-app', $generatedAppPath);
+ }
+
public function testGetAppPathFail() {
$this->expectException(AppPathNotFoundException::class);
$this->manager->getAppPath('testnotexisting');
diff --git a/tests/lib/AppFramework/Routing/RoutingTest.php b/tests/lib/AppFramework/Routing/RoutingTest.php
index 1aef757720b..34aaff82310 100644
--- a/tests/lib/AppFramework/Routing/RoutingTest.php
+++ b/tests/lib/AppFramework/Routing/RoutingTest.php
@@ -5,6 +5,7 @@ namespace Test\AppFramework\Routing;
use OC\AppFramework\DependencyInjection\DIContainer;
use OC\AppFramework\Routing\RouteActionHandler;
use OC\AppFramework\Routing\RouteConfig;
+use OC\Route\Route;
use OC\Route\Router;
use OCP\ILogger;
use OCP\Route\IRouter;
@@ -16,7 +17,15 @@ class RoutingTest extends \Test\TestCase {
['name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'GET']
]];
- $this->assertSimpleRoute($routes, 'folders.open', 'GET', '/folders/{folderId}/open', 'FoldersController', 'open');
+ $this->assertSimpleRoute($routes, 'folders.open', 'GET', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open');
+ }
+
+ public function testSimpleRouteWithUnderScoreNames() {
+ $routes = ['routes' => [
+ ['name' => 'admin_folders#open_current', 'url' => '/folders/{folderId}/open', 'verb' => 'delete', 'root' => '']
+ ]];
+
+ $this->assertSimpleRoute($routes, 'admin_folders.open_current', 'DELETE', '/folders/{folderId}/open', 'AdminFoldersController', 'openCurrent', [], [], '', true);
}
public function testSimpleOCSRoute() {
@@ -33,7 +42,7 @@ class RoutingTest extends \Test\TestCase {
['name' => 'folders#open', 'url' => '/folders/{folderId}/open']
]];
- $this->assertSimpleRoute($routes, 'folders.open', 'GET', '/folders/{folderId}/open', 'FoldersController', 'open');
+ $this->assertSimpleRoute($routes, 'folders.open', 'GET', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open');
}
public function testSimpleOCSRouteWithMissingVerb() {
@@ -50,7 +59,7 @@ class RoutingTest extends \Test\TestCase {
['name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete']
]];
- $this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open');
+ $this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open');
}
public function testSimpleOCSRouteWithLowercaseVerb() {
@@ -67,7 +76,7 @@ class RoutingTest extends \Test\TestCase {
['name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete', 'requirements' => ['something']]
]];
- $this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open', ['something']);
+ $this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open', ['something']);
}
public function testSimpleOCSRouteWithRequirements() {
@@ -84,7 +93,7 @@ class RoutingTest extends \Test\TestCase {
['name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete', [], 'defaults' => ['param' => 'foobar']]
]];
- $this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open', [], ['param' => 'foobar']);
+ $this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open', [], ['param' => 'foobar']);
}
@@ -102,7 +111,7 @@ class RoutingTest extends \Test\TestCase {
['name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete', 'postfix' => '_something']
]];
- $this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open', [], [], '_something');
+ $this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open', [], [], '_something');
}
public function testSimpleOCSRouteWithPostfix() {
@@ -114,7 +123,7 @@ class RoutingTest extends \Test\TestCase {
$this->assertSimpleOCSRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open', [], [], '_something');
}
-
+
public function testSimpleRouteWithBrokenName() {
$this->expectException(\UnexpectedValueException::class);
@@ -122,10 +131,10 @@ class RoutingTest extends \Test\TestCase {
['name' => 'folders_open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete']
]];
- // router mock
- $router = $this->getMockBuilder('\OC\Route\Router')
- ->setMethods(['create'])
- ->setConstructorArgs([$this->getMockBuilder(ILogger::class)->getMock()])
+ /** @var IRouter|MockObject $router */
+ $router = $this->getMockBuilder(Router::class)
+ ->onlyMethods(['create'])
+ ->setConstructorArgs([$this->createMock(ILogger::class)])
->getMock();
// load route configuration
@@ -135,7 +144,7 @@ class RoutingTest extends \Test\TestCase {
$config->register();
}
-
+
public function testSimpleOCSRouteWithBrokenName() {
$this->expectException(\UnexpectedValueException::class);
@@ -143,10 +152,10 @@ class RoutingTest extends \Test\TestCase {
['name' => 'folders_open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete']
]];
- // router mock
- $router = $this->getMockBuilder('\OC\Route\Router')
- ->setMethods(['create'])
- ->setConstructorArgs([$this->getMockBuilder(ILogger::class)->getMock()])
+ /** @var IRouter|MockObject $router */
+ $router = $this->getMockBuilder(Router::class)
+ ->onlyMethods(['create'])
+ ->setConstructorArgs([$this->createMock(ILogger::class)])
->getMock();
// load route configuration
@@ -156,14 +165,6 @@ class RoutingTest extends \Test\TestCase {
$config->register();
}
- public function testSimpleRouteWithUnderScoreNames() {
- $routes = ['routes' => [
- ['name' => 'admin_folders#open_current', 'url' => '/folders/{folderId}/open', 'verb' => 'delete']
- ]];
-
- $this->assertSimpleRoute($routes, 'admin_folders.open_current', 'DELETE', '/folders/{folderId}/open', 'AdminFoldersController', 'openCurrent');
- }
-
public function testSimpleOCSRouteWithUnderScoreNames() {
$routes = ['ocs' => [
['name' => 'admin_folders#open_current', 'url' => '/folders/{folderId}/open', 'verb' => 'delete']
@@ -193,23 +194,16 @@ class RoutingTest extends \Test\TestCase {
public function testResource() {
$routes = ['resources' => ['account' => ['url' => '/accounts']]];
- $this->assertResource($routes, 'account', '/accounts', 'AccountController', 'id');
+ $this->assertResource($routes, 'account', '/apps/app1/accounts', 'AccountController', 'id');
}
public function testResourceWithUnderScoreName() {
$routes = ['resources' => ['admin_accounts' => ['url' => '/admin/accounts']]];
- $this->assertResource($routes, 'admin_accounts', '/admin/accounts', 'AdminAccountsController', 'id');
+ $this->assertResource($routes, 'admin_accounts', '/apps/app1/admin/accounts', 'AdminAccountsController', 'id');
}
- /**
- * @param string $name
- * @param string $verb
- * @param string $url
- * @param string $controllerName
- * @param string $actionName
- */
- private function assertSimpleRoute($routes, $name, $verb, $url, $controllerName, $actionName, array $requirements=[], array $defaults=[], $postfix='') {
+ private function assertSimpleRoute($routes, $name, $verb, $url, $controllerName, $actionName, array $requirements = [], array $defaults = [], $postfix = '', $allowRootUrl = false): void {
if ($postfix) {
$name .= $postfix;
}
@@ -218,10 +212,10 @@ class RoutingTest extends \Test\TestCase {
$container = new DIContainer('app1');
$route = $this->mockRoute($container, $verb, $controllerName, $actionName, $requirements, $defaults);
- // router mock
- $router = $this->getMockBuilder('\OC\Route\Router')
- ->setMethods(['create'])
- ->setConstructorArgs([$this->getMockBuilder(ILogger::class)->getMock()])
+ /** @var IRouter|MockObject $router */
+ $router = $this->getMockBuilder(Router::class)
+ ->onlyMethods(['create'])
+ ->setConstructorArgs([$this->createMock(ILogger::class)])
->getMock();
// we expect create to be called once:
@@ -233,6 +227,9 @@ class RoutingTest extends \Test\TestCase {
// load route configuration
$config = new RouteConfig($container, $router, $routes);
+ if ($allowRootUrl) {
+ self::invokePrivate($config, 'rootUrlApps', [['app1']]);
+ }
$config->register();
}
@@ -265,10 +262,10 @@ class RoutingTest extends \Test\TestCase {
$container = new DIContainer('app1');
$route = $this->mockRoute($container, $verb, $controllerName, $actionName, $requirements, $defaults);
- // router mock
- $router = $this->getMockBuilder('\OC\Route\Router')
- ->setMethods(['create'])
- ->setConstructorArgs([$this->getMockBuilder(ILogger::class)->getMock()])
+ /** @var IRouter|MockObject $router */
+ $router = $this->getMockBuilder(Router::class)
+ ->onlyMethods(['create'])
+ ->setConstructorArgs([$this->createMock(ILogger::class)])
->getMock();
// we expect create to be called once:
@@ -294,8 +291,8 @@ class RoutingTest extends \Test\TestCase {
private function assertOCSResource($yaml, $resourceName, $url, $controllerName, $paramName): void {
/** @var IRouter|MockObject $router */
$router = $this->getMockBuilder(Router::class)
- ->setMethods(['create'])
- ->setConstructorArgs([$this->getMockBuilder(ILogger::class)->getMock()])
+ ->onlyMethods(['create'])
+ ->setConstructorArgs([$this->createMock(ILogger::class)])
->getMock();
// route mocks
@@ -352,10 +349,10 @@ class RoutingTest extends \Test\TestCase {
* @param string $paramName
*/
private function assertResource($yaml, $resourceName, $url, $controllerName, $paramName) {
- // router mock
- $router = $this->getMockBuilder('\OC\Route\Router')
- ->setMethods(['create'])
- ->setConstructorArgs([$this->getMockBuilder(ILogger::class)->getMock()])
+ /** @var IRouter|MockObject $router */
+ $router = $this->getMockBuilder(Router::class)
+ ->onlyMethods(['create'])
+ ->setConstructorArgs([$this->createMock(ILogger::class)])
->getMock();
// route mocks
@@ -412,7 +409,7 @@ class RoutingTest extends \Test\TestCase {
* @param string $actionName
* @param array $requirements
* @param array $defaults
- * @return \PHPUnit_Framework_MockObject_MockObject
+ * @return MockObject
*/
private function mockRoute(
DIContainer $container,
@@ -422,25 +419,25 @@ class RoutingTest extends \Test\TestCase {
array $requirements=[],
array $defaults=[]
) {
- $route = $this->getMockBuilder('\OC\Route\Route')
- ->setMethods(['method', 'action', 'requirements', 'defaults'])
+ $route = $this->getMockBuilder(Route::class)
+ ->onlyMethods(['method', 'action', 'requirements', 'defaults'])
->disableOriginalConstructor()
->getMock();
$route
- ->expects($this->exactly(1))
+ ->expects($this->once())
->method('method')
->with($this->equalTo($verb))
->willReturn($route);
$route
- ->expects($this->exactly(1))
+ ->expects($this->once())
->method('action')
->with($this->equalTo(new RouteActionHandler($container, $controllerName, $actionName)))
->willReturn($route);
if (count($requirements) > 0) {
$route
- ->expects($this->exactly(1))
+ ->expects($this->once())
->method('requirements')
->with($this->equalTo($requirements))
->willReturn($route);
@@ -448,7 +445,7 @@ class RoutingTest extends \Test\TestCase {
if (count($defaults) > 0) {
$route
- ->expects($this->exactly(1))
+ ->expects($this->once())
->method('defaults')
->with($this->equalTo($defaults))
->willReturn($route);
@@ -457,37 +454,3 @@ class RoutingTest extends \Test\TestCase {
return $route;
}
}
-
-/*
-#
-# sample routes.yaml for ownCloud
-#
-# the section simple describes one route
-
-routes:
- - name: folders#open
- url: /folders/{folderId}/open
- verb: GET
- # controller: name.split()[0]
- # action: name.split()[1]
-
-# for a resource following actions will be generated:
-# - index
-# - create
-# - show
-# - update
-# - destroy
-# - new
-resources:
- accounts:
- url: /accounts
-
- folders:
- url: /accounts/{accountId}/folders
- # actions can be used to define additional actions on the resource
- actions:
- - name: validate
- verb: GET
- on-collection: false
-
- * */
diff --git a/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php b/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php
index 98df129771a..7b461219456 100644
--- a/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php
+++ b/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php
@@ -27,20 +27,25 @@ namespace lib\Authentication\Login;
use OC\Authentication\Login\FinishRememberedLoginCommand;
use OC\User\Session;
+use OCP\IConfig;
use PHPUnit\Framework\MockObject\MockObject;
class FinishRememberedLoginCommandTest extends ALoginCommandTest {
/** @var Session|MockObject */
private $userSession;
+ /** @var IConfig|MockObject */
+ private $config;
protected function setUp(): void {
parent::setUp();
$this->userSession = $this->createMock(Session::class);
+ $this->config = $this->createMock(IConfig::class);
$this->cmd = new FinishRememberedLoginCommand(
- $this->userSession
+ $this->userSession,
+ $this->config
);
}
@@ -57,6 +62,10 @@ class FinishRememberedLoginCommandTest extends ALoginCommandTest {
public function testProcess() {
$data = $this->getLoggedInLoginData();
+ $this->config->expects($this->once())
+ ->method('getSystemValue')
+ ->with('auto_logout', false)
+ ->willReturn(false);
$this->userSession->expects($this->once())
->method('createRememberMeToken')
->with($this->user);
@@ -65,4 +74,18 @@ class FinishRememberedLoginCommandTest extends ALoginCommandTest {
$this->assertTrue($result->isSuccess());
}
+
+ public function testProcessNotRemeberedLoginWithAutologout() {
+ $data = $this->getLoggedInLoginData();
+ $this->config->expects($this->once())
+ ->method('getSystemValue')
+ ->with('auto_logout', false)
+ ->willReturn(true);
+ $this->userSession->expects($this->never())
+ ->method('createRememberMeToken');
+
+ $result = $this->cmd->process($data);
+
+ $this->assertTrue($result->isSuccess());
+ }
}
diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php
index d43777f0379..615b5358c9e 100644
--- a/tests/lib/Share20/ManagerTest.php
+++ b/tests/lib/Share20/ManagerTest.php
@@ -808,6 +808,7 @@ class ManagerTest extends \Test\TestCase {
['core', 'shareapi_enforce_expire_date', 'no', 'yes'],
['core', 'shareapi_expire_after_n_days', '7', '3'],
['core', 'shareapi_default_expire_date', 'no', 'yes'],
+ ['core', 'link_defaultExpDays', 3, '3'],
]);
$expected = new \DateTime();
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-30 07:01:30 +0000