nextcloud / server

tests/Core/Command/Group/InfoTest.php

Indentation +80 added lines, -80 removed lines

@@ -14,84 +14,84 @@
 use Test\TestCase;
 
 class InfoTest extends TestCase {
-	/** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $groupManager;
-
-	/** @var Info|\PHPUnit\Framework\MockObject\MockObject */
-	private $command;
-
-	/** @var InputInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $input;
-
-	/** @var OutputInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $output;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->command = $this->getMockBuilder(Info::class)
-			->setConstructorArgs([$this->groupManager])
-			->onlyMethods(['writeArrayInOutputFormat'])
-			->getMock();
-
-		$this->input = $this->createMock(InputInterface::class);
-		$this->output = $this->createMock(OutputInterface::class);
-	}
-
-	public function testDoesNotExists(): void {
-		$gid = 'myGroup';
-		$this->input->method('getArgument')
-			->willReturnCallback(function ($arg) use ($gid) {
-				if ($arg === 'groupid') {
-					return $gid;
-				}
-				throw new \Exception();
-			});
-		$this->groupManager->method('get')
-			->with($gid)
-			->willReturn(null);
-
-		$this->output->expects($this->once())
-			->method('writeln')
-			->with($this->equalTo('<error>Group "' . $gid . '" does not exist.</error>'));
-
-		$this->invokePrivate($this->command, 'execute', [$this->input, $this->output]);
-	}
-
-	public function testInfo(): void {
-		$gid = 'myGroup';
-		$this->input->method('getArgument')
-			->willReturnCallback(function ($arg) use ($gid) {
-				if ($arg === 'groupid') {
-					return $gid;
-				}
-				throw new \Exception();
-			});
-
-		$group = $this->createMock(IGroup::class);
-		$group->method('getGID')->willReturn($gid);
-		$group->method('getDisplayName')
-			->willReturn('My Group');
-		$group->method('getBackendNames')
-			->willReturn(['Database']);
-
-		$this->groupManager->method('get')
-			->with($gid)
-			->willReturn($group);
-
-		$this->command->expects($this->once())
-			->method('writeArrayInOutputFormat')
-			->with(
-				$this->equalTo($this->input),
-				$this->equalTo($this->output),
-				[
-					'groupID' => 'myGroup',
-					'displayName' => 'My Group',
-					'backends' => ['Database'],
-				]
-			);
-
-		$this->invokePrivate($this->command, 'execute', [$this->input, $this->output]);
-	}
+    /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
+    private $groupManager;
+
+    /** @var Info|\PHPUnit\Framework\MockObject\MockObject */
+    private $command;
+
+    /** @var InputInterface|\PHPUnit\Framework\MockObject\MockObject */
+    private $input;
+
+    /** @var OutputInterface|\PHPUnit\Framework\MockObject\MockObject */
+    private $output;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->command = $this->getMockBuilder(Info::class)
+            ->setConstructorArgs([$this->groupManager])
+            ->onlyMethods(['writeArrayInOutputFormat'])
+            ->getMock();
+
+        $this->input = $this->createMock(InputInterface::class);
+        $this->output = $this->createMock(OutputInterface::class);
+    }
+
+    public function testDoesNotExists(): void {
+        $gid = 'myGroup';
+        $this->input->method('getArgument')
+            ->willReturnCallback(function ($arg) use ($gid) {
+                if ($arg === 'groupid') {
+                    return $gid;
+                }
+                throw new \Exception();
+            });
+        $this->groupManager->method('get')
+            ->with($gid)
+            ->willReturn(null);
+
+        $this->output->expects($this->once())
+            ->method('writeln')
+            ->with($this->equalTo('<error>Group "' . $gid . '" does not exist.</error>'));
+
+        $this->invokePrivate($this->command, 'execute', [$this->input, $this->output]);
+    }
+
+    public function testInfo(): void {
+        $gid = 'myGroup';
+        $this->input->method('getArgument')
+            ->willReturnCallback(function ($arg) use ($gid) {
+                if ($arg === 'groupid') {
+                    return $gid;
+                }
+                throw new \Exception();
+            });
+
+        $group = $this->createMock(IGroup::class);
+        $group->method('getGID')->willReturn($gid);
+        $group->method('getDisplayName')
+            ->willReturn('My Group');
+        $group->method('getBackendNames')
+            ->willReturn(['Database']);
+
+        $this->groupManager->method('get')
+            ->with($gid)
+            ->willReturn($group);
+
+        $this->command->expects($this->once())
+            ->method('writeArrayInOutputFormat')
+            ->with(
+                $this->equalTo($this->input),
+                $this->equalTo($this->output),
+                [
+                    'groupID' => 'myGroup',
+                    'displayName' => 'My Group',
+                    'backends' => ['Database'],
+                ]
+            );
+
+        $this->invokePrivate($this->command, 'execute', [$this->input, $this->output]);
+    }
 }

tests/Core/Command/Group/ListCommandTest.php

Indentation +185 added lines, -185 removed lines

@@ -15,189 +15,189 @@
 use Test\TestCase;
 
 class ListCommandTest extends TestCase {
-	/** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $groupManager;
-
-	/** @var ListCommand|\PHPUnit\Framework\MockObject\MockObject */
-	private $command;
-
-	/** @var InputInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $input;
-
-	/** @var OutputInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $output;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->command = $this->getMockBuilder(ListCommand::class)
-			->setConstructorArgs([$this->groupManager])
-			->onlyMethods(['writeArrayInOutputFormat'])
-			->getMock();
-
-		$this->input = $this->createMock(InputInterface::class);
-		$this->output = $this->createMock(OutputInterface::class);
-	}
-
-	public function testExecute(): void {
-		$group1 = $this->createMock(IGroup::class);
-		$group1->method('getGID')->willReturn('group1');
-		$group2 = $this->createMock(IGroup::class);
-		$group2->method('getGID')->willReturn('group2');
-		$group3 = $this->createMock(IGroup::class);
-		$group3->method('getGID')->willReturn('group3');
-
-		$user = $this->createMock(IUser::class);
-
-		$this->groupManager->method('search')
-			->with(
-				'',
-				100,
-				42,
-			)->willReturn([$group1, $group2, $group3]);
-
-		$group1->method('getUsers')
-			->willReturn([
-				'user1' => $user,
-				'user2' => $user,
-			]);
-
-		$group2->method('getUsers')
-			->willReturn([
-			]);
-
-		$group3->method('getUsers')
-			->willReturn([
-				'user1' => $user,
-				'user3' => $user,
-			]);
-
-		$this->input->method('getOption')
-			->willReturnCallback(function ($arg) {
-				if ($arg === 'limit') {
-					return '100';
-				} elseif ($arg === 'offset') {
-					return '42';
-				} elseif ($arg === 'info') {
-					return null;
-				}
-				throw new \Exception();
-			});
-
-		$this->command->expects($this->once())
-			->method('writeArrayInOutputFormat')
-			->with(
-				$this->equalTo($this->input),
-				$this->equalTo($this->output),
-				$this->callback(
-					fn ($iterator) => iterator_to_array($iterator) === [
-						'group1' => [
-							'user1',
-							'user2',
-						],
-						'group2' => [
-						],
-						'group3' => [
-							'user1',
-							'user3',
-						]
-					]
-				)
-			);
-
-		$this->invokePrivate($this->command, 'execute', [$this->input, $this->output]);
-	}
-
-	public function testInfo(): void {
-		$group1 = $this->createMock(IGroup::class);
-		$group1->method('getGID')->willReturn('group1');
-		$group1->method('getDisplayName')->willReturn('Group 1');
-		$group2 = $this->createMock(IGroup::class);
-		$group2->method('getGID')->willReturn('group2');
-		$group2->method('getDisplayName')->willReturn('Group 2');
-		$group3 = $this->createMock(IGroup::class);
-		$group3->method('getGID')->willReturn('group3');
-		$group3->method('getDisplayName')->willReturn('Group 3');
-
-		$user = $this->createMock(IUser::class);
-
-		$this->groupManager->method('search')
-			->with(
-				'',
-				100,
-				42,
-			)->willReturn([$group1, $group2, $group3]);
-
-		$group1->method('getUsers')
-			->willReturn([
-				'user1' => $user,
-				'user2' => $user,
-			]);
-
-		$group1->method('getBackendNames')
-			->willReturn(['Database']);
-
-		$group2->method('getUsers')
-			->willReturn([
-			]);
-
-		$group2->method('getBackendNames')
-			->willReturn(['Database']);
-
-		$group3->method('getUsers')
-			->willReturn([
-				'user1' => $user,
-				'user3' => $user,
-			]);
-
-		$group3->method('getBackendNames')
-			->willReturn(['LDAP']);
-
-		$this->input->method('getOption')
-			->willReturnCallback(function ($arg) {
-				if ($arg === 'limit') {
-					return '100';
-				} elseif ($arg === 'offset') {
-					return '42';
-				} elseif ($arg === 'info') {
-					return true;
-				}
-				throw new \Exception();
-			});
-
-		$this->command->expects($this->once())
-			->method('writeArrayInOutputFormat')
-			->with(
-				$this->equalTo($this->input),
-				$this->equalTo($this->output),
-				$this->callback(
-					fn ($iterator) => iterator_to_array($iterator) === [
-						'group1' => [
-							'displayName' => 'Group 1',
-							'backends' => ['Database'],
-							'users' => [
-								'user1',
-								'user2',
-							],
-						],
-						'group2' => [
-							'displayName' => 'Group 2',
-							'backends' => ['Database'],
-							'users' => [],
-						],
-						'group3' => [
-							'displayName' => 'Group 3',
-							'backends' => ['LDAP'],
-							'users' => [
-								'user1',
-								'user3',
-							],
-						]
-					]
-				)
-			);
-
-		$this->invokePrivate($this->command, 'execute', [$this->input, $this->output]);
-	}
+    /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
+    private $groupManager;
+
+    /** @var ListCommand|\PHPUnit\Framework\MockObject\MockObject */
+    private $command;
+
+    /** @var InputInterface|\PHPUnit\Framework\MockObject\MockObject */
+    private $input;
+
+    /** @var OutputInterface|\PHPUnit\Framework\MockObject\MockObject */
+    private $output;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->command = $this->getMockBuilder(ListCommand::class)
+            ->setConstructorArgs([$this->groupManager])
+            ->onlyMethods(['writeArrayInOutputFormat'])
+            ->getMock();
+
+        $this->input = $this->createMock(InputInterface::class);
+        $this->output = $this->createMock(OutputInterface::class);
+    }
+
+    public function testExecute(): void {
+        $group1 = $this->createMock(IGroup::class);
+        $group1->method('getGID')->willReturn('group1');
+        $group2 = $this->createMock(IGroup::class);
+        $group2->method('getGID')->willReturn('group2');
+        $group3 = $this->createMock(IGroup::class);
+        $group3->method('getGID')->willReturn('group3');
+
+        $user = $this->createMock(IUser::class);
+
+        $this->groupManager->method('search')
+            ->with(
+                '',
+                100,
+                42,
+            )->willReturn([$group1, $group2, $group3]);
+
+        $group1->method('getUsers')
+            ->willReturn([
+                'user1' => $user,
+                'user2' => $user,
+            ]);
+
+        $group2->method('getUsers')
+            ->willReturn([
+            ]);
+
+        $group3->method('getUsers')
+            ->willReturn([
+                'user1' => $user,
+                'user3' => $user,
+            ]);
+
+        $this->input->method('getOption')
+            ->willReturnCallback(function ($arg) {
+                if ($arg === 'limit') {
+                    return '100';
+                } elseif ($arg === 'offset') {
+                    return '42';
+                } elseif ($arg === 'info') {
+                    return null;
+                }
+                throw new \Exception();
+            });
+
+        $this->command->expects($this->once())
+            ->method('writeArrayInOutputFormat')
+            ->with(
+                $this->equalTo($this->input),
+                $this->equalTo($this->output),
+                $this->callback(
+                    fn ($iterator) => iterator_to_array($iterator) === [
+                        'group1' => [
+                            'user1',
+                            'user2',
+                        ],
+                        'group2' => [
+                        ],
+                        'group3' => [
+                            'user1',
+                            'user3',
+                        ]
+                    ]
+                )
+            );
+
+        $this->invokePrivate($this->command, 'execute', [$this->input, $this->output]);
+    }
+
+    public function testInfo(): void {
+        $group1 = $this->createMock(IGroup::class);
+        $group1->method('getGID')->willReturn('group1');
+        $group1->method('getDisplayName')->willReturn('Group 1');
+        $group2 = $this->createMock(IGroup::class);
+        $group2->method('getGID')->willReturn('group2');
+        $group2->method('getDisplayName')->willReturn('Group 2');
+        $group3 = $this->createMock(IGroup::class);
+        $group3->method('getGID')->willReturn('group3');
+        $group3->method('getDisplayName')->willReturn('Group 3');
+
+        $user = $this->createMock(IUser::class);
+
+        $this->groupManager->method('search')
+            ->with(
+                '',
+                100,
+                42,
+            )->willReturn([$group1, $group2, $group3]);
+
+        $group1->method('getUsers')
+            ->willReturn([
+                'user1' => $user,
+                'user2' => $user,
+            ]);
+
+        $group1->method('getBackendNames')
+            ->willReturn(['Database']);
+
+        $group2->method('getUsers')
+            ->willReturn([
+            ]);
+
+        $group2->method('getBackendNames')
+            ->willReturn(['Database']);
+
+        $group3->method('getUsers')
+            ->willReturn([
+                'user1' => $user,
+                'user3' => $user,
+            ]);
+
+        $group3->method('getBackendNames')
+            ->willReturn(['LDAP']);
+
+        $this->input->method('getOption')
+            ->willReturnCallback(function ($arg) {
+                if ($arg === 'limit') {
+                    return '100';
+                } elseif ($arg === 'offset') {
+                    return '42';
+                } elseif ($arg === 'info') {
+                    return true;
+                }
+                throw new \Exception();
+            });
+
+        $this->command->expects($this->once())
+            ->method('writeArrayInOutputFormat')
+            ->with(
+                $this->equalTo($this->input),
+                $this->equalTo($this->output),
+                $this->callback(
+                    fn ($iterator) => iterator_to_array($iterator) === [
+                        'group1' => [
+                            'displayName' => 'Group 1',
+                            'backends' => ['Database'],
+                            'users' => [
+                                'user1',
+                                'user2',
+                            ],
+                        ],
+                        'group2' => [
+                            'displayName' => 'Group 2',
+                            'backends' => ['Database'],
+                            'users' => [],
+                        ],
+                        'group3' => [
+                            'displayName' => 'Group 3',
+                            'backends' => ['LDAP'],
+                            'users' => [
+                                'user1',
+                                'user3',
+                            ],
+                        ]
+                    ]
+                )
+            );
+
+        $this->invokePrivate($this->command, 'execute', [$this->input, $this->output]);
+    }
 }

