Skip to content

Commit 2ef9341

Browse files
claremacraeclaremacrae
committed
test: - Move withWideSelectionOfDependencyScenarios() to SampleTasks
1 parent 29d1475 commit 2ef9341

File tree

2 files changed

+50
-50
lines changed

2 files changed

+50
-50
lines changed

‎tests/Task/Task.test.ts

Lines changed: 3 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ import type { StatusCollection } from '../../src/Statuses/StatusCollection';
1111
import { StatusRegistry } from '../../src/Statuses/StatusRegistry';
1212
import { TaskLocation } from '../../src/Task/TaskLocation';
1313
import { StatusConfiguration, StatusType } from '../../src/Statuses/StatusConfiguration';
14-
import { fromLine, fromLines } from '../TestingTools/TestHelpers';
14+
import { fromLine } from '../TestingTools/TestHelpers';
1515
import { TaskBuilder } from '../TestingTools/TaskBuilder';
1616
import { RecurrenceBuilder } from '../TestingTools/RecurrenceBuilder';
1717
import { Priority } from '../../src/Task/Priority';
18+
import { SampleTasks } from '../TestingTools/SampleTasks';
1819

1920
window.moment = moment;
2021

@@ -551,53 +552,6 @@ describe('properties for scripting', () => {
551552
});
552553
});
553554

