gogcli-mcp 2.7.1 → 2.18.0

package/tests/tools/classroom.test.ts

@@ -1,28 +1,28 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { registerClassroomTools } from '../../src/tools/classroom.js';
 import * as runner from '../../src/runner.js';
-import { setupHandlers as setupHandlersBase, type ToolHandler } from '../helpers/test-harness.js';
+import { createTestHarness, type TestHarness } from '@chrischall/mcp-utils/test';
 
 vi.mock('../../src/runner.js');
 
-const setupHandlers = () => setupHandlersBase(registerClassroomTools);
+const setupHandlers = () => createTestHarness(registerClassroomTools);
 
-let handlers: Map<string, ToolHandler>;
+let harness: TestHarness;
 
-beforeEach(() => {
+beforeEach(async () => {
   vi.clearAllMocks();
   vi.mocked(runner.run).mockResolvedValue('{}');
-  handlers = setupHandlers();
+  harness = await setupHandlers();
 });
 
 describe('gog_classroom_courses_list', () => {
   it('calls run with no flags', async () => {
-    await handlers.get('gog_classroom_courses_list')!({});
+    await harness.callTool('gog_classroom_courses_list', {});
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'courses', 'list'], { account: undefined });
   });
 
   it('passes all listing flags', async () => {
-    await handlers.get('gog_classroom_courses_list')!({
+    await harness.callTool('gog_classroom_courses_list', {
       state: 'ACTIVE,ARCHIVED',
       teacher: 'teacher1',
       student: 'student1',
@@ -37,38 +37,38 @@ describe('gog_classroom_courses_list', () => {
   });
 
   it('omits --all when false', async () => {
-    await handlers.get('gog_classroom_courses_list')!({ all: false });
+    await harness.callTool('gog_classroom_courses_list', { all: false });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'courses', 'list'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('List failed'));
-    const result = await handlers.get('gog_classroom_courses_list')!({});
+    const result = await harness.callTool('gog_classroom_courses_list', {});
     expect(result.content[0].text).toBe('Error: List failed');
   });
 });
 
 describe('gog_classroom_courses_get', () => {
   it('calls run with courseId', async () => {
-    await handlers.get('gog_classroom_courses_get')!({ courseId: 'c1' });
+    await harness.callTool('gog_classroom_courses_get', { courseId: 'c1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'courses', 'get', 'c1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Not found'));
-    const result = await handlers.get('gog_classroom_courses_get')!({ courseId: 'bad' });
+    const result = await harness.callTool('gog_classroom_courses_get', { courseId: 'bad' });
     expect(result.content[0].text).toBe('Error: Not found');
   });
 });
 
 describe('gog_classroom_students_list', () => {
   it('calls run with courseId only', async () => {
-    await handlers.get('gog_classroom_students_list')!({ courseId: 'c1' });
+    await harness.callTool('gog_classroom_students_list', { courseId: 'c1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'students', 'list', 'c1'], { account: undefined });
   });
 
   it('passes all listing flags', async () => {
-    await handlers.get('gog_classroom_students_list')!({ courseId: 'c1', max: 20, page: 'tok', all: true });
+    await harness.callTool('gog_classroom_students_list', { courseId: 'c1', max: 20, page: 'tok', all: true });
     expect(runner.run).toHaveBeenCalledWith(
       ['classroom', 'students', 'list', 'c1', '--max=20', '--page=tok', '--all'],
       { account: undefined },
@@ -76,38 +76,38 @@ describe('gog_classroom_students_list', () => {
   });
 
   it('omits --all when false', async () => {
-    await handlers.get('gog_classroom_students_list')!({ courseId: 'c1', all: false });
+    await harness.callTool('gog_classroom_students_list', { courseId: 'c1', all: false });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'students', 'list', 'c1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('List failed'));
-    const result = await handlers.get('gog_classroom_students_list')!({ courseId: 'c1' });
+    const result = await harness.callTool('gog_classroom_students_list', { courseId: 'c1' });
     expect(result.content[0].text).toBe('Error: List failed');
   });
 });
 
 describe('gog_classroom_students_get', () => {
   it('calls run with courseId and userId', async () => {
-    await handlers.get('gog_classroom_students_get')!({ courseId: 'c1', userId: 'u1' });
+    await harness.callTool('gog_classroom_students_get', { courseId: 'c1', userId: 'u1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'students', 'get', 'c1', 'u1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Not found'));
-    const result = await handlers.get('gog_classroom_students_get')!({ courseId: 'c1', userId: 'bad' });
+    const result = await harness.callTool('gog_classroom_students_get', { courseId: 'c1', userId: 'bad' });
     expect(result.content[0].text).toBe('Error: Not found');
   });
 });
 
 describe('gog_classroom_teachers_list', () => {
   it('calls run with courseId only', async () => {
-    await handlers.get('gog_classroom_teachers_list')!({ courseId: 'c1' });
+    await harness.callTool('gog_classroom_teachers_list', { courseId: 'c1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'teachers', 'list', 'c1'], { account: undefined });
   });
 
   it('passes all listing flags', async () => {
-    await handlers.get('gog_classroom_teachers_list')!({ courseId: 'c1', max: 20, page: 'tok', all: true });
+    await harness.callTool('gog_classroom_teachers_list', { courseId: 'c1', max: 20, page: 'tok', all: true });
     expect(runner.run).toHaveBeenCalledWith(
       ['classroom', 'teachers', 'list', 'c1', '--max=20', '--page=tok', '--all'],
       { account: undefined },
@@ -115,38 +115,38 @@ describe('gog_classroom_teachers_list', () => {
   });
 
   it('omits --all when false', async () => {
-    await handlers.get('gog_classroom_teachers_list')!({ courseId: 'c1', all: false });
+    await harness.callTool('gog_classroom_teachers_list', { courseId: 'c1', all: false });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'teachers', 'list', 'c1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('List failed'));
-    const result = await handlers.get('gog_classroom_teachers_list')!({ courseId: 'c1' });
+    const result = await harness.callTool('gog_classroom_teachers_list', { courseId: 'c1' });
     expect(result.content[0].text).toBe('Error: List failed');
   });
 });
 
 describe('gog_classroom_teachers_get', () => {
   it('calls run with courseId and userId', async () => {
-    await handlers.get('gog_classroom_teachers_get')!({ courseId: 'c1', userId: 'u1' });
+    await harness.callTool('gog_classroom_teachers_get', { courseId: 'c1', userId: 'u1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'teachers', 'get', 'c1', 'u1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Not found'));
-    const result = await handlers.get('gog_classroom_teachers_get')!({ courseId: 'c1', userId: 'bad' });
+    const result = await harness.callTool('gog_classroom_teachers_get', { courseId: 'c1', userId: 'bad' });
     expect(result.content[0].text).toBe('Error: Not found');
   });
 });
 
 describe('gog_classroom_roster', () => {
   it('calls run with courseId only', async () => {
-    await handlers.get('gog_classroom_roster')!({ courseId: 'c1' });
+    await harness.callTool('gog_classroom_roster', { courseId: 'c1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'roster', 'c1'], { account: undefined });
   });
 
   it('passes all flags', async () => {
-    await handlers.get('gog_classroom_roster')!({ courseId: 'c1', students: true, teachers: true, max: 50, page: 'tok', all: true });
+    await harness.callTool('gog_classroom_roster', { courseId: 'c1', students: true, teachers: true, max: 50, page: 'tok', all: true });
     expect(runner.run).toHaveBeenCalledWith(
       ['classroom', 'roster', 'c1', '--students', '--teachers', '--max=50', '--page=tok', '--all'],
       { account: undefined },
@@ -154,25 +154,25 @@ describe('gog_classroom_roster', () => {
   });
 
   it('omits boolean flags when false', async () => {
-    await handlers.get('gog_classroom_roster')!({ courseId: 'c1', students: false, teachers: false, all: false });
+    await harness.callTool('gog_classroom_roster', { courseId: 'c1', students: false, teachers: false, all: false });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'roster', 'c1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Roster failed'));
-    const result = await handlers.get('gog_classroom_roster')!({ courseId: 'c1' });
+    const result = await harness.callTool('gog_classroom_roster', { courseId: 'c1' });
     expect(result.content[0].text).toBe('Error: Roster failed');
   });
 });
 
 describe('gog_classroom_coursework_list', () => {
   it('calls run with courseId only', async () => {
-    await handlers.get('gog_classroom_coursework_list')!({ courseId: 'c1' });
+    await harness.callTool('gog_classroom_coursework_list', { courseId: 'c1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'coursework', 'list', 'c1'], { account: undefined });
   });
 
   it('passes all listing flags', async () => {
-    await handlers.get('gog_classroom_coursework_list')!({
+    await harness.callTool('gog_classroom_coursework_list', {
       courseId: 'c1',
       state: 'PUBLISHED',
       topic: 't1',
@@ -189,38 +189,38 @@ describe('gog_classroom_coursework_list', () => {
   });
 
   it('omits --all when false', async () => {
-    await handlers.get('gog_classroom_coursework_list')!({ courseId: 'c1', all: false });
+    await harness.callTool('gog_classroom_coursework_list', { courseId: 'c1', all: false });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'coursework', 'list', 'c1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('List failed'));
-    const result = await handlers.get('gog_classroom_coursework_list')!({ courseId: 'c1' });
+    const result = await harness.callTool('gog_classroom_coursework_list', { courseId: 'c1' });
     expect(result.content[0].text).toBe('Error: List failed');
   });
 });
 
 describe('gog_classroom_coursework_get', () => {
   it('calls run with courseId and courseworkId', async () => {
-    await handlers.get('gog_classroom_coursework_get')!({ courseId: 'c1', courseworkId: 'w1' });
+    await harness.callTool('gog_classroom_coursework_get', { courseId: 'c1', courseworkId: 'w1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'coursework', 'get', 'c1', 'w1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Not found'));
-    const result = await handlers.get('gog_classroom_coursework_get')!({ courseId: 'c1', courseworkId: 'bad' });
+    const result = await harness.callTool('gog_classroom_coursework_get', { courseId: 'c1', courseworkId: 'bad' });
     expect(result.content[0].text).toBe('Error: Not found');
   });
 });
 
 describe('gog_classroom_submissions_list', () => {
   it('calls run with ids only', async () => {
-    await handlers.get('gog_classroom_submissions_list')!({ courseId: 'c1', courseworkId: 'w1' });
+    await harness.callTool('gog_classroom_submissions_list', { courseId: 'c1', courseworkId: 'w1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'submissions', 'list', 'c1', 'w1'], { account: undefined });
   });
 
   it('passes all listing flags', async () => {
-    await handlers.get('gog_classroom_submissions_list')!({
+    await harness.callTool('gog_classroom_submissions_list', {
       courseId: 'c1',
       courseworkId: 'w1',
       state: 'TURNED_IN',
@@ -237,38 +237,38 @@ describe('gog_classroom_submissions_list', () => {
   });
 
   it('omits --all when false', async () => {
-    await handlers.get('gog_classroom_submissions_list')!({ courseId: 'c1', courseworkId: 'w1', all: false });
+    await harness.callTool('gog_classroom_submissions_list', { courseId: 'c1', courseworkId: 'w1', all: false });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'submissions', 'list', 'c1', 'w1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('List failed'));
-    const result = await handlers.get('gog_classroom_submissions_list')!({ courseId: 'c1', courseworkId: 'w1' });
+    const result = await harness.callTool('gog_classroom_submissions_list', { courseId: 'c1', courseworkId: 'w1' });
     expect(result.content[0].text).toBe('Error: List failed');
   });
 });
 
 describe('gog_classroom_submissions_get', () => {
   it('calls run with all three ids', async () => {
-    await handlers.get('gog_classroom_submissions_get')!({ courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
+    await harness.callTool('gog_classroom_submissions_get', { courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'submissions', 'get', 'c1', 'w1', 's1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Not found'));
-    const result = await handlers.get('gog_classroom_submissions_get')!({ courseId: 'c1', courseworkId: 'w1', submissionId: 'bad' });
+    const result = await harness.callTool('gog_classroom_submissions_get', { courseId: 'c1', courseworkId: 'w1', submissionId: 'bad' });
     expect(result.content[0].text).toBe('Error: Not found');
   });
 });
 
 describe('gog_classroom_submissions_grade', () => {
   it('calls run with ids only', async () => {
-    await handlers.get('gog_classroom_submissions_grade')!({ courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
+    await harness.callTool('gog_classroom_submissions_grade', { courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'submissions', 'grade', 'c1', 'w1', 's1'], { account: undefined });
   });
 
   it('passes --draft and --assigned when provided', async () => {
-    await handlers.get('gog_classroom_submissions_grade')!({ courseId: 'c1', courseworkId: 'w1', submissionId: 's1', draft: '90', assigned: '95' });
+    await harness.callTool('gog_classroom_submissions_grade', { courseId: 'c1', courseworkId: 'w1', submissionId: 's1', draft: '90', assigned: '95' });
     expect(runner.run).toHaveBeenCalledWith(
       ['classroom', 'submissions', 'grade', 'c1', 'w1', 's1', '--draft=90', '--assigned=95'],
       { account: undefined },
@@ -277,58 +277,58 @@ describe('gog_classroom_submissions_grade', () => {
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Grade failed'));
-    const result = await handlers.get('gog_classroom_submissions_grade')!({ courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
+    const result = await harness.callTool('gog_classroom_submissions_grade', { courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
     expect(result.content[0].text).toBe('Error: Grade failed');
   });
 });
 
 describe('gog_classroom_submissions_return', () => {
   it('calls run with ids', async () => {
-    await handlers.get('gog_classroom_submissions_return')!({ courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
+    await harness.callTool('gog_classroom_submissions_return', { courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'submissions', 'return', 'c1', 'w1', 's1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Return failed'));
-    const result = await handlers.get('gog_classroom_submissions_return')!({ courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
+    const result = await harness.callTool('gog_classroom_submissions_return', { courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
     expect(result.content[0].text).toBe('Error: Return failed');
   });
 });
 
 describe('gog_classroom_submissions_turn_in', () => {
   it('calls run with ids', async () => {
-    await handlers.get('gog_classroom_submissions_turn_in')!({ courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
+    await harness.callTool('gog_classroom_submissions_turn_in', { courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'submissions', 'turn-in', 'c1', 'w1', 's1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Turn-in failed'));
-    const result = await handlers.get('gog_classroom_submissions_turn_in')!({ courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
+    const result = await harness.callTool('gog_classroom_submissions_turn_in', { courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
     expect(result.content[0].text).toBe('Error: Turn-in failed');
   });
 });
 
 describe('gog_classroom_submissions_reclaim', () => {
   it('calls run with ids', async () => {
-    await handlers.get('gog_classroom_submissions_reclaim')!({ courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
+    await harness.callTool('gog_classroom_submissions_reclaim', { courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'submissions', 'reclaim', 'c1', 'w1', 's1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Reclaim failed'));
-    const result = await handlers.get('gog_classroom_submissions_reclaim')!({ courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
+    const result = await harness.callTool('gog_classroom_submissions_reclaim', { courseId: 'c1', courseworkId: 'w1', submissionId: 's1' });
     expect(result.content[0].text).toBe('Error: Reclaim failed');
   });
 });
 
 describe('gog_classroom_announcements_list', () => {
   it('calls run with courseId only', async () => {
-    await handlers.get('gog_classroom_announcements_list')!({ courseId: 'c1' });
+    await harness.callTool('gog_classroom_announcements_list', { courseId: 'c1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'announcements', 'list', 'c1'], { account: undefined });
   });
 
   it('passes all listing flags', async () => {
-    await handlers.get('gog_classroom_announcements_list')!({ courseId: 'c1', state: 'PUBLISHED', orderBy: 'updateTime desc', max: 20, page: 'tok', all: true });
+    await harness.callTool('gog_classroom_announcements_list', { courseId: 'c1', state: 'PUBLISHED', orderBy: 'updateTime desc', max: 20, page: 'tok', all: true });
     expect(runner.run).toHaveBeenCalledWith(
       ['classroom', 'announcements', 'list', 'c1', '--state=PUBLISHED', '--order-by=updateTime desc', '--max=20', '--page=tok', '--all'],
       { account: undefined },
@@ -336,33 +336,33 @@ describe('gog_classroom_announcements_list', () => {
   });
 
   it('omits --all when false', async () => {
-    await handlers.get('gog_classroom_announcements_list')!({ courseId: 'c1', all: false });
+    await harness.callTool('gog_classroom_announcements_list', { courseId: 'c1', all: false });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'announcements', 'list', 'c1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('List failed'));
-    const result = await handlers.get('gog_classroom_announcements_list')!({ courseId: 'c1' });
+    const result = await harness.callTool('gog_classroom_announcements_list', { courseId: 'c1' });
     expect(result.content[0].text).toBe('Error: List failed');
   });
 });
 
 describe('gog_classroom_announcements_get', () => {
   it('calls run with ids', async () => {
-    await handlers.get('gog_classroom_announcements_get')!({ courseId: 'c1', announcementId: 'a1' });
+    await harness.callTool('gog_classroom_announcements_get', { courseId: 'c1', announcementId: 'a1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'announcements', 'get', 'c1', 'a1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Not found'));
-    const result = await handlers.get('gog_classroom_announcements_get')!({ courseId: 'c1', announcementId: 'bad' });
+    const result = await harness.callTool('gog_classroom_announcements_get', { courseId: 'c1', announcementId: 'bad' });
     expect(result.content[0].text).toBe('Error: Not found');
   });
 });
 
 describe('gog_classroom_announcements_create', () => {
   it('calls run with required text only', async () => {
-    await handlers.get('gog_classroom_announcements_create')!({ courseId: 'c1', text: 'Hi' });
+    await harness.callTool('gog_classroom_announcements_create', { courseId: 'c1', text: 'Hi' });
     expect(runner.run).toHaveBeenCalledWith(
       ['classroom', 'announcements', 'create', 'c1', '--text=Hi'],
       { account: undefined },
@@ -370,7 +370,7 @@ describe('gog_classroom_announcements_create', () => {
   });
 
   it('passes all optional flags', async () => {
-    await handlers.get('gog_classroom_announcements_create')!({ courseId: 'c1', text: 'Hi', state: 'DRAFT', scheduled: '2026-05-01T12:00' });
+    await harness.callTool('gog_classroom_announcements_create', { courseId: 'c1', text: 'Hi', state: 'DRAFT', scheduled: '2026-05-01T12:00' });
     expect(runner.run).toHaveBeenCalledWith(
       ['classroom', 'announcements', 'create', 'c1', '--text=Hi', '--state=DRAFT', '--scheduled=2026-05-01T12:00'],
       { account: undefined },
@@ -379,19 +379,19 @@ describe('gog_classroom_announcements_create', () => {
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Create failed'));
-    const result = await handlers.get('gog_classroom_announcements_create')!({ courseId: 'c1', text: 'x' });
+    const result = await harness.callTool('gog_classroom_announcements_create', { courseId: 'c1', text: 'x' });
     expect(result.content[0].text).toBe('Error: Create failed');
   });
 });
 
 describe('gog_classroom_topics_list', () => {
   it('calls run with courseId only', async () => {
-    await handlers.get('gog_classroom_topics_list')!({ courseId: 'c1' });
+    await harness.callTool('gog_classroom_topics_list', { courseId: 'c1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'topics', 'list', 'c1'], { account: undefined });
   });
 
   it('passes all listing flags', async () => {
-    await handlers.get('gog_classroom_topics_list')!({ courseId: 'c1', max: 20, page: 'tok', all: true });
+    await harness.callTool('gog_classroom_topics_list', { courseId: 'c1', max: 20, page: 'tok', all: true });
     expect(runner.run).toHaveBeenCalledWith(
       ['classroom', 'topics', 'list', 'c1', '--max=20', '--page=tok', '--all'],
       { account: undefined },
@@ -399,38 +399,38 @@ describe('gog_classroom_topics_list', () => {
   });
 
   it('omits --all when false', async () => {
-    await handlers.get('gog_classroom_topics_list')!({ courseId: 'c1', all: false });
+    await harness.callTool('gog_classroom_topics_list', { courseId: 'c1', all: false });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'topics', 'list', 'c1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('List failed'));
-    const result = await handlers.get('gog_classroom_topics_list')!({ courseId: 'c1' });
+    const result = await harness.callTool('gog_classroom_topics_list', { courseId: 'c1' });
     expect(result.content[0].text).toBe('Error: List failed');
   });
 });
 
 describe('gog_classroom_topics_get', () => {
   it('calls run with ids', async () => {
-    await handlers.get('gog_classroom_topics_get')!({ courseId: 'c1', topicId: 't1' });
+    await harness.callTool('gog_classroom_topics_get', { courseId: 'c1', topicId: 't1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'topics', 'get', 'c1', 't1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Not found'));
-    const result = await handlers.get('gog_classroom_topics_get')!({ courseId: 'c1', topicId: 'bad' });
+    const result = await harness.callTool('gog_classroom_topics_get', { courseId: 'c1', topicId: 'bad' });
     expect(result.content[0].text).toBe('Error: Not found');
   });
 });
 
 describe('gog_classroom_invitations_list', () => {
   it('calls run with no flags', async () => {
-    await handlers.get('gog_classroom_invitations_list')!({});
+    await harness.callTool('gog_classroom_invitations_list', {});
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'invitations', 'list'], { account: undefined });
   });
 
   it('passes all listing flags', async () => {
-    await handlers.get('gog_classroom_invitations_list')!({ course: 'c1', user: 'u1', max: 20, page: 'tok', all: true });
+    await harness.callTool('gog_classroom_invitations_list', { course: 'c1', user: 'u1', max: 20, page: 'tok', all: true });
     expect(runner.run).toHaveBeenCalledWith(
       ['classroom', 'invitations', 'list', '--course=c1', '--user=u1', '--max=20', '--page=tok', '--all'],
       { account: undefined },
@@ -438,75 +438,75 @@ describe('gog_classroom_invitations_list', () => {
   });
 
   it('omits --all when false', async () => {
-    await handlers.get('gog_classroom_invitations_list')!({ all: false });
+    await harness.callTool('gog_classroom_invitations_list', { all: false });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'invitations', 'list'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('List failed'));
-    const result = await handlers.get('gog_classroom_invitations_list')!({});
+    const result = await harness.callTool('gog_classroom_invitations_list', {});
     expect(result.content[0].text).toBe('Error: List failed');
   });
 });
 
 describe('gog_classroom_invitations_get', () => {
   it('calls run with invitationId', async () => {
-    await handlers.get('gog_classroom_invitations_get')!({ invitationId: 'i1' });
+    await harness.callTool('gog_classroom_invitations_get', { invitationId: 'i1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'invitations', 'get', 'i1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Not found'));
-    const result = await handlers.get('gog_classroom_invitations_get')!({ invitationId: 'bad' });
+    const result = await harness.callTool('gog_classroom_invitations_get', { invitationId: 'bad' });
     expect(result.content[0].text).toBe('Error: Not found');
   });
 });
 
 describe('gog_classroom_invitations_accept', () => {
   it('calls run with invitationId', async () => {
-    await handlers.get('gog_classroom_invitations_accept')!({ invitationId: 'i1' });
+    await harness.callTool('gog_classroom_invitations_accept', { invitationId: 'i1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'invitations', 'accept', 'i1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Accept failed'));
-    const result = await handlers.get('gog_classroom_invitations_accept')!({ invitationId: 'bad' });
+    const result = await harness.callTool('gog_classroom_invitations_accept', { invitationId: 'bad' });
     expect(result.content[0].text).toBe('Error: Accept failed');
   });
 });
 
 describe('gog_classroom_profile_get', () => {
   it('calls run with no userId (self)', async () => {
-    await handlers.get('gog_classroom_profile_get')!({});
+    await harness.callTool('gog_classroom_profile_get', {});
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'profile', 'get'], { account: undefined });
   });
 
   it('passes userId when provided', async () => {
-    await handlers.get('gog_classroom_profile_get')!({ userId: 'u1' });
+    await harness.callTool('gog_classroom_profile_get', { userId: 'u1' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'profile', 'get', 'u1'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Profile failed'));
-    const result = await handlers.get('gog_classroom_profile_get')!({});
+    const result = await harness.callTool('gog_classroom_profile_get', {});
     expect(result.content[0].text).toBe('Error: Profile failed');
   });
 });
 
 describe('gog_classroom_run', () => {
   it('passes subcommand and args to runner', async () => {
-    await handlers.get('gog_classroom_run')!({ subcommand: 'guardians', args: ['list', 'u1'] });
+    await harness.callTool('gog_classroom_run', { subcommand: 'guardians', args: ['list', 'u1'] });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'guardians', 'list', 'u1'], { account: undefined });
   });
 
   it('passes account through', async () => {
-    await handlers.get('gog_classroom_run')!({ subcommand: 'materials', args: [], account: 'a@b.com' });
+    await harness.callTool('gog_classroom_run', { subcommand: 'materials', args: [], account: 'a@b.com' });
     expect(runner.run).toHaveBeenCalledWith(['classroom', 'materials'], { account: 'a@b.com' });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Run failed'));
-    const result = await handlers.get('gog_classroom_run')!({ subcommand: 'guardians', args: [] });
+    const result = await harness.callTool('gog_classroom_run', { subcommand: 'guardians', args: [] });
     expect(result.content[0].text).toBe('Error: Run failed');
   });
 });