tests/Core/Command/User/SettingTest.php

Indentation +445 added lines, -445 removed lines

@@ -16,449 +16,449 @@
 use Test\TestCase;
 
 class SettingTest extends TestCase {
-	/** @var \OCP\IUserManager|\PHPUnit\Framework\MockObject\MockObject */
-	protected $userManager;
-	/** @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	protected $config;
-	/** @var \OCP\IDBConnection|\PHPUnit\Framework\MockObject\MockObject */
-	protected $connection;
-	/** @var \Symfony\Component\Console\Input\InputInterface|\PHPUnit\Framework\MockObject\MockObject */
-	protected $consoleInput;
-	/** @var \Symfony\Component\Console\Output\OutputInterface|\PHPUnit\Framework\MockObject\MockObject */
-	protected $consoleOutput;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->userManager = $this->getMockBuilder(IUserManager::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->config = $this->getMockBuilder(IConfig::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->connection = $this->getMockBuilder(IDBConnection::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->consoleInput = $this->getMockBuilder(InputInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->consoleOutput = $this->getMockBuilder(OutputInterface::class)
-			->disableOriginalConstructor()
-			->getMock();
-	}
-
-	public function getCommand(array $methods = []) {
-		if (empty($methods)) {
-			return new Setting($this->userManager, $this->config);
-		} else {
-			$mock = $this->getMockBuilder(Setting::class)
-				->setConstructorArgs([
-					$this->userManager,
-					$this->config,
-				])
-				->onlyMethods($methods)
-				->getMock();
-			return $mock;
-		}
-	}
-
-	public static function dataCheckInput(): array {
-		return [
-			[
-				[['uid', 'username']],
-				[['ignore-missing-user', true]],
-				[],
-				false,
-				false,
-			],
-			[
-				[['uid', 'username']],
-				[['ignore-missing-user', false]],
-				[],
-				null,
-				'The user "username" does not exist.',
-			],
-
-			[
-				[['uid', 'username'], ['key', 'configkey']],
-				[['ignore-missing-user', true]],
-				[['--default-value', false, true]],
-				false,
-				false,
-			],
-			[
-				[['uid', 'username'], ['key', '']],
-				[['ignore-missing-user', true]],
-				[['--default-value', false, true]],
-				false,
-				'The "default-value" option can only be used when specifying a key.',
-			],
-
-			[
-				[['uid', 'username'], ['key', 'configkey'], ['value', '']],
-				[['ignore-missing-user', true]],
-				[],
-				false,
-				false,
-			],
-			[
-				[['uid', 'username'], ['key', ''], ['value', '']],
-				[['ignore-missing-user', true]],
-				[],
-				false,
-				'The value argument can only be used when specifying a key.',
-			],
-			[
-				[['uid', 'username'], ['key', 'configkey'], ['value', '']],
-				[['ignore-missing-user', true]],
-				[['--default-value', false, true]],
-				false,
-				'The value argument can not be used together with "default-value".',
-			],
-			[
-				[['uid', 'username'], ['key', 'configkey'], ['value', '']],
-				[['ignore-missing-user', true], ['update-only', true]],
-				[],
-				false,
-				false,
-			],
-			[
-				[['uid', 'username'], ['key', 'configkey'], ['value', null]],
-				[['ignore-missing-user', true], ['update-only', true]],
-				[],
-				false,
-				'The "update-only" option can only be used together with "value".',
-			],
-
-			[
-				[['uid', 'username'], ['key', 'configkey']],
-				[['ignore-missing-user', true], ['delete', true]],
-				[],
-				false,
-				false,
-			],
-			[
-				[['uid', 'username'], ['key', '']],
-				[['ignore-missing-user', true], ['delete', true]],
-				[],
-				false,
-				'The "delete" option can only be used when specifying a key.',
-			],
-			[
-				[['uid', 'username'], ['key', 'configkey']],
-				[['ignore-missing-user', true], ['delete', true]],
-				[['--default-value', false, true]],
-				false,
-				'The "delete" option can not be used together with "default-value".',
-			],
-			[
-				[['uid', 'username'], ['key', 'configkey'], ['value', '']],
-				[['ignore-missing-user', true], ['delete', true]],
-				[],
-				false,
-				'The "delete" option can not be used together with "value".',
-			],
-			[
-				[['uid', 'username'], ['key', 'configkey']],
-				[['ignore-missing-user', true], ['delete', true], ['error-if-not-exists', true]],
-				[],
-				false,
-				false,
-			],
-			[
-				[['uid', 'username'], ['key', 'configkey']],
-				[['ignore-missing-user', true], ['delete', false], ['error-if-not-exists', true]],
-				[],
-				false,
-				'The "error-if-not-exists" option can only be used together with "delete".',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider dataCheckInput
-	 *
-	 * @param array $arguments
-	 * @param array $options
-	 * @param array $parameterOptions
-	 * @param mixed $user
-	 * @param string $expectedException
-	 */
-	public function testCheckInput($arguments, $options, $parameterOptions, $user, $expectedException): void {
-		$this->consoleInput->expects($this->any())
-			->method('getArgument')
-			->willReturnMap($arguments);
-		$this->consoleInput->expects($this->any())
-			->method('getOption')
-			->willReturnMap($options);
-		$this->consoleInput->expects($this->any())
-			->method('hasParameterOption')
-			->willReturnCallback(function (string|array $config, bool $default = false) use ($parameterOptions): bool {
-				foreach ($parameterOptions as $parameterOption) {
-					if ($config === $parameterOption[0]
-						// Check the default value if the maps has 3 entries
-						&& (!isset($parameterOption[2]) || $default === $parameterOption[1])) {
-						return end($parameterOption);
-					}
-				}
-				return false;
-			});
-
-		if ($user !== false) {
-			$this->userManager->expects($this->once())
-				->method('get')
-				->willReturn($user);
-		} else {
-			$this->userManager->expects($this->never())
-				->method('get');
-		}
-
-		$command = $this->getCommand();
-		try {
-			$this->invokePrivate($command, 'checkInput', [$this->consoleInput]);
-			$this->assertFalse($expectedException);
-		} catch (\InvalidArgumentException $e) {
-			$this->assertEquals($expectedException, $e->getMessage());
-		}
-	}
-
-	public function testCheckInputExceptionCatch(): void {
-		$command = $this->getCommand(['checkInput']);
-		$command->expects($this->once())
-			->method('checkInput')
-			->willThrowException(new \InvalidArgumentException('test'));
-
-		$this->consoleOutput->expects($this->once())
-			->method('writeln')
-			->with('<error>test</error>');
-
-		$this->assertEquals(1, $this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]));
-	}
-
-	public static function dataExecuteDelete(): array {
-		return [
-			['config', false, null, 0],
-			['config', true, null, 0],
-			[null, false, null, 0],
-			[null, true, '<error>The setting does not exist for user "username".</error>', 1],
-		];
-	}
-
-	/**
-	 * @dataProvider dataExecuteDelete
-	 *
-	 * @param string|null $value
-	 * @param bool $errorIfNotExists
-	 * @param string $expectedLine
-	 * @param int $expectedReturn
-	 */
-	public function testExecuteDelete($value, $errorIfNotExists, $expectedLine, $expectedReturn): void {
-		$command = $this->getCommand([
-			'writeArrayInOutputFormat',
-			'checkInput',
-			'getUserSettings',
-		]);
-
-		$this->consoleInput->expects($this->any())
-			->method('getArgument')
-			->willReturnMap([
-				['uid', 'username'],
-				['app', 'appname'],
-				['key', 'configkey'],
-			]);
-
-		$command->expects($this->once())
-			->method('checkInput');
-
-		$this->config->expects($this->once())
-			->method('getUserValue')
-			->with('username', 'appname', 'configkey', null)
-			->willReturn($value);
-
-		$this->consoleInput->expects($this->atLeastOnce())
-			->method('hasParameterOption')
-			->willReturnMap([
-				['--delete', false, true],
-				['--error-if-not-exists', false, $errorIfNotExists],
-			]);
-
-		if ($expectedLine === null) {
-			$this->consoleOutput->expects($this->never())
-				->method('writeln');
-			$this->config->expects($this->once())
-				->method('deleteUserValue')
-				->with('username', 'appname', 'configkey');
-		} else {
-			$this->consoleOutput->expects($this->once())
-				->method('writeln')
-				->with($expectedLine);
-			$this->config->expects($this->never())
-				->method('deleteUserValue');
-		}
-
-		$this->assertEquals($expectedReturn, $this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]));
-	}
-
-	public static function dataExecuteSet(): array {
-		return [
-			['config', false, null, 0],
-			['config', true, null, 0],
-			[null, false, null, 0],
-			[null, true, '<error>The setting does not exist for user "username".</error>', 1],
-		];
-	}
-
-	/**
-	 * @dataProvider dataExecuteSet
-	 *
-	 * @param string|null $value
-	 * @param bool $updateOnly
-	 * @param string $expectedLine
-	 * @param int $expectedReturn
-	 */
-	public function testExecuteSet($value, $updateOnly, $expectedLine, $expectedReturn): void {
-		$command = $this->getCommand([
-			'writeArrayInOutputFormat',
-			'checkInput',
-			'getUserSettings',
-		]);
-
-		$this->consoleInput->expects($this->atLeast(4))
-			->method('getArgument')
-			->willReturnMap([
-				['uid', 'username'],
-				['app', 'appname'],
-				['key', 'configkey'],
-				['value', 'setValue'],
-			]);
-
-		$command->expects($this->once())
-			->method('checkInput');
-
-		$this->config->expects($this->once())
-			->method('getUserValue')
-			->with('username', 'appname', 'configkey', null)
-			->willReturn($value);
-
-		$this->consoleInput->expects($this->atLeastOnce())
-			->method('hasParameterOption')
-			->willReturnMap([
-				['--update-only', false, $updateOnly],
-			]);
-
-		if ($expectedLine === null) {
-			$this->consoleOutput->expects($this->never())
-				->method('writeln');
-
-			$this->consoleInput->expects($this->never())
-				->method('getOption');
-
-			$this->config->expects($this->once())
-				->method('setUserValue')
-				->with('username', 'appname', 'configkey', 'setValue');
-		} else {
-			$this->consoleOutput->expects($this->once())
-				->method('writeln')
-				->with($expectedLine);
-			$this->config->expects($this->never())
-				->method('setUserValue');
-		}
-
-		$this->assertEquals($expectedReturn, $this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]));
-	}
-
-	public static function dataExecuteGet(): array {
-		return [
-			['config', null, 'config', 0],
-			[null, 'config', 'config', 0],
-			[null, null, '<error>The setting does not exist for user "username".</error>', 1],
-		];
-	}
-
-	/**
-	 * @dataProvider dataExecuteGet
-	 *
-	 * @param string|null $value
-	 * @param string|null $defaultValue
-	 * @param string $expectedLine
-	 * @param int $expectedReturn
-	 */
-	public function testExecuteGet($value, $defaultValue, $expectedLine, $expectedReturn): void {
-		$command = $this->getCommand([
-			'writeArrayInOutputFormat',
-			'checkInput',
-			'getUserSettings',
-		]);
-
-		$this->consoleInput->expects($this->any())
-			->method('getArgument')
-			->willReturnMap([
-				['uid', 'username'],
-				['app', 'appname'],
-				['key', 'configkey'],
-			]);
-
-		$command->expects($this->once())
-			->method('checkInput');
-
-		$this->config->expects($this->once())
-			->method('getUserValue')
-			->with('username', 'appname', 'configkey', null)
-			->willReturn($value);
-
-		if ($value === null) {
-			if ($defaultValue === null) {
-				$this->consoleInput->expects($this->atLeastOnce())
-					->method('hasParameterOption')
-					->willReturn(false);
-			} else {
-				$this->consoleInput->expects($this->atLeastOnce())
-					->method('hasParameterOption')
-					->willReturnCallback(function (string|array $config, bool $default = false): bool {
-						if ($config === '--default-value' && $default === false) {
-							return true;
-						}
-						return false;
-					});
-				$this->consoleInput->expects($this->once())
-					->method('getOption')
-					->with('default-value')
-					->willReturn($defaultValue);
-			}
-		}
-
-		$this->consoleOutput->expects($this->once())
-			->method('writeln')
-			->with($expectedLine);
-
-		$this->assertEquals($expectedReturn, $this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]));
-	}
-
-	public function testExecuteList(): void {
-		$command = $this->getCommand([
-			'writeArrayInOutputFormat',
-			'checkInput',
-			'getUserSettings',
-		]);
-
-		$this->consoleInput->expects($this->any())
-			->method('getArgument')
-			->willReturnMap([
-				['uid', 'username'],
-				['app', 'appname'],
-				['key', ''],
-			]);
-
-		$command->expects($this->once())
-			->method('checkInput');
-		$command->expects($this->once())
-			->method('getUserSettings')
-			->willReturn(['settings']);
-		$command->expects($this->once())
-			->method('writeArrayInOutputFormat')
-			->with($this->consoleInput, $this->consoleOutput, ['settings']);
-
-
-		$this->assertEquals(0, $this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]));
-	}
+    /** @var \OCP\IUserManager|\PHPUnit\Framework\MockObject\MockObject */
+    protected $userManager;
+    /** @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject */
+    protected $config;
+    /** @var \OCP\IDBConnection|\PHPUnit\Framework\MockObject\MockObject */
+    protected $connection;
+    /** @var \Symfony\Component\Console\Input\InputInterface|\PHPUnit\Framework\MockObject\MockObject */
+    protected $consoleInput;
+    /** @var \Symfony\Component\Console\Output\OutputInterface|\PHPUnit\Framework\MockObject\MockObject */
+    protected $consoleOutput;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->userManager = $this->getMockBuilder(IUserManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->config = $this->getMockBuilder(IConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->connection = $this->getMockBuilder(IDBConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->consoleInput = $this->getMockBuilder(InputInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->consoleOutput = $this->getMockBuilder(OutputInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    public function getCommand(array $methods = []) {
+        if (empty($methods)) {
+            return new Setting($this->userManager, $this->config);
+        } else {
+            $mock = $this->getMockBuilder(Setting::class)
+                ->setConstructorArgs([
+                    $this->userManager,
+                    $this->config,
+                ])
+                ->onlyMethods($methods)
+                ->getMock();
+            return $mock;
+        }
+    }
+
+    public static function dataCheckInput(): array {
+        return [
+            [
+                [['uid', 'username']],
+                [['ignore-missing-user', true]],
+                [],
+                false,
+                false,
+            ],
+            [
+                [['uid', 'username']],
+                [['ignore-missing-user', false]],
+                [],
+                null,
+                'The user "username" does not exist.',
+            ],
+
+            [
+                [['uid', 'username'], ['key', 'configkey']],
+                [['ignore-missing-user', true]],
+                [['--default-value', false, true]],
+                false,
+                false,
+            ],
+            [
+                [['uid', 'username'], ['key', '']],
+                [['ignore-missing-user', true]],
+                [['--default-value', false, true]],
+                false,
+                'The "default-value" option can only be used when specifying a key.',
+            ],
+
+            [
+                [['uid', 'username'], ['key', 'configkey'], ['value', '']],
+                [['ignore-missing-user', true]],
+                [],
+                false,
+                false,
+            ],
+            [
+                [['uid', 'username'], ['key', ''], ['value', '']],
+                [['ignore-missing-user', true]],
+                [],
+                false,
+                'The value argument can only be used when specifying a key.',
+            ],
+            [
+                [['uid', 'username'], ['key', 'configkey'], ['value', '']],
+                [['ignore-missing-user', true]],
+                [['--default-value', false, true]],
+                false,
+                'The value argument can not be used together with "default-value".',
+            ],
+            [
+                [['uid', 'username'], ['key', 'configkey'], ['value', '']],
+                [['ignore-missing-user', true], ['update-only', true]],
+                [],
+                false,
+                false,
+            ],
+            [
+                [['uid', 'username'], ['key', 'configkey'], ['value', null]],
+                [['ignore-missing-user', true], ['update-only', true]],
+                [],
+                false,
+                'The "update-only" option can only be used together with "value".',
+            ],
+
+            [
+                [['uid', 'username'], ['key', 'configkey']],
+                [['ignore-missing-user', true], ['delete', true]],
+                [],
+                false,
+                false,
+            ],
+            [
+                [['uid', 'username'], ['key', '']],
+                [['ignore-missing-user', true], ['delete', true]],
+                [],
+                false,
+                'The "delete" option can only be used when specifying a key.',
+            ],
+            [
+                [['uid', 'username'], ['key', 'configkey']],
+                [['ignore-missing-user', true], ['delete', true]],
+                [['--default-value', false, true]],
+                false,
+                'The "delete" option can not be used together with "default-value".',
+            ],
+            [
+                [['uid', 'username'], ['key', 'configkey'], ['value', '']],
+                [['ignore-missing-user', true], ['delete', true]],
+                [],
+                false,
+                'The "delete" option can not be used together with "value".',
+            ],
+            [
+                [['uid', 'username'], ['key', 'configkey']],
+                [['ignore-missing-user', true], ['delete', true], ['error-if-not-exists', true]],
+                [],
+                false,
+                false,
+            ],
+            [
+                [['uid', 'username'], ['key', 'configkey']],
+                [['ignore-missing-user', true], ['delete', false], ['error-if-not-exists', true]],
+                [],
+                false,
+                'The "error-if-not-exists" option can only be used together with "delete".',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider dataCheckInput
+     *
+     * @param array $arguments
+     * @param array $options
+     * @param array $parameterOptions
+     * @param mixed $user
+     * @param string $expectedException
+     */
+    public function testCheckInput($arguments, $options, $parameterOptions, $user, $expectedException): void {
+        $this->consoleInput->expects($this->any())
+            ->method('getArgument')
+            ->willReturnMap($arguments);
+        $this->consoleInput->expects($this->any())
+            ->method('getOption')
+            ->willReturnMap($options);
+        $this->consoleInput->expects($this->any())
+            ->method('hasParameterOption')
+            ->willReturnCallback(function (string|array $config, bool $default = false) use ($parameterOptions): bool {
+                foreach ($parameterOptions as $parameterOption) {
+                    if ($config === $parameterOption[0]
+                        // Check the default value if the maps has 3 entries
+                        && (!isset($parameterOption[2]) || $default === $parameterOption[1])) {
+                        return end($parameterOption);
+                    }
+                }
+                return false;
+            });
+
+        if ($user !== false) {
+            $this->userManager->expects($this->once())
+                ->method('get')
+                ->willReturn($user);
+        } else {
+            $this->userManager->expects($this->never())
+                ->method('get');
+        }
+
+        $command = $this->getCommand();
+        try {
+            $this->invokePrivate($command, 'checkInput', [$this->consoleInput]);
+            $this->assertFalse($expectedException);
+        } catch (\InvalidArgumentException $e) {
+            $this->assertEquals($expectedException, $e->getMessage());
+        }
+    }
+
+    public function testCheckInputExceptionCatch(): void {
+        $command = $this->getCommand(['checkInput']);
+        $command->expects($this->once())
+            ->method('checkInput')
+            ->willThrowException(new \InvalidArgumentException('test'));
+
+        $this->consoleOutput->expects($this->once())
+            ->method('writeln')
+            ->with('<error>test</error>');
+
+        $this->assertEquals(1, $this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]));
+    }
+
+    public static function dataExecuteDelete(): array {
+        return [
+            ['config', false, null, 0],
+            ['config', true, null, 0],
+            [null, false, null, 0],
+            [null, true, '<error>The setting does not exist for user "username".</error>', 1],
+        ];
+    }
+
+    /**
+     * @dataProvider dataExecuteDelete
+     *
+     * @param string|null $value
+     * @param bool $errorIfNotExists
+     * @param string $expectedLine
+     * @param int $expectedReturn
+     */
+    public function testExecuteDelete($value, $errorIfNotExists, $expectedLine, $expectedReturn): void {
+        $command = $this->getCommand([
+            'writeArrayInOutputFormat',
+            'checkInput',
+            'getUserSettings',
+        ]);
+
+        $this->consoleInput->expects($this->any())
+            ->method('getArgument')
+            ->willReturnMap([
+                ['uid', 'username'],
+                ['app', 'appname'],
+                ['key', 'configkey'],
+            ]);
+
+        $command->expects($this->once())
+            ->method('checkInput');
+
+        $this->config->expects($this->once())
+            ->method('getUserValue')
+            ->with('username', 'appname', 'configkey', null)
+            ->willReturn($value);
+
+        $this->consoleInput->expects($this->atLeastOnce())
+            ->method('hasParameterOption')
+            ->willReturnMap([
+                ['--delete', false, true],
+                ['--error-if-not-exists', false, $errorIfNotExists],
+            ]);
+
+        if ($expectedLine === null) {
+            $this->consoleOutput->expects($this->never())
+                ->method('writeln');
+            $this->config->expects($this->once())
+                ->method('deleteUserValue')
+                ->with('username', 'appname', 'configkey');
+        } else {
+            $this->consoleOutput->expects($this->once())
+                ->method('writeln')
+                ->with($expectedLine);
+            $this->config->expects($this->never())
+                ->method('deleteUserValue');
+        }
+
+        $this->assertEquals($expectedReturn, $this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]));
+    }
+
+    public static function dataExecuteSet(): array {
+        return [
+            ['config', false, null, 0],
+            ['config', true, null, 0],
+            [null, false, null, 0],
+            [null, true, '<error>The setting does not exist for user "username".</error>', 1],
+        ];
+    }
+
+    /**
+     * @dataProvider dataExecuteSet
+     *
+     * @param string|null $value
+     * @param bool $updateOnly
+     * @param string $expectedLine
+     * @param int $expectedReturn
+     */
+    public function testExecuteSet($value, $updateOnly, $expectedLine, $expectedReturn): void {
+        $command = $this->getCommand([
+            'writeArrayInOutputFormat',
+            'checkInput',
+            'getUserSettings',
+        ]);
+
+        $this->consoleInput->expects($this->atLeast(4))
+            ->method('getArgument')
+            ->willReturnMap([
+                ['uid', 'username'],
+                ['app', 'appname'],
+                ['key', 'configkey'],
+                ['value', 'setValue'],
+            ]);
+
+        $command->expects($this->once())
+            ->method('checkInput');
+
+        $this->config->expects($this->once())
+            ->method('getUserValue')
+            ->with('username', 'appname', 'configkey', null)
+            ->willReturn($value);
+
+        $this->consoleInput->expects($this->atLeastOnce())
+            ->method('hasParameterOption')
+            ->willReturnMap([
+                ['--update-only', false, $updateOnly],
+            ]);
+
+        if ($expectedLine === null) {
+            $this->consoleOutput->expects($this->never())
+                ->method('writeln');
+
+            $this->consoleInput->expects($this->never())
+                ->method('getOption');
+
+            $this->config->expects($this->once())
+                ->method('setUserValue')
+                ->with('username', 'appname', 'configkey', 'setValue');
+        } else {
+            $this->consoleOutput->expects($this->once())
+                ->method('writeln')
+                ->with($expectedLine);
+            $this->config->expects($this->never())
+                ->method('setUserValue');
+        }
+
+        $this->assertEquals($expectedReturn, $this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]));
+    }
+
+    public static function dataExecuteGet(): array {
+        return [
+            ['config', null, 'config', 0],
+            [null, 'config', 'config', 0],
+            [null, null, '<error>The setting does not exist for user "username".</error>', 1],
+        ];
+    }
+
+    /**
+     * @dataProvider dataExecuteGet
+     *
+     * @param string|null $value
+     * @param string|null $defaultValue
+     * @param string $expectedLine
+     * @param int $expectedReturn
+     */
+    public function testExecuteGet($value, $defaultValue, $expectedLine, $expectedReturn): void {
+        $command = $this->getCommand([
+            'writeArrayInOutputFormat',
+            'checkInput',
+            'getUserSettings',
+        ]);
+
+        $this->consoleInput->expects($this->any())
+            ->method('getArgument')
+            ->willReturnMap([
+                ['uid', 'username'],
+                ['app', 'appname'],
+                ['key', 'configkey'],
+            ]);
+
+        $command->expects($this->once())
+            ->method('checkInput');
+
+        $this->config->expects($this->once())
+            ->method('getUserValue')
+            ->with('username', 'appname', 'configkey', null)
+            ->willReturn($value);
+
+        if ($value === null) {
+            if ($defaultValue === null) {
+                $this->consoleInput->expects($this->atLeastOnce())
+                    ->method('hasParameterOption')
+                    ->willReturn(false);
+            } else {
+                $this->consoleInput->expects($this->atLeastOnce())
+                    ->method('hasParameterOption')
+                    ->willReturnCallback(function (string|array $config, bool $default = false): bool {
+                        if ($config === '--default-value' && $default === false) {
+                            return true;
+                        }
+                        return false;
+                    });
+                $this->consoleInput->expects($this->once())
+                    ->method('getOption')
+                    ->with('default-value')
+                    ->willReturn($defaultValue);
+            }
+        }
+
+        $this->consoleOutput->expects($this->once())
+            ->method('writeln')
+            ->with($expectedLine);
+
+        $this->assertEquals($expectedReturn, $this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]));
+    }
+
+    public function testExecuteList(): void {
+        $command = $this->getCommand([
+            'writeArrayInOutputFormat',
+            'checkInput',
+            'getUserSettings',
+        ]);
+
+        $this->consoleInput->expects($this->any())
+            ->method('getArgument')
+            ->willReturnMap([
+                ['uid', 'username'],
+                ['app', 'appname'],
+                ['key', ''],
+            ]);
+
+        $command->expects($this->once())
+            ->method('checkInput');
+        $command->expects($this->once())
+            ->method('getUserSettings')
+            ->willReturn(['settings']);
+        $command->expects($this->once())
+            ->method('writeArrayInOutputFormat')
+            ->with($this->consoleInput, $this->consoleOutput, ['settings']);
+
+
+        $this->assertEquals(0, $this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]));
+    }
 }

