From 6ef81164945ca22ac6e82b105e0ad38fc1848bec Mon Sep 17 00:00:00 2001
From: GrapeApple0 <84321396+GrapeApple0@users.noreply.github.com>
Date: Sat, 17 Aug 2024 10:58:25 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/test/unit/NoteCreateService.ts | 16 +++++++++-------
 packages/backend/test/unit/activitypub.ts       |  3 +--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/backend/test/unit/NoteCreateService.ts b/packages/backend/test/unit/NoteCreateService.ts
index ccf9ed1e6d..006af3aedb 100644
--- a/packages/backend/test/unit/NoteCreateService.ts
+++ b/packages/backend/test/unit/NoteCreateService.ts
@@ -7,6 +7,7 @@ import { Test } from '@nestjs/testing';
 
 import { CoreModule } from '@/core/CoreModule.js';
 import { NoteCreateService } from '@/core/NoteCreateService.js';
+import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { GlobalModule } from '@/GlobalModule.js';
 import { MiNote } from '@/models/Note.js';
 import { IPoll } from '@/models/Poll.js';
@@ -14,12 +15,13 @@ import { MiDriveFile } from '@/models/DriveFile.js';
 
 describe('NoteCreateService', () => {
 	let noteCreateService: NoteCreateService;
-
+	let noteEntityService: NoteEntityService;
 	beforeAll(async () => {
 		const app = await Test.createTestingModule({
 			imports: [GlobalModule, CoreModule],
 		}).compile();
 		noteCreateService = app.get<NoteCreateService>(NoteCreateService);
+		noteEntityService = app.get<NoteEntityService>(NoteEntityService);
 	});
 
 	describe('is-renote', () => {
@@ -109,37 +111,37 @@ describe('NoteCreateService', () => {
 		test('note with renote should be Renote and not be Quote', () => {
 			const note = { renote: base };
 			expect(noteCreateService['isRenote'](note)).toBe(true);
-			expect(noteCreateService['isQuote'](note)).toBe(false);
+			expect(noteEntityService['isQuote'](note)).toBe(false);
 		});
 
 		test('note with renote and text should be Quote', () => {
 			const note = { renote: base, text: 'some-text' };
 			expect(noteCreateService['isRenote'](note)).toBe(true);
-			expect(noteCreateService['isQuote'](note)).toBe(true);
+			expect(noteEntityService['isQuote'](note)).toBe(true);
 		});
 
 		test('note with renote and cw should be Quote', () => {
 			const note = { renote: base, cw: 'some-cw' };
 			expect(noteCreateService['isRenote'](note)).toBe(true);
-			expect(noteCreateService['isQuote'](note)).toBe(true);
+			expect(noteEntityService['isQuote'](note)).toBe(true);
 		});
 
 		test('note with renote and reply should be Quote', () => {
 			const note = { renote: base, reply: { ...base, id: 'another-note-id' } };
 			expect(noteCreateService['isRenote'](note)).toBe(true);
-			expect(noteCreateService['isQuote'](note)).toBe(true);
+			expect(noteEntityService['isQuote'](note)).toBe(true);
 		});
 
 		test('note with renote and poll should be Quote', () => {
 			const note = { renote: base, poll };
 			expect(noteCreateService['isRenote'](note)).toBe(true);
-			expect(noteCreateService['isQuote'](note)).toBe(true);
+			expect(noteEntityService['isQuote'](note)).toBe(true);
 		});
 
 		test('note with renote and non-empty files should be Quote', () => {
 			const note = { renote: base, files: [file] };
 			expect(noteCreateService['isRenote'](note)).toBe(true);
-			expect(noteCreateService['isQuote'](note)).toBe(true);
+			expect(noteEntityService['isQuote'](note)).toBe(true);
 		});
 	});
 });
diff --git a/packages/backend/test/unit/activitypub.ts b/packages/backend/test/unit/activitypub.ts
index 1239908b4b..6a26f3ac37 100644
--- a/packages/backend/test/unit/activitypub.ts
+++ b/packages/backend/test/unit/activitypub.ts
@@ -10,8 +10,8 @@ import { Test } from '@nestjs/testing';
 import { jest } from '@jest/globals';
 
 import { MockResolver } from '../misc/mock-resolver.js';
-import type { IActor, IApDocument, ICollection, IObject, IPost } from '@/core/activitypub/type.js';
 import type { MiRemoteUser } from '@/models/User.js';
+import type { IActor, IApDocument, ICollection, IObject, IPost } from '@/core/activitypub/type.js';
 import { ApImageService } from '@/core/activitypub/models/ApImageService.js';
 import { ApNoteService } from '@/core/activitypub/models/ApNoteService.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
@@ -22,7 +22,6 @@ import { GlobalModule } from '@/GlobalModule.js';
 import { CoreModule } from '@/core/CoreModule.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { LoggerService } from '@/core/LoggerService.js';
-import type { IActor, IApDocument, ICollection, IObject, IPost } from '@/core/activitypub/type.js';
 import { MiMeta, MiNote, UserProfilesRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 import { secureRndstr } from '@/misc/secure-rndstr.js';