From f8f606bdf6b48390714f511795bfebe2a5a37e33 Mon Sep 17 00:00:00 2001 From: Andrew Beal Date: Sat, 1 Nov 2025 11:50:11 +0000 Subject: [PATCH] test: remove unused imports and update type references --- __tests__/Services/AIFunctionService.test.ts | 3 +- __tests__/Services/ChatService.test.ts | 2 +- .../ConversationFileSystemService.test.ts | 1 - __tests__/Services/InputService.test.ts | 3 +- __tests__/Services/SanitiserService.test.ts | 2 +- __tests__/Services/StreamingService.test.ts | 48 +++++++++---------- __tests__/Services/VaultCacheService.test.ts | 2 +- __tests__/Services/VaultService.test.ts | 4 +- 8 files changed, 32 insertions(+), 33 deletions(-) diff --git a/__tests__/Services/AIFunctionService.test.ts b/__tests__/Services/AIFunctionService.test.ts index fa6f3e3..99b4a02 100644 --- a/__tests__/Services/AIFunctionService.test.ts +++ b/__tests__/Services/AIFunctionService.test.ts @@ -1,10 +1,9 @@ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'; import { AIFunctionService } from '../../Services/AIFunctionService'; -import { FileSystemService } from '../../Services/FileSystemService'; import { RegisterSingleton, DeregisterAllServices } from '../../Services/DependencyService'; import { Services } from '../../Services/Services'; import { AIFunction } from '../../Enums/AIFunction'; -import { TFile, TFolder } from 'obsidian'; +import { TFile } from 'obsidian'; /** * INTEGRATION TESTS - AIFunctionService diff --git a/__tests__/Services/ChatService.test.ts b/__tests__/Services/ChatService.test.ts index dd49755..7ad0602 100644 --- a/__tests__/Services/ChatService.test.ts +++ b/__tests__/Services/ChatService.test.ts @@ -168,7 +168,7 @@ describe('ChatService - Integration Tests (Sync Methods Only)', () => { const conversation = new Conversation(); conversation.contents.push(new ConversationContent(Role.User, 'Regular message')); conversation.contents.push( - new ConversationContent(Role.User, 'Function result', '', new Date(), false, true, 'tool-id') + new ConversationContent(Role.User, 'Function result', '', '', new Date(), false, true, 'tool-id') ); await service.updateTokenDisplay(conversation); diff --git a/__tests__/Services/ConversationFileSystemService.test.ts b/__tests__/Services/ConversationFileSystemService.test.ts index fcca84a..9455170 100644 --- a/__tests__/Services/ConversationFileSystemService.test.ts +++ b/__tests__/Services/ConversationFileSystemService.test.ts @@ -1,6 +1,5 @@ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'; import { ConversationFileSystemService } from '../../Services/ConversationFileSystemService'; -import { FileSystemService } from '../../Services/FileSystemService'; import { RegisterSingleton, DeregisterAllServices } from '../../Services/DependencyService'; import { Services } from '../../Services/Services'; import { Conversation } from '../../Conversations/Conversation'; diff --git a/__tests__/Services/InputService.test.ts b/__tests__/Services/InputService.test.ts index 50b5c17..572e2ce 100644 --- a/__tests__/Services/InputService.test.ts +++ b/__tests__/Services/InputService.test.ts @@ -1,6 +1,5 @@ -import { describe, it, expect, beforeEach, vi } from 'vitest'; +import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest'; import { InputService } from '../../Services/InputService'; -import { SearchTrigger } from '../../Enums/SearchTrigger'; /** * UNIT TESTS diff --git a/__tests__/Services/SanitiserService.test.ts b/__tests__/Services/SanitiserService.test.ts index f137135..41d9bc0 100644 --- a/__tests__/Services/SanitiserService.test.ts +++ b/__tests__/Services/SanitiserService.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, beforeEach } from 'vitest'; -import { SanitiserService, type SanitizeOptions } from '../../Services/SanitiserService'; +import { SanitiserService } from '../../Services/SanitiserService'; describe('SanitiserService', () => { let service: SanitiserService; diff --git a/__tests__/Services/StreamingService.test.ts b/__tests__/Services/StreamingService.test.ts index fbd67d3..7150832 100644 --- a/__tests__/Services/StreamingService.test.ts +++ b/__tests__/Services/StreamingService.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; -import { StreamingService, StreamChunk } from '../../Services/StreamingService'; +import { StreamingService, IStreamChunk } from '../../Services/StreamingService'; import { Selector } from '../../Enums/Selector'; /** @@ -44,7 +44,7 @@ describe('StreamingService', () => { } // Helper to create a simple parser - const simpleParser = (chunk: string): StreamChunk => { + const simpleParser = (chunk: string): IStreamChunk => { try { const data = JSON.parse(chunk); return { @@ -70,7 +70,7 @@ describe('StreamingService', () => { body: createMockStream(chunks) }); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', { prompt: 'test' }, @@ -155,7 +155,7 @@ describe('StreamingService', () => { body: createMockStream(chunks) }); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -184,7 +184,7 @@ describe('StreamingService', () => { body: createMockStream(chunks) }); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -210,7 +210,7 @@ describe('StreamingService', () => { body: createMockStream(chunks) }); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -239,7 +239,7 @@ describe('StreamingService', () => { body: createMockStream(chunks) }); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -263,7 +263,7 @@ describe('StreamingService', () => { body: createMockStream(chunks) }); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -289,7 +289,7 @@ describe('StreamingService', () => { body: createMockStream(chunks) }); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -317,7 +317,7 @@ describe('StreamingService', () => { body: createMockStream(chunks) }); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -341,7 +341,7 @@ describe('StreamingService', () => { body: createMockStream(chunks) }); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -367,7 +367,7 @@ describe('StreamingService', () => { body: createMockStream(chunks) }); - const customParser = (chunk: string): StreamChunk => { + const customParser = (chunk: string): IStreamChunk => { const trimmedChunk = chunk.trim(); return { content: `Parsed: ${trimmedChunk}`, @@ -375,7 +375,7 @@ describe('StreamingService', () => { }; }; - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -400,7 +400,7 @@ describe('StreamingService', () => { body: createMockStream(chunks) }); - const parserWithFunctionCall = (chunk: string): StreamChunk => { + const parserWithFunctionCall = (chunk: string): IStreamChunk => { const data = JSON.parse(chunk); return { content: data.content || '', @@ -409,7 +409,7 @@ describe('StreamingService', () => { }; }; - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -453,7 +453,7 @@ describe('StreamingService', () => { abortError.name = 'AbortError'; mockFetch.mockRejectedValue(abortError); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -480,7 +480,7 @@ describe('StreamingService', () => { text: async () => 'Resource not found' }); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -501,7 +501,7 @@ describe('StreamingService', () => { body: null }); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -518,7 +518,7 @@ describe('StreamingService', () => { it('should handle network error', async () => { mockFetch.mockRejectedValue(new Error('Network connection failed')); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -535,7 +535,7 @@ describe('StreamingService', () => { it('should handle unknown error type', async () => { mockFetch.mockRejectedValue('String error'); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -557,7 +557,7 @@ describe('StreamingService', () => { body: createMockStream([]) }); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -576,7 +576,7 @@ describe('StreamingService', () => { body: createMockStream([' \n\n \n']) }); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -595,7 +595,7 @@ describe('StreamingService', () => { body: createMockStream(['data: {"content":"test","done":true}']) }); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, @@ -621,7 +621,7 @@ describe('StreamingService', () => { body: createMockStream(chunks) }); - const results: StreamChunk[] = []; + const results: IStreamChunk[] = []; for await (const chunk of service.streamRequest( 'https://api.example.com/stream', {}, diff --git a/__tests__/Services/VaultCacheService.test.ts b/__tests__/Services/VaultCacheService.test.ts index df404fd..ca872f3 100644 --- a/__tests__/Services/VaultCacheService.test.ts +++ b/__tests__/Services/VaultCacheService.test.ts @@ -1,7 +1,7 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; import { VaultCacheService } from '../../Services/VaultCacheService'; import { VaultService } from '../../Services/VaultService'; -import { TFile, TFolder, MetadataCache } from 'obsidian'; +import { TFile, TFolder } from 'obsidian'; import { RegisterSingleton, DeregisterAllServices } from '../../Services/DependencyService'; import { Services } from '../../Services/Services'; import { FileEvent } from '../../Enums/FileEvent'; diff --git a/__tests__/Services/VaultService.test.ts b/__tests__/Services/VaultService.test.ts index 4ac16eb..f6230af 100644 --- a/__tests__/Services/VaultService.test.ts +++ b/__tests__/Services/VaultService.test.ts @@ -32,7 +32,9 @@ const mockVault = { const mockFileManager = { renameFile: vi.fn() -} as unknown as FileManager; +} as unknown as FileManager & { + renameFile: ReturnType; +}; // Create a mutable plugin settings object that tests can modify const mockPluginSettings = {