tests/Core/Command/User/AddTest.php

Indentation +127 added lines, -127 removed lines

@@ -23,131 +23,131 @@
 use Test\TestCase;
 
 class AddTest extends TestCase {
-	/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $userManager;
-
-	/** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $groupManager;
-
-	/** @var IMailer|\PHPUnit\Framework\MockObject\MockObject */
-	private $mailer;
-
-	/** @var IAppConfig|\PHPUnit\Framework\MockObject\MockObject */
-	private $appConfig;
-
-	/** @var NewUserMailHelper|\PHPUnit\Framework\MockObject\MockObject */
-	private $mailHelper;
-
-	/** @var IEventDispatcher|\PHPUnit\Framework\MockObject\MockObject */
-	private $eventDispatcher;
-
-	/** @var ISecureRandom|\PHPUnit\Framework\MockObject\MockObject */
-	private $secureRandom;
-
-	/** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
-	private $user;
-
-	/** @var InputInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $consoleInput;
-
-	/** @var OutputInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $consoleOutput;
-
-	/** @var Add */
-	private $addCommand;
-
-	public function setUp(): void {
-		parent::setUp();
-
-		$this->userManager = static::createMock(IUserManager::class);
-		$this->groupManager = static::createStub(IGroupManager::class);
-		$this->mailer = static::createMock(IMailer::class);
-		$this->appConfig = static::createMock(IAppConfig::class);
-		$this->mailHelper = static::createMock(NewUserMailHelper::class);
-		$this->eventDispatcher = static::createStub(IEventDispatcher::class);
-		$this->secureRandom = static::createStub(ISecureRandom::class);
-
-		$this->user = static::createMock(IUser::class);
-
-		$this->consoleInput = static::createMock(InputInterface::class);
-		$this->consoleOutput = static::createMock(OutputInterface::class);
-
-		$this->addCommand = new Add(
-			$this->userManager,
-			$this->groupManager,
-			$this->mailer,
-			$this->appConfig,
-			$this->mailHelper,
-			$this->eventDispatcher,
-			$this->secureRandom
-		);
-	}
-
-	/**
-	 * @dataProvider addEmailDataProvider
-	 */
-	public function testAddEmail(
-		?string $email,
-		bool $isEmailValid,
-		bool $shouldSendEmail,
-	): void {
-		$this->user->expects($isEmailValid ? static::once() : static::never())
-			->method('setSystemEMailAddress')
-			->with(static::equalTo($email));
-
-		$this->userManager->method('createUser')
-			->willReturn($this->user);
-
-		$this->appConfig->method('getValueString')
-			->willReturn($shouldSendEmail ? 'yes' : 'no');
-
-		$this->mailer->method('validateMailAddress')
-			->willReturn($isEmailValid);
-
-		$this->mailHelper->method('generateTemplate')
-			->willReturn(static::createMock(IEMailTemplate::class));
-
-		$this->mailHelper->expects($isEmailValid && $shouldSendEmail ? static::once() : static::never())
-			->method('sendMail');
-
-		$this->consoleInput->method('getOption')
-			->will(static::returnValueMap([
-				['generate-password', 'true'],
-				['email', $email],
-				['group', []],
-			]));
-
-		$this->invokePrivate($this->addCommand, 'execute', [
-			$this->consoleInput,
-			$this->consoleOutput
-		]);
-	}
-
-	/**
-	 * @return array
-	 */
-	public static function addEmailDataProvider(): array {
-		return [
-			'Valid E-Mail' => [
-				'info@example.com',
-				true,
-				true,
-			],
-			'Invalid E-Mail' => [
-				'info@@example.com',
-				false,
-				false,
-			],
-			'No E-Mail' => [
-				'',
-				false,
-				false,
-			],
-			'Valid E-Mail, but no mail should be sent' => [
-				'info@example.com',
-				true,
-				false,
-			],
-		];
-	}
+    /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
+    private $userManager;
+
+    /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
+    private $groupManager;
+
+    /** @var IMailer|\PHPUnit\Framework\MockObject\MockObject */
+    private $mailer;
+
+    /** @var IAppConfig|\PHPUnit\Framework\MockObject\MockObject */
+    private $appConfig;
+
+    /** @var NewUserMailHelper|\PHPUnit\Framework\MockObject\MockObject */
+    private $mailHelper;
+
+    /** @var IEventDispatcher|\PHPUnit\Framework\MockObject\MockObject */
+    private $eventDispatcher;
+
+    /** @var ISecureRandom|\PHPUnit\Framework\MockObject\MockObject */
+    private $secureRandom;
+
+    /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
+    private $user;
+
+    /** @var InputInterface|\PHPUnit\Framework\MockObject\MockObject */
+    private $consoleInput;
+
+    /** @var OutputInterface|\PHPUnit\Framework\MockObject\MockObject */
+    private $consoleOutput;
+
+    /** @var Add */
+    private $addCommand;
+
+    public function setUp(): void {
+        parent::setUp();
+
+        $this->userManager = static::createMock(IUserManager::class);
+        $this->groupManager = static::createStub(IGroupManager::class);
+        $this->mailer = static::createMock(IMailer::class);
+        $this->appConfig = static::createMock(IAppConfig::class);
+        $this->mailHelper = static::createMock(NewUserMailHelper::class);
+        $this->eventDispatcher = static::createStub(IEventDispatcher::class);
+        $this->secureRandom = static::createStub(ISecureRandom::class);
+
+        $this->user = static::createMock(IUser::class);
+
+        $this->consoleInput = static::createMock(InputInterface::class);
+        $this->consoleOutput = static::createMock(OutputInterface::class);
+
+        $this->addCommand = new Add(
+            $this->userManager,
+            $this->groupManager,
+            $this->mailer,
+            $this->appConfig,
+            $this->mailHelper,
+            $this->eventDispatcher,
+            $this->secureRandom
+        );
+    }
+
+    /**
+     * @dataProvider addEmailDataProvider
+     */
+    public function testAddEmail(
+        ?string $email,
+        bool $isEmailValid,
+        bool $shouldSendEmail,
+    ): void {
+        $this->user->expects($isEmailValid ? static::once() : static::never())
+            ->method('setSystemEMailAddress')
+            ->with(static::equalTo($email));
+
+        $this->userManager->method('createUser')
+            ->willReturn($this->user);
+
+        $this->appConfig->method('getValueString')
+            ->willReturn($shouldSendEmail ? 'yes' : 'no');
+
+        $this->mailer->method('validateMailAddress')
+            ->willReturn($isEmailValid);
+
+        $this->mailHelper->method('generateTemplate')
+            ->willReturn(static::createMock(IEMailTemplate::class));
+
+        $this->mailHelper->expects($isEmailValid && $shouldSendEmail ? static::once() : static::never())
+            ->method('sendMail');
+
+        $this->consoleInput->method('getOption')
+            ->will(static::returnValueMap([
+                ['generate-password', 'true'],
+                ['email', $email],
+                ['group', []],
+            ]));
+
+        $this->invokePrivate($this->addCommand, 'execute', [
+            $this->consoleInput,
+            $this->consoleOutput
+        ]);
+    }
+
+    /**
+     * @return array
+     */
+    public static function addEmailDataProvider(): array {
+        return [
+            'Valid E-Mail' => [
+                'info@example.com',
+                true,
+                true,
+            ],
+            'Invalid E-Mail' => [
+                'info@@example.com',
+                false,
+                false,
+            ],
+            'No E-Mail' => [
+                '',
+                false,
+                false,
+            ],
+            'Valid E-Mail, but no mail should be sent' => [
+                'info@example.com',
+                true,
+                false,
+            ],
+        ];
+    }
 }

