Skip to content

Commit d72d682

Browse files
test(files): make TagServiceTest reload tagger before assertions
Signed-off-by: Josh <josh.t.richards@gmail.com>
1 parent e01a54c commit d72d682

1 file changed

Lines changed: 11 additions & 13 deletions

File tree

apps/files/tests/Service/TagServiceTest.php

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class TagServiceTest extends \Test\TestCase {
3535
private IManager&MockObject $activityManager;
3636
private Folder $root;
3737
private TagService&MockObject $tagService;
38-
private ITags $tagger;
3938

4039
protected function setUp(): void {
4140
parent::setUp();
@@ -56,7 +55,6 @@ protected function setUp(): void {
5655

5756
$this->root = Server::get(IRootFolder::class)->getUserFolder($this->user);
5857

59-
$this->tagger = Server::get(ITagManager::class)->load('files');
6058
$this->tagService = $this->getTagService();
6159
}
6260

@@ -95,24 +93,24 @@ public function testUpdateFileTags(): void {
9593
// set tags
9694
$this->tagService->updateFileTags('subdir/test.txt', [$tag1, $tag2]);
9795

98-
// Sync to reload tags
99-
$this->tagger->addMultiple([], sync:true);
100-
$this->assertEquals([$fileId], $this->tagger->getIdsForTag($tag1));
101-
$this->assertEquals([$fileId], $this->tagger->getIdsForTag($tag2));
96+
// use a freshly loaded ITags instance after each updateFileTags() call (more realistic)
97+
$tagger = Server::get(ITagManager::class)->load('files');
98+
$this->assertEquals([$fileId], $tagger->getIdsForTag($tag1));
99+
$this->assertEquals([$fileId], $tagger->getIdsForTag($tag2));
102100

103101
// remove tag
104102
$this->tagService->updateFileTags('subdir/test.txt', [$tag2]);
105-
// Sync to reload tags
106-
$this->tagger->addMultiple([], sync:true);
107-
$this->assertEquals([], $this->tagger->getIdsForTag($tag1));
108-
$this->assertEquals([$fileId], $this->tagger->getIdsForTag($tag2));
103+
104+
$tagger = Server::get(ITagManager::class)->load('files');
105+
$this->assertEquals([], $tagger->getIdsForTag($tag1));
106+
$this->assertEquals([$fileId], $tagger->getIdsForTag($tag2));
109107

110108
// clear tags
111109
$this->tagService->updateFileTags('subdir/test.txt', []);
112110
// Sync to reload tags
113-
$this->tagger->addMultiple([], sync:true);
114-
$this->assertEquals([], $this->tagger->getIdsForTag($tag1));
115-
$this->assertEquals([], $this->tagger->getIdsForTag($tag2));
111+
$tagger = Server::get(ITagManager::class)->load('files');
112+
$this->assertEquals([], $tagger->getIdsForTag($tag1));
113+
$this->assertEquals([], $tagger->getIdsForTag($tag2));
116114

117115
// non-existing file
118116
$caught = false;

0 commit comments

Comments
 (0)