554-
function withWideSelectionOfDependencyScenarios() {
555-
const lines = [
556-
'- [ ] No dependency - TODO',
557-
'- [x] No dependency - DONE',
558-
//
559-
'- [ ] scenario 1 - TODO depends on TODO 🆔 scenario1',
560-
'- [ ] scenario 1 - TODO depends on TODO ⛔️ scenario1',
561-
//
562-
'- [x] scenario 2 - TODO depends on DONE 🆔 scenario2',
563-
'- [ ] scenario 2 - TODO depends on DONE ⛔️ scenario2',
564-
//
565-
'- [ ] scenario 3 - DONE depends on TODO 🆔 scenario3',
566-
'- [x] scenario 3 - DONE depends on TODO ⛔️ scenario3',
567-
//
568-
'- [x] scenario 4 - DONE depends on DONE 🆔 scenario4',
569-
'- [x] scenario 4 - DONE depends on DONE ⛔️ scenario4',
570-
//
571-
'- [ ] scenario 5 - TODO depends on non-existing ID ⛔️ nosuchid',
572-
//
573-
'- [ ] scenario 6 - TODO depends on self 🆔 self ⛔️ self',
574-
//
575-
'- [x] scenario 7 - task with duplicated id - this is DONE - 🆔 scenario7',
576-
'- [ ] scenario 7 - task with duplicated id - this is TODO - and is blocking - 🆔 scenario7',
577-
'- [ ] scenario 7 - TODO depends on id that is duplicated - ensure all tasks are checked - ⛔️ scenario7',
578-
//
579-
'- [ ] scenario 8 - mutually dependant 🆔 scenario8a ⛔️ scenario8b',
580-
'- [ ] scenario 8 - mutually dependant 🆔 scenario8b ⛔️ scenario8a',
581-
//
582-
'- [ ] scenario 9 - cyclic dependency 🆔 scenario9a ⛔️ scenario9c',
583-
'- [ ] scenario 9 - cyclic dependency 🆔 scenario9b ⛔️ scenario9a',
584-
'- [ ] scenario 9 - cyclic dependency 🆔 scenario9c ⛔️ scenario9b',
585-
//
586-
'- [ ] scenario 10 - multiple dependencies TODO - 🆔 scenario10a',
587-
'- [/] scenario 10 - multiple dependencies IN_PROGRESS - 🆔 scenario10b',
588-
'- [x] scenario 10 - multiple dependencies DONE - 🆔 scenario10c',
589-
'- [-] scenario 10 - multiple dependencies CANCELLED - 🆔 scenario10d',
590-
'- [Q] scenario 10 - multiple dependencies NON_TASK - 🆔 scenario10e',
591-
'- [ ] scenario 10 - multiple dependencies - ⛔️ scenario10a,scenario10b,scenario10c,scenario10d,scenario10e',
592-
//
593-
'- [ ] scenario 11 - indirect dependency - indirect blocking of scenario11c ignored - 🆔 scenario11a',
594-
'- [x] scenario 11 - indirect dependency - DONE - 🆔 scenario11b ⛔️ scenario11a',
595-
'- [ ] scenario 11 - indirect dependency - indirect blocking of scenario11a ignored - 🆔 scenario11c ⛔️ scenario11b',
596-
];
597-
const tasks = fromLines({ lines });
598-
return tasks;
599-
}
600-
601555
describe('task dependencies', () => {
602556
beforeEach(() => {
603557
const nonTaskStatus = new StatusConfiguration('Q', 'Question', 'A', true, StatusType.NON_TASK);
@@ -613,7 +567,7 @@ describe('task dependencies', () => {
613567
}
614568

615569
it('blocking and blocked', () => {
616-
const tasks = withWideSelectionOfDependencyScenarios();
570+
const tasks = SampleTasks.withWideSelectionOfDependencyScenarios();
617571

618572
verifyAll('Visualise blocking methods on Task, for a collection of tasks', tasks, (task) => {
619573
return `

‎tests/TestingTools/SampleTasks.ts

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { StatusType } from '../../src/Statuses/StatusConfiguration';
55
import { Priority } from '../../src/Task/Priority';
66
import { PriorityTools } from '../../src/lib/PriorityTools';
77
import { TaskBuilder } from './TaskBuilder';
8-
import { fromLine } from './TestHelpers';
8+
import { fromLine, fromLines } from './TestHelpers';
99

1010
const representativeDates = ['2023-05-30', '2023-05-31', '2023-06-01', '2023-02-32', null];
1111

@@ -221,6 +221,52 @@ export class SampleTasks {
221221
];
222222
}
223223

224+
public static withWideSelectionOfDependencyScenarios() {
225+
const lines = [
226+
'- [ ] No dependency - TODO',
227+
'- [x] No dependency - DONE',
228+
//
229+
'- [ ] scenario 1 - TODO depends on TODO 🆔 scenario1',
230+
'- [ ] scenario 1 - TODO depends on TODO ⛔️ scenario1',
231+
//
232+
'- [x] scenario 2 - TODO depends on DONE 🆔 scenario2',
233+
'- [ ] scenario 2 - TODO depends on DONE ⛔️ scenario2',
234+
//
235+
'- [ ] scenario 3 - DONE depends on TODO 🆔 scenario3',
236+
'- [x] scenario 3 - DONE depends on TODO ⛔️ scenario3',
237+
//
238+
'- [x] scenario 4 - DONE depends on DONE 🆔 scenario4',
239+
'- [x] scenario 4 - DONE depends on DONE ⛔️ scenario4',
240+
//
241+
'- [ ] scenario 5 - TODO depends on non-existing ID ⛔️ nosuchid',
242+
//
243+
'- [ ] scenario 6 - TODO depends on self 🆔 self ⛔️ self',
244+
//
245+
'- [x] scenario 7 - task with duplicated id - this is DONE - 🆔 scenario7',
246+
'- [ ] scenario 7 - task with duplicated id - this is TODO - and is blocking - 🆔 scenario7',
247+
'- [ ] scenario 7 - TODO depends on id that is duplicated - ensure all tasks are checked - ⛔️ scenario7',
248+
//
249+
'- [ ] scenario 8 - mutually dependant 🆔 scenario8a ⛔️ scenario8b',
250+
'- [ ] scenario 8 - mutually dependant 🆔 scenario8b ⛔️ scenario8a',
251+
//
252+
'- [ ] scenario 9 - cyclic dependency 🆔 scenario9a ⛔️ scenario9c',
253+
'- [ ] scenario 9 - cyclic dependency 🆔 scenario9b ⛔️ scenario9a',
254+
'- [ ] scenario 9 - cyclic dependency 🆔 scenario9c ⛔️ scenario9b',
255+
//
256+
'- [ ] scenario 10 - multiple dependencies TODO - 🆔 scenario10a',
257+
'- [/] scenario 10 - multiple dependencies IN_PROGRESS - 🆔 scenario10b',
258+
'- [x] scenario 10 - multiple dependencies DONE - 🆔 scenario10c',
259+
'- [-] scenario 10 - multiple dependencies CANCELLED - 🆔 scenario10d',
260+
'- [Q] scenario 10 - multiple dependencies NON_TASK - 🆔 scenario10e',
261+
'- [ ] scenario 10 - multiple dependencies - ⛔️ scenario10a,scenario10b,scenario10c,scenario10d,scenario10e',
262+
//
263+
'- [ ] scenario 11 - indirect dependency - indirect blocking of scenario11c ignored - 🆔 scenario11a',
264+
'- [x] scenario 11 - indirect dependency - DONE - 🆔 scenario11b ⛔️ scenario11a',
265+
'- [ ] scenario 11 - indirect dependency - indirect blocking of scenario11a ignored - 🆔 scenario11c ⛔️ scenario11b',
266+
];
267+
return fromLines({ lines });
268+
}
269+
224270
public static withAllRepresentativeBlockLinks(): Task[] {
225271
const descriptions = ['', ' ^ca47c7', ' ^fromseparatefile'];
226272
return descriptions.map((blockLink) => {

0 commit comments

Comments
 (0)