tests/Core/Command/User/DeleteTest.php

Indentation +77 added lines, -77 removed lines

@@ -15,81 +15,81 @@
 use Test\TestCase;
 
 class DeleteTest extends TestCase {
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $userManager;
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $consoleInput;
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $consoleOutput;
-
-	/** @var \Symfony\Component\Console\Command\Command */
-	protected $command;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$userManager = $this->userManager = $this->getMockBuilder(IUserManager::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->consoleInput = $this->getMockBuilder(InputInterface::class)->getMock();
-		$this->consoleOutput = $this->getMockBuilder(OutputInterface::class)->getMock();
-
-		/** @var \OCP\IUserManager $userManager */
-		$this->command = new Delete($userManager);
-	}
-
-
-	public static function validUserLastSeen(): array {
-		return [
-			[true, 'The specified user was deleted'],
-			[false, 'The specified user could not be deleted'],
-		];
-	}
-
-	/**
-	 * @dataProvider validUserLastSeen
-	 *
-	 * @param bool $deleteSuccess
-	 * @param string $expectedString
-	 */
-	public function testValidUser($deleteSuccess, $expectedString): void {
-		$user = $this->getMockBuilder(IUser::class)->getMock();
-		$user->expects($this->once())
-			->method('delete')
-			->willReturn($deleteSuccess);
-
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with('user')
-			->willReturn($user);
-
-		$this->consoleInput->expects($this->once())
-			->method('getArgument')
-			->with('uid')
-			->willReturn('user');
-
-		$this->consoleOutput->expects($this->once())
-			->method('writeln')
-			->with($this->stringContains($expectedString));
-
-		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
-	}
-
-	public function testInvalidUser(): void {
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with('user')
-			->willReturn(null);
-
-		$this->consoleInput->expects($this->once())
-			->method('getArgument')
-			->with('uid')
-			->willReturn('user');
-
-		$this->consoleOutput->expects($this->once())
-			->method('writeln')
-			->with($this->stringContains('User does not exist'));
-
-		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
-	}
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $userManager;
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $consoleInput;
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $consoleOutput;
+
+    /** @var \Symfony\Component\Console\Command\Command */
+    protected $command;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $userManager = $this->userManager = $this->getMockBuilder(IUserManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->consoleInput = $this->getMockBuilder(InputInterface::class)->getMock();
+        $this->consoleOutput = $this->getMockBuilder(OutputInterface::class)->getMock();
+
+        /** @var \OCP\IUserManager $userManager */
+        $this->command = new Delete($userManager);
+    }
+
+
+    public static function validUserLastSeen(): array {
+        return [
+            [true, 'The specified user was deleted'],
+            [false, 'The specified user could not be deleted'],
+        ];
+    }
+
+    /**
+     * @dataProvider validUserLastSeen
+     *
+     * @param bool $deleteSuccess
+     * @param string $expectedString
+     */
+    public function testValidUser($deleteSuccess, $expectedString): void {
+        $user = $this->getMockBuilder(IUser::class)->getMock();
+        $user->expects($this->once())
+            ->method('delete')
+            ->willReturn($deleteSuccess);
+
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with('user')
+            ->willReturn($user);
+
+        $this->consoleInput->expects($this->once())
+            ->method('getArgument')
+            ->with('uid')
+            ->willReturn('user');
+
+        $this->consoleOutput->expects($this->once())
+            ->method('writeln')
+            ->with($this->stringContains($expectedString));
+
+        self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+    }
+
+    public function testInvalidUser(): void {
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with('user')
+            ->willReturn(null);
+
+        $this->consoleInput->expects($this->once())
+            ->method('getArgument')
+            ->with('uid')
+            ->willReturn('user');
+
+        $this->consoleOutput->expects($this->once())
+            ->method('writeln')
+            ->with($this->stringContains('User does not exist'));
+
+        self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+    }
 }

