Code cleanup

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-09-06 22:07:27 +02:00
parent f686b1e75b
commit 56f9b5b6e6
5 changed files with 135 additions and 90 deletions

View File

@@ -23,6 +23,7 @@
namespace OCA\Deck\Activity;
use OCA\Deck\Db\AclMapper;
use OCA\Deck\Db\AssignedUsers;
use OCA\Deck\Db\Attachment;
use OCA\Deck\Db\AttachmentMapper;
@@ -57,6 +58,8 @@ class ActivityManagerTest extends TestCase {
private $stackMapper;
/** @var AttachmentMapper|MockObject */
private $attachmentMapper;
/** @var AclMapper|MockObject */
private $aclMapper;
/** @var IL10N|MockObject */
private $l10n;
/** @var string */
@@ -69,6 +72,7 @@ class ActivityManagerTest extends TestCase {
$this->cardMapper = $this->createMock(CardMapper::class);
$this->stackMapper = $this->createMock(StackMapper::class);
$this->attachmentMapper = $this->createMock(AttachmentMapper::class);
$this->aclMapper = $this->createMock(AclMapper::class);
$this->l10n = $this->createMock(IL10N::class);
$this->activityManager = new ActivityManager(
$this->manager,
@@ -77,6 +81,7 @@ class ActivityManagerTest extends TestCase {
$this->cardMapper,
$this->stackMapper,
$this->attachmentMapper,
$this->aclMapper,
$this->l10n,
$this->userId
);

View File

@@ -91,7 +91,7 @@ class DeckProviderTest extends TestCase {
public function dataEventIcons() {
return [
[ActivityManager::SUBJECT_CARD_MOVE_STACK, 'deck', 'deck-dark.svg'],
[ActivityManager::SUBJECT_LABEL_ASSIGN, 'deck', 'deck-dark.svg'],
[ActivityManager::SUBJECT_CARD_CREATE, 'files', 'add-color.svg'],
[ActivityManager::SUBJECT_CARD_UPDATE, 'files', 'change.svg'],
[ActivityManager::SUBJECT_CARD_DELETE, 'files', 'delete-color.svg'],
@@ -237,7 +237,8 @@ class DeckProviderTest extends TestCase {
$event->setApp('deck');
$event->setSubject(ActivityManager::SUBJECT_CARD_UPDATE_DESCRIPTION, [
'before' => 'ABC',
'after' => 'BCD'
'after' => 'BCD',
'diff' => true,
]);
$event->setAffectedUser($this->userId);
$event->setAuthor($this->userId);
@@ -257,15 +258,12 @@ class DeckProviderTest extends TestCase {
'id' => 'admin',
'name' => 'Administrator',
],
'before' => ['type' => 'highlight', 'id' => 'ABC', 'name' => 'ABC'],
'after' => ['type' => 'highlight', 'id' => 'BCD', 'name' => 'BCD']
];
$this->assertEquals($data, $event->getRichSubjectParameters());
$this->assertEquals('test string {board}', $event->getParsedSubject());
$this->assertEquals('test string {board}', $event->getRichSubject());
$this->assertEquals('BCD', $event->getMessage());
$this->assertEquals('<pre class="visualdiff"><del>A</del>BC<ins>D</ins></pre>', $event->getParsedMessage());
}
}