tests/Core/Command/User/LastSeenTest.php

Indentation +76 added lines, -76 removed lines

@@ -15,80 +15,80 @@
 use Test\TestCase;
 
 class LastSeenTest extends TestCase {
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $userManager;
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $consoleInput;
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $consoleOutput;
-
-	/** @var \Symfony\Component\Console\Command\Command */
-	protected $command;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$userManager = $this->userManager = $this->getMockBuilder(IUserManager::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->consoleInput = $this->getMockBuilder(InputInterface::class)->getMock();
-		$this->consoleOutput = $this->getMockBuilder(OutputInterface::class)->getMock();
-
-		/** @var \OCP\IUserManager $userManager */
-		$this->command = new LastSeen($userManager);
-	}
-
-	public static function validUserLastSeen(): array {
-		return [
-			[0, 'never logged in'],
-			[time(), 'last login'],
-		];
-	}
-
-	/**
-	 * @dataProvider validUserLastSeen
-	 *
-	 * @param int $lastSeen
-	 * @param string $expectedString
-	 */
-	public function testValidUser($lastSeen, $expectedString): void {
-		$user = $this->getMockBuilder(IUser::class)->getMock();
-		$user->expects($this->once())
-			->method('getLastLogin')
-			->willReturn($lastSeen);
-
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with('user')
-			->willReturn($user);
-
-		$this->consoleInput->expects($this->once())
-			->method('getArgument')
-			->with('uid')
-			->willReturn('user');
-
-		$this->consoleOutput->expects($this->once())
-			->method('writeln')
-			->with($this->stringContains($expectedString));
-
-		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
-	}
-
-	public function testInvalidUser(): void {
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with('user')
-			->willReturn(null);
-
-		$this->consoleInput->expects($this->once())
-			->method('getArgument')
-			->with('uid')
-			->willReturn('user');
-
-		$this->consoleOutput->expects($this->once())
-			->method('writeln')
-			->with($this->stringContains('User does not exist'));
-
-		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
-	}
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $userManager;
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $consoleInput;
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $consoleOutput;
+
+    /** @var \Symfony\Component\Console\Command\Command */
+    protected $command;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $userManager = $this->userManager = $this->getMockBuilder(IUserManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->consoleInput = $this->getMockBuilder(InputInterface::class)->getMock();
+        $this->consoleOutput = $this->getMockBuilder(OutputInterface::class)->getMock();
+
+        /** @var \OCP\IUserManager $userManager */
+        $this->command = new LastSeen($userManager);
+    }
+
+    public static function validUserLastSeen(): array {
+        return [
+            [0, 'never logged in'],
+            [time(), 'last login'],
+        ];
+    }
+
+    /**
+     * @dataProvider validUserLastSeen
+     *
+     * @param int $lastSeen
+     * @param string $expectedString
+     */
+    public function testValidUser($lastSeen, $expectedString): void {
+        $user = $this->getMockBuilder(IUser::class)->getMock();
+        $user->expects($this->once())
+            ->method('getLastLogin')
+            ->willReturn($lastSeen);
+
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with('user')
+            ->willReturn($user);
+
+        $this->consoleInput->expects($this->once())
+            ->method('getArgument')
+            ->with('uid')
+            ->willReturn('user');
+
+        $this->consoleOutput->expects($this->once())
+            ->method('writeln')
+            ->with($this->stringContains($expectedString));
+
+        self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+    }
+
+    public function testInvalidUser(): void {
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with('user')
+            ->willReturn(null);
+
+        $this->consoleInput->expects($this->once())
+            ->method('getArgument')
+            ->with('uid')
+            ->willReturn('user');
+
+        $this->consoleOutput->expects($this->once())
+            ->method('writeln')
+            ->with($this->stringContains('User does not exist'));
+
+        self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+    }
 }

tests/Core/Command/Config/System/SetConfigTest.php

Indentation +147 added lines, -147 removed lines

@@ -14,151 +14,151 @@
 use Test\TestCase;
 
 class SetConfigTest extends TestCase {
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $systemConfig;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $consoleInput;
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $consoleOutput;
-
-	/** @var \Symfony\Component\Console\Command\Command */
-	protected $command;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$systemConfig = $this->systemConfig = $this->getMockBuilder(SystemConfig::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->consoleInput = $this->getMockBuilder(InputInterface::class)->getMock();
-		$this->consoleOutput = $this->getMockBuilder(OutputInterface::class)->getMock();
-
-		/** @var \OC\SystemConfig $systemConfig */
-		$this->command = new SetConfig($systemConfig);
-	}
-
-
-	public static function dataTest() {
-		return [
-			[['name'], 'newvalue', null, 'newvalue'],
-			[['a', 'b', 'c'], 'foobar', null, ['b' => ['c' => 'foobar']]],
-			[['a', 'b', 'c'], 'foobar', ['b' => ['d' => 'barfoo']], ['b' => ['d' => 'barfoo', 'c' => 'foobar']]],
-		];
-	}
-
-	/**
-	 * @dataProvider dataTest
-	 *
-	 * @param array $configNames
-	 * @param string $newValue
-	 * @param mixed $existingData
-	 * @param mixed $expectedValue
-	 */
-	public function testSet($configNames, $newValue, $existingData, $expectedValue): void {
-		$this->systemConfig->expects($this->once())
-			->method('setValue')
-			->with($configNames[0], $expectedValue);
-		$this->systemConfig->method('getValue')
-			->with($configNames[0])
-			->willReturn($existingData);
-
-		$this->consoleInput->expects($this->once())
-			->method('getArgument')
-			->with('name')
-			->willReturn($configNames);
-		$this->consoleInput->method('getOption')
-			->willReturnMap([
-				['value', $newValue],
-				['type', 'string'],
-			]);
-
-		$this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
-	}
-
-	public static function setUpdateOnlyProvider(): array {
-		return [
-			[['name'], null],
-			[['a', 'b', 'c'], null],
-			[['a', 'b', 'c'], ['b' => 'foobar']],
-			[['a', 'b', 'c'], ['b' => ['d' => 'foobar']]],
-		];
-	}
-
-	/**
-	 * @dataProvider setUpdateOnlyProvider
-	 */
-	public function testSetUpdateOnly($configNames, $existingData): void {
-		$this->expectException(\UnexpectedValueException::class);
-
-		$this->systemConfig->expects($this->never())
-			->method('setValue');
-		$this->systemConfig->method('getValue')
-			->with($configNames[0])
-			->willReturn($existingData);
-		$this->systemConfig->method('getKeys')
-			->willReturn($existingData ? $configNames[0] : []);
-
-		$this->consoleInput->expects($this->once())
-			->method('getArgument')
-			->with('name')
-			->willReturn($configNames);
-		$this->consoleInput->method('getOption')
-			->willReturnMap([
-				['value', 'foobar'],
-				['type', 'string'],
-				['update-only', true],
-			]);
-
-		$this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
-	}
-
-	public static function castValueProvider(): array {
-		return [
-			[null, 'string', ['value' => '', 'readable-value' => 'empty string']],
-
-			['abc', 'string', ['value' => 'abc', 'readable-value' => 'string abc']],
-
-			['123', 'integer', ['value' => 123, 'readable-value' => 'integer 123']],
-			['456', 'int', ['value' => 456, 'readable-value' => 'integer 456']],
-
-			['2.25', 'double', ['value' => 2.25, 'readable-value' => 'double 2.25']],
-			['0.5', 'float', ['value' => 0.5, 'readable-value' => 'double 0.5']],
-
-			['', 'null', ['value' => null, 'readable-value' => 'null']],
-
-			['true', 'boolean', ['value' => true, 'readable-value' => 'boolean true']],
-			['false', 'bool', ['value' => false, 'readable-value' => 'boolean false']],
-		];
-	}
-
-	/**
-	 * @dataProvider castValueProvider
-	 */
-	public function testCastValue($value, $type, $expectedValue): void {
-		$this->assertSame($expectedValue,
-			$this->invokePrivate($this->command, 'castValue', [$value, $type])
-		);
-	}
-
-	public static function castValueInvalidProvider(): array {
-		return [
-			['123', 'foobar'],
-
-			[null, 'integer'],
-			['abc', 'integer'],
-			['76ggg', 'double'],
-			['true', 'float'],
-			['foobar', 'boolean'],
-		];
-	}
-
-	/**
-	 * @dataProvider castValueInvalidProvider
-	 */
-	public function testCastValueInvalid($value, $type): void {
-		$this->expectException(\InvalidArgumentException::class);
-
-		$this->invokePrivate($this->command, 'castValue', [$value, $type]);
-	}
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $systemConfig;
+
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $consoleInput;
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $consoleOutput;
+
+    /** @var \Symfony\Component\Console\Command\Command */
+    protected $command;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $systemConfig = $this->systemConfig = $this->getMockBuilder(SystemConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->consoleInput = $this->getMockBuilder(InputInterface::class)->getMock();
+        $this->consoleOutput = $this->getMockBuilder(OutputInterface::class)->getMock();
+
+        /** @var \OC\SystemConfig $systemConfig */
+        $this->command = new SetConfig($systemConfig);
+    }
+
+
+    public static function dataTest() {
+        return [
+            [['name'], 'newvalue', null, 'newvalue'],
+            [['a', 'b', 'c'], 'foobar', null, ['b' => ['c' => 'foobar']]],
+            [['a', 'b', 'c'], 'foobar', ['b' => ['d' => 'barfoo']], ['b' => ['d' => 'barfoo', 'c' => 'foobar']]],
+        ];
+    }
+
+    /**
+     * @dataProvider dataTest
+     *
+     * @param array $configNames
+     * @param string $newValue
+     * @param mixed $existingData
+     * @param mixed $expectedValue
+     */
+    public function testSet($configNames, $newValue, $existingData, $expectedValue): void {
+        $this->systemConfig->expects($this->once())
+            ->method('setValue')
+            ->with($configNames[0], $expectedValue);
+        $this->systemConfig->method('getValue')
+            ->with($configNames[0])
+            ->willReturn($existingData);
+
+        $this->consoleInput->expects($this->once())
+            ->method('getArgument')
+            ->with('name')
+            ->willReturn($configNames);
+        $this->consoleInput->method('getOption')
+            ->willReturnMap([
+                ['value', $newValue],
+                ['type', 'string'],
+            ]);
+
+        $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+    }
+
+    public static function setUpdateOnlyProvider(): array {
+        return [
+            [['name'], null],
+            [['a', 'b', 'c'], null],
+            [['a', 'b', 'c'], ['b' => 'foobar']],
+            [['a', 'b', 'c'], ['b' => ['d' => 'foobar']]],
+        ];
+    }
+
+    /**
+     * @dataProvider setUpdateOnlyProvider
+     */
+    public function testSetUpdateOnly($configNames, $existingData): void {
+        $this->expectException(\UnexpectedValueException::class);
+
+        $this->systemConfig->expects($this->never())
+            ->method('setValue');
+        $this->systemConfig->method('getValue')
+            ->with($configNames[0])
+            ->willReturn($existingData);
+        $this->systemConfig->method('getKeys')
+            ->willReturn($existingData ? $configNames[0] : []);
+
+        $this->consoleInput->expects($this->once())
+            ->method('getArgument')
+            ->with('name')
+            ->willReturn($configNames);
+        $this->consoleInput->method('getOption')
+            ->willReturnMap([
+                ['value', 'foobar'],
+                ['type', 'string'],
+                ['update-only', true],
+            ]);
+
+        $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+    }
+
+    public static function castValueProvider(): array {
+        return [
+            [null, 'string', ['value' => '', 'readable-value' => 'empty string']],
+
+            ['abc', 'string', ['value' => 'abc', 'readable-value' => 'string abc']],
+
+            ['123', 'integer', ['value' => 123, 'readable-value' => 'integer 123']],
+            ['456', 'int', ['value' => 456, 'readable-value' => 'integer 456']],
+
+            ['2.25', 'double', ['value' => 2.25, 'readable-value' => 'double 2.25']],
+            ['0.5', 'float', ['value' => 0.5, 'readable-value' => 'double 0.5']],
+
+            ['', 'null', ['value' => null, 'readable-value' => 'null']],
+
+            ['true', 'boolean', ['value' => true, 'readable-value' => 'boolean true']],
+            ['false', 'bool', ['value' => false, 'readable-value' => 'boolean false']],
+        ];
+    }
+
+    /**
+     * @dataProvider castValueProvider
+     */
+    public function testCastValue($value, $type, $expectedValue): void {
+        $this->assertSame($expectedValue,
+            $this->invokePrivate($this->command, 'castValue', [$value, $type])
+        );
+    }
+
+    public static function castValueInvalidProvider(): array {
+        return [
+            ['123', 'foobar'],
+
+            [null, 'integer'],
+            ['abc', 'integer'],
+            ['76ggg', 'double'],
+            ['true', 'float'],
+            ['foobar', 'boolean'],
+        ];
+    }
+
+    /**
+     * @dataProvider castValueInvalidProvider
+     */
+    public function testCastValueInvalid($value, $type): void {
+        $this->expectException(\InvalidArgumentException::class);
+
+        $this->invokePrivate($this->command, 'castValue', [$value, $type]);
+    }
 }

tests/Core/Command/Config/System/GetConfigTest.php

Indentation +143 added lines, -143 removed lines

@@ -14,147 +14,147 @@
 use Test\TestCase;
 
 class GetConfigTest extends TestCase {
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $systemConfig;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $consoleInput;
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $consoleOutput;
-
-	/** @var \Symfony\Component\Console\Command\Command */
-	protected $command;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$systemConfig = $this->systemConfig = $this->getMockBuilder(SystemConfig::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->consoleInput = $this->getMockBuilder(InputInterface::class)->getMock();
-		$this->consoleOutput = $this->getMockBuilder(OutputInterface::class)->getMock();
-
-		/** @var \OC\SystemConfig $systemConfig */
-		$this->command = new GetConfig($systemConfig);
-	}
-
-
-	public static function getData(): array {
-		return [
-			// String output as json
-			['name', 'newvalue', true, null, false, 'json', 0, json_encode('newvalue')],
-			// String output as plain text
-			['name', 'newvalue', true, null, false, 'plain', 0, 'newvalue'],
-			// String falling back to default output as json
-			['name', null, false, 'newvalue', true, 'json', 0, json_encode('newvalue')],
-			// String falling back without default: error
-			['name', null, false, null, false, 'json', 1, null],
-
-			// Int "0" output as json/plain
-			['name', 0, true, null, false, 'json', 0, json_encode(0)],
-			['name', 0, true, null, false, 'plain', 0, '0'],
-			// Int "1" output as json/plain
-			['name', 1, true, null, false, 'json', 0, json_encode(1)],
-			['name', 1, true, null, false, 'plain', 0, '1'],
-
-			// Bool "true" output as json/plain
-			['name', true, true, null, false, 'json', 0, json_encode(true)],
-			['name', true, true, null, false, 'plain', 0, 'true'],
-			// Bool "false" output as json/plain
-			['name', false, true, null, false, 'json', 0, json_encode(false)],
-			['name', false, true, null, false, 'plain', 0, 'false'],
-
-			// Null output as json/plain
-			['name', null, true, null, false, 'json', 0, json_encode(null)],
-			['name', null, true, null, false, 'plain', 0, 'null'],
-
-			// Array output as json/plain
-			['name', ['a', 'b'], true, null, false, 'json', 0, json_encode(['a', 'b'])],
-			['name', ['a', 'b'], true, null, false, 'plain', 0, "a\nb"],
-			// Key array output as json/plain
-			['name', [0 => 'a', 1 => 'b'], true, null, false, 'json', 0, json_encode(['a', 'b'])],
-			['name', [0 => 'a', 1 => 'b'], true, null, false, 'plain', 0, "a\nb"],
-			// Associative array output as json/plain
-			['name', ['a' => 1, 'b' => 2], true, null, false, 'json', 0, json_encode(['a' => 1, 'b' => 2])],
-			['name', ['a' => 1, 'b' => 2], true, null, false, 'plain', 0, "a: 1\nb: 2"],
-
-			// Nested depth
-			[['name', 'a'], ['a' => 1, 'b' => 2], true, null, false, 'json', 0, json_encode(1)],
-			[['name', 'a'], ['a' => 1, 'b' => 2], true, null, false, 'plain', 0, '1'],
-			[['name', 'c'], ['a' => 1, 'b' => 2], true, true, true, 'json', 0, json_encode(true)],
-			[['name', 'c'], ['a' => 1, 'b' => 2], true, true, false, 'json', 1, null],
-
-		];
-	}
-
-	/**
-	 * @dataProvider getData
-	 *
-	 * @param string[] $configNames
-	 * @param mixed $value
-	 * @param bool $configExists
-	 * @param mixed $defaultValue
-	 * @param bool $hasDefault
-	 * @param string $outputFormat
-	 * @param int $expectedReturn
-	 * @param string $expectedMessage
-	 */
-	public function testGet($configNames, $value, $configExists, $defaultValue, $hasDefault, $outputFormat, $expectedReturn, $expectedMessage): void {
-		if (is_array($configNames)) {
-			$configName = $configNames[0];
-		} else {
-			$configName = $configNames;
-			$configNames = [$configName];
-		}
-		$this->systemConfig->expects($this->atLeastOnce())
-			->method('getKeys')
-			->willReturn($configExists ? [$configName] : []);
-
-		if (!$expectedReturn) {
-			if ($configExists) {
-				$this->systemConfig->expects($this->once())
-					->method('getValue')
-					->with($configName)
-					->willReturn($value);
-			}
-		}
-
-		$this->consoleInput->expects($this->once())
-			->method('getArgument')
-			->with('name')
-			->willReturn($configNames);
-		$this->consoleInput->expects($this->any())
-			->method('getOption')
-			->willReturnMap([
-				['default-value', $defaultValue],
-				['output', $outputFormat],
-			]);
-		$this->consoleInput->expects($this->any())
-			->method('hasParameterOption')
-			->willReturnMap([
-				['--output', false, true],
-				['--default-value', false,$hasDefault],
-			]);
-
-		if ($expectedMessage !== null) {
-			global $output;
-
-			$output = '';
-			$this->consoleOutput->expects($this->any())
-				->method('writeln')
-				->willReturnCallback(function ($value) {
-					global $output;
-					$output .= $value . "\n";
-					return $output;
-				});
-		}
-
-		$this->assertSame($expectedReturn, $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]));
-
-		if ($expectedMessage !== null) {
-			global $output;
-			// Remove the trailing newline
-			$this->assertSame($expectedMessage, substr($output, 0, -1));
-		}
-	}
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $systemConfig;
+
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $consoleInput;
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $consoleOutput;
+
+    /** @var \Symfony\Component\Console\Command\Command */
+    protected $command;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $systemConfig = $this->systemConfig = $this->getMockBuilder(SystemConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->consoleInput = $this->getMockBuilder(InputInterface::class)->getMock();
+        $this->consoleOutput = $this->getMockBuilder(OutputInterface::class)->getMock();
+
+        /** @var \OC\SystemConfig $systemConfig */
+        $this->command = new GetConfig($systemConfig);
+    }
+
+
+    public static function getData(): array {
+        return [
+            // String output as json
+            ['name', 'newvalue', true, null, false, 'json', 0, json_encode('newvalue')],
+            // String output as plain text
+            ['name', 'newvalue', true, null, false, 'plain', 0, 'newvalue'],
+            // String falling back to default output as json
+            ['name', null, false, 'newvalue', true, 'json', 0, json_encode('newvalue')],
+            // String falling back without default: error
+            ['name', null, false, null, false, 'json', 1, null],
+
+            // Int "0" output as json/plain
+            ['name', 0, true, null, false, 'json', 0, json_encode(0)],
+            ['name', 0, true, null, false, 'plain', 0, '0'],
+            // Int "1" output as json/plain
+            ['name', 1, true, null, false, 'json', 0, json_encode(1)],
+            ['name', 1, true, null, false, 'plain', 0, '1'],
+
+            // Bool "true" output as json/plain
+            ['name', true, true, null, false, 'json', 0, json_encode(true)],
+            ['name', true, true, null, false, 'plain', 0, 'true'],
+            // Bool "false" output as json/plain
+            ['name', false, true, null, false, 'json', 0, json_encode(false)],
+            ['name', false, true, null, false, 'plain', 0, 'false'],
+
+            // Null output as json/plain
+            ['name', null, true, null, false, 'json', 0, json_encode(null)],
+            ['name', null, true, null, false, 'plain', 0, 'null'],
+
+            // Array output as json/plain
+            ['name', ['a', 'b'], true, null, false, 'json', 0, json_encode(['a', 'b'])],
+            ['name', ['a', 'b'], true, null, false, 'plain', 0, "a\nb"],
+            // Key array output as json/plain
+            ['name', [0 => 'a', 1 => 'b'], true, null, false, 'json', 0, json_encode(['a', 'b'])],
+            ['name', [0 => 'a', 1 => 'b'], true, null, false, 'plain', 0, "a\nb"],
+            // Associative array output as json/plain
+            ['name', ['a' => 1, 'b' => 2], true, null, false, 'json', 0, json_encode(['a' => 1, 'b' => 2])],
+            ['name', ['a' => 1, 'b' => 2], true, null, false, 'plain', 0, "a: 1\nb: 2"],
+
+            // Nested depth
+            [['name', 'a'], ['a' => 1, 'b' => 2], true, null, false, 'json', 0, json_encode(1)],
+            [['name', 'a'], ['a' => 1, 'b' => 2], true, null, false, 'plain', 0, '1'],
+            [['name', 'c'], ['a' => 1, 'b' => 2], true, true, true, 'json', 0, json_encode(true)],
+            [['name', 'c'], ['a' => 1, 'b' => 2], true, true, false, 'json', 1, null],
+
+        ];
+    }
+
+    /**
+     * @dataProvider getData
+     *
+     * @param string[] $configNames
+     * @param mixed $value
+     * @param bool $configExists
+     * @param mixed $defaultValue
+     * @param bool $hasDefault
+     * @param string $outputFormat
+     * @param int $expectedReturn
+     * @param string $expectedMessage
+     */
+    public function testGet($configNames, $value, $configExists, $defaultValue, $hasDefault, $outputFormat, $expectedReturn, $expectedMessage): void {
+        if (is_array($configNames)) {
+            $configName = $configNames[0];
+        } else {
+            $configName = $configNames;
+            $configNames = [$configName];
+        }
+        $this->systemConfig->expects($this->atLeastOnce())
+            ->method('getKeys')
+            ->willReturn($configExists ? [$configName] : []);
+
+        if (!$expectedReturn) {
+            if ($configExists) {
+                $this->systemConfig->expects($this->once())
+                    ->method('getValue')
+                    ->with($configName)
+                    ->willReturn($value);
+            }
+        }
+
+        $this->consoleInput->expects($this->once())
+            ->method('getArgument')
+            ->with('name')
+            ->willReturn($configNames);
+        $this->consoleInput->expects($this->any())
+            ->method('getOption')
+            ->willReturnMap([
+                ['default-value', $defaultValue],
+                ['output', $outputFormat],
+            ]);
+        $this->consoleInput->expects($this->any())
+            ->method('hasParameterOption')
+            ->willReturnMap([
+                ['--output', false, true],
+                ['--default-value', false,$hasDefault],
+            ]);
+
+        if ($expectedMessage !== null) {
+            global $output;
+
+            $output = '';
+            $this->consoleOutput->expects($this->any())
+                ->method('writeln')
+                ->willReturnCallback(function ($value) {
+                    global $output;
+                    $output .= $value . "\n";
+                    return $output;
+                });
+        }
+
+        $this->assertSame($expectedReturn, $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]));
+
+        if ($expectedMessage !== null) {
+            global $output;
+            // Remove the trailing newline
+            $this->assertSame($expectedMessage, substr($output, 0, -1));
+        }
+    }
 }

tests/Core/Command/Config/System/DeleteConfigTest.php

Indentation +189 added lines, -189 removed lines

@@ -14,193 +14,193 @@
 use Test\TestCase;
 
 class DeleteConfigTest extends TestCase {
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $systemConfig;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $consoleInput;
-	/** @var \PHPUnit\Framework\MockObject\MockObject */
-	protected $consoleOutput;
-
-	/** @var \Symfony\Component\Console\Command\Command */
-	protected $command;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$systemConfig = $this->systemConfig = $this->getMockBuilder(SystemConfig::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->consoleInput = $this->getMockBuilder(InputInterface::class)->getMock();
-		$this->consoleOutput = $this->getMockBuilder(OutputInterface::class)->getMock();
-
-		/** @var \OC\SystemConfig $systemConfig */
-		$this->command = new DeleteConfig($systemConfig);
-	}
-
-	public static function deleteData(): array {
-		return [
-			[
-				'name1',
-				true,
-				true,
-				0,
-				'info',
-			],
-			[
-				'name2',
-				true,
-				false,
-				0,
-				'info',
-			],
-			[
-				'name3',
-				false,
-				false,
-				0,
-				'info',
-			],
-			[
-				'name4',
-				false,
-				true,
-				1,
-				'error',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider deleteData
-	 *
-	 * @param string $configName
-	 * @param bool $configExists
-	 * @param bool $checkIfExists
-	 * @param int $expectedReturn
-	 * @param string $expectedMessage
-	 */
-	public function testDelete($configName, $configExists, $checkIfExists, $expectedReturn, $expectedMessage): void {
-		$this->systemConfig->expects(($checkIfExists) ? $this->once() : $this->never())
-			->method('getKeys')
-			->willReturn($configExists ? [$configName] : []);
-
-		$this->systemConfig->expects(($expectedReturn === 0) ? $this->once() : $this->never())
-			->method('deleteValue')
-			->with($configName);
-
-		$this->consoleInput->expects($this->once())
-			->method('getArgument')
-			->with('name')
-			->willReturn([$configName]);
-		$this->consoleInput->expects($this->any())
-			->method('hasParameterOption')
-			->with('--error-if-not-exists')
-			->willReturn($checkIfExists);
-
-		$this->consoleOutput->expects($this->any())
-			->method('writeln')
-			->with($this->stringContains($expectedMessage));
-
-		$this->assertSame($expectedReturn, $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]));
-	}
-
-	public static function deleteArrayData(): array {
-		return [
-			[
-				['name', 'sub'],
-				true,
-				false,
-				true,
-				true,
-				0,
-				'info',
-			],
-			[
-				['name', 'sub', '2sub'],
-				true,
-				false,
-				['sub' => ['2sub' => 1], 'sub2' => false],
-				['sub' => [], 'sub2' => false],
-				0,
-				'info',
-			],
-			[
-				['name', 'sub3'],
-				true,
-				false,
-				['sub' => ['2sub' => 1], 'sub2' => false],
-				['sub' => ['2sub' => 1], 'sub2' => false],
-				0,
-				'info',
-			],
-			[
-				['name', 'sub'],
-				false,
-				true,
-				true,
-				true,
-				1,
-				'error',
-			],
-			[
-				['name', 'sub'],
-				true,
-				true,
-				true,
-				true,
-				1,
-				'error',
-			],
-			[
-				['name', 'sub3'],
-				true,
-				true,
-				['sub' => ['2sub' => 1], 'sub2' => false],
-				['sub' => ['2sub' => 1], 'sub2' => false],
-				1,
-				'error',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider deleteArrayData
-	 *
-	 * @param string[] $configNames
-	 * @param bool $configKeyExists
-	 * @param bool $checkIfKeyExists
-	 * @param mixed $configValue
-	 * @param mixed $updateValue
-	 * @param int $expectedReturn
-	 * @param string $expectedMessage
-	 */
-	public function testArrayDelete(array $configNames, $configKeyExists, $checkIfKeyExists, $configValue, $updateValue, $expectedReturn, $expectedMessage): void {
-		$this->systemConfig->expects(($checkIfKeyExists) ? $this->once() : $this->never())
-			->method('getKeys')
-			->willReturn($configKeyExists ? [$configNames[0]] : []);
-
-		$this->systemConfig->expects(($configKeyExists) ? $this->once() : $this->never())
-			->method('getValue')
-			->willReturn($configValue);
-
-		$this->systemConfig->expects(($expectedReturn === 0) ? $this->once() : $this->never())
-			->method('setValue')
-			->with($configNames[0], $updateValue);
-
-		$this->consoleInput->expects($this->once())
-			->method('getArgument')
-			->with('name')
-			->willReturn($configNames);
-		$this->consoleInput->expects($this->any())
-			->method('hasParameterOption')
-			->with('--error-if-not-exists')
-			->willReturn($checkIfKeyExists);
-
-		$this->consoleOutput->expects($this->any())
-			->method('writeln')
-			->with($this->stringContains($expectedMessage));
-
-		$this->assertSame($expectedReturn, $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]));
-	}
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $systemConfig;
+
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $consoleInput;
+    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    protected $consoleOutput;
+
+    /** @var \Symfony\Component\Console\Command\Command */
+    protected $command;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $systemConfig = $this->systemConfig = $this->getMockBuilder(SystemConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->consoleInput = $this->getMockBuilder(InputInterface::class)->getMock();
+        $this->consoleOutput = $this->getMockBuilder(OutputInterface::class)->getMock();
+
+        /** @var \OC\SystemConfig $systemConfig */
+        $this->command = new DeleteConfig($systemConfig);
+    }
+
+    public static function deleteData(): array {
+        return [
+            [
+                'name1',
+                true,
+                true,
+                0,
+                'info',
+            ],
+            [
+                'name2',
+                true,
+                false,
+                0,
+                'info',
+            ],
+            [
+                'name3',
+                false,
+                false,
+                0,
+                'info',
+            ],
+            [
+                'name4',
+                false,
+                true,
+                1,
+                'error',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider deleteData
+     *
+     * @param string $configName
+     * @param bool $configExists
+     * @param bool $checkIfExists
+     * @param int $expectedReturn
+     * @param string $expectedMessage
+     */
+    public function testDelete($configName, $configExists, $checkIfExists, $expectedReturn, $expectedMessage): void {
+        $this->systemConfig->expects(($checkIfExists) ? $this->once() : $this->never())
+            ->method('getKeys')
+            ->willReturn($configExists ? [$configName] : []);
+
+        $this->systemConfig->expects(($expectedReturn === 0) ? $this->once() : $this->never())
+            ->method('deleteValue')
+            ->with($configName);
+
+        $this->consoleInput->expects($this->once())
+            ->method('getArgument')
+            ->with('name')
+            ->willReturn([$configName]);
+        $this->consoleInput->expects($this->any())
+            ->method('hasParameterOption')
+            ->with('--error-if-not-exists')
+            ->willReturn($checkIfExists);
+
+        $this->consoleOutput->expects($this->any())
+            ->method('writeln')
+            ->with($this->stringContains($expectedMessage));
+
+        $this->assertSame($expectedReturn, $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]));
+    }
+
+    public static function deleteArrayData(): array {
+        return [
+            [
+                ['name', 'sub'],
+                true,
+                false,
+                true,
+                true,
+                0,
+                'info',
+            ],
+            [
+                ['name', 'sub', '2sub'],
+                true,
+                false,
+                ['sub' => ['2sub' => 1], 'sub2' => false],
+                ['sub' => [], 'sub2' => false],
+                0,
+                'info',
+            ],
+            [
+                ['name', 'sub3'],
+                true,
+                false,
+                ['sub' => ['2sub' => 1], 'sub2' => false],
+                ['sub' => ['2sub' => 1], 'sub2' => false],
+                0,
+                'info',
+            ],
+            [
+                ['name', 'sub'],
+                false,
+                true,
+                true,
+                true,
+                1,
+                'error',
+            ],
+            [
+                ['name', 'sub'],
+                true,
+                true,
+                true,
+                true,
+                1,
+                'error',
+            ],
+            [
+                ['name', 'sub3'],
+                true,
+                true,
+                ['sub' => ['2sub' => 1], 'sub2' => false],
+                ['sub' => ['2sub' => 1], 'sub2' => false],
+                1,
+                'error',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider deleteArrayData
+     *
+     * @param string[] $configNames
+     * @param bool $configKeyExists
+     * @param bool $checkIfKeyExists
+     * @param mixed $configValue
+     * @param mixed $updateValue
+     * @param int $expectedReturn
+     * @param string $expectedMessage
+     */
+    public function testArrayDelete(array $configNames, $configKeyExists, $checkIfKeyExists, $configValue, $updateValue, $expectedReturn, $expectedMessage): void {
+        $this->systemConfig->expects(($checkIfKeyExists) ? $this->once() : $this->never())
+            ->method('getKeys')
+            ->willReturn($configKeyExists ? [$configNames[0]] : []);
+
+        $this->systemConfig->expects(($configKeyExists) ? $this->once() : $this->never())
+            ->method('getValue')
+            ->willReturn($configValue);
+
+        $this->systemConfig->expects(($expectedReturn === 0) ? $this->once() : $this->never())
+            ->method('setValue')
+            ->with($configNames[0], $updateValue);
+
+        $this->consoleInput->expects($this->once())
+            ->method('getArgument')
+            ->with('name')
+            ->willReturn($configNames);
+        $this->consoleInput->expects($this->any())
+            ->method('hasParameterOption')
+            ->with('--error-if-not-exists')
+            ->willReturn($checkIfKeyExists);
+
+        $this->consoleOutput->expects($this->any())
+            ->method('writeln')
+            ->with($this->stringContains($expectedMessage));
+
+        $this->assertSame($expectedReturn, $this->invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]));
+    }
 }