test: use createNormalGrouper()

ilandikov · ilandikov · commit cd8e1df107c8 · 2023-05-15T16:39:39.000+06:00
diff --git a/tests/CustomMatchers/CustomMatchersForGrouping.ts b/tests/CustomMatchers/CustomMatchersForGrouping.ts
@@ -24,7 +24,7 @@ export function toSupportGroupingWithProperty(field: Field, property: string) {
         };
     }
 
-    const fieldGrouper = field.createGrouper();
+    const fieldGrouper = field.createNormalGrouper();
     if (fieldGrouper.property !== property) {
         return {
             message: () =>
diff --git a/tests/DocumentationSamples/DocsSamplesForStatuses.test.ts b/tests/DocumentationSamples/DocsSamplesForStatuses.test.ts
@@ -208,9 +208,9 @@ function verifyTransitionsAsMarkdownTable(statuses: Status[]) {
         table.addRow(cells);
     }
 
-    showGroupNamesForAllTasks('status', new StatusField().createGrouper().grouper);
-    showGroupNamesForAllTasks('status.type', new StatusTypeField().createGrouper().grouper);
-    showGroupNamesForAllTasks('status.name', new StatusNameField().createGrouper().grouper);
+    showGroupNamesForAllTasks('status', new StatusField().createNormalGrouper().grouper);
+    showGroupNamesForAllTasks('status.type', new StatusTypeField().createNormalGrouper().grouper);
+    showGroupNamesForAllTasks('status.name', new StatusNameField().createNormalGrouper().grouper);
 
     table.verifyForDocs();
 }
diff --git a/tests/Query/Filter/BacklinkField.test.ts b/tests/Query/Filter/BacklinkField.test.ts
@@ -58,7 +58,7 @@ describe('grouping by backlink', () => {
         'path "%s" and heading "%s" should have groups: %s',
         (path: string, heading: string | null, groups: string[]) => {
             // Arrange
-            const grouper = new BacklinkField().createGrouper().grouper;
+            const grouper = new BacklinkField().createNormalGrouper().grouper;
             const t = '- [ ] xyz';
 
             // Assert
diff --git a/tests/Query/Filter/CreatedDateField.test.ts b/tests/Query/Filter/CreatedDateField.test.ts
@@ -97,7 +97,7 @@ describe('grouping by created date', () => {
 
     it('group by created date', () => {
         // Arrange
-        const grouper = new CreatedDateField().createGrouper();
+        const grouper = new CreatedDateField().createNormalGrouper();
         const taskWithDate = new TaskBuilder().createdDate('1970-01-01').build();
         const taskWithoutDate = new TaskBuilder().build();
 
diff --git a/tests/Query/Filter/DoneDateField.test.ts b/tests/Query/Filter/DoneDateField.test.ts
@@ -94,7 +94,7 @@ describe('grouping by done date', () => {
 
     it('group by done date', () => {
         // Arrange
-        const grouper = new DoneDateField().createGrouper();
+        const grouper = new DoneDateField().createNormalGrouper();
         const taskWithDate = new TaskBuilder().doneDate('1970-01-01').build();
         const taskWithoutDate = new TaskBuilder().build();
 
diff --git a/tests/Query/Filter/DueDateField.test.ts b/tests/Query/Filter/DueDateField.test.ts
@@ -523,7 +523,7 @@ describe('grouping by due date', () => {
 
     it('group by due date', () => {
         // Arrange
-        const grouper = new DueDateField().createGrouper();
+        const grouper = new DueDateField().createNormalGrouper();
         const taskWithDate = new TaskBuilder().dueDate('1970-01-01').build();
         const taskWithoutDate = new TaskBuilder().build();
 
diff --git a/tests/Query/Filter/FilenameField.test.ts b/tests/Query/Filter/FilenameField.test.ts
@@ -114,7 +114,7 @@ describe('grouping by filename', () => {
         ['- [ ] a', 'a/b/_c_.md', ['[[_c_]]']],
     ])('task "%s" with path "%s" should have groups: %s', (taskLine: string, path: string, groups: string[]) => {
         // Arrange
-        const grouper = new FilenameField().createGrouper().grouper;
+        const grouper = new FilenameField().createNormalGrouper().grouper;
 
         // Assert
         expect(grouper(fromLine({ line: taskLine, path: path }))).toEqual(groups);
diff --git a/tests/Query/Filter/FolderField.test.ts b/tests/Query/Filter/FolderField.test.ts
@@ -43,7 +43,7 @@ describe('grouping by folder', () => {
         ['- [ ] a', 'a.md', ['/']],
     ])('task "%s" with path "%s" should have groups: %s', (taskLine: string, path: string, groups: string[]) => {
         // Arrange
-        const grouper = new FolderField().createGrouper().grouper;
+        const grouper = new FolderField().createNormalGrouper().grouper;
 
         // Assert
         expect(grouper(fromLine({ line: taskLine, path: path }))).toEqual(groups);
diff --git a/tests/Query/Filter/HappensDateField.test.ts b/tests/Query/Filter/HappensDateField.test.ts
@@ -150,7 +150,7 @@ describe('grouping by happens date', () => {
         ['- [ ] start is earliest date 🛫 1970-01-01 ⏳ 1970-01-02 📅 1970-01-03', ['1970-01-01 Thursday']],
     ])('group by happens date: task "%s" should have groups %s', (taskLine: string, expectedResult: string[]) => {
         // Arrange
-        const grouper = new HappensDateField().createGrouper();
+        const grouper = new HappensDateField().createNormalGrouper();
 
         // Assert
         expect(grouper.grouper(fromLine({ line: taskLine }))).toEqual(expectedResult);
diff --git a/tests/Query/Filter/HeadingField.test.ts b/tests/Query/Filter/HeadingField.test.ts
@@ -104,7 +104,7 @@ describe('grouping by heading', () => {
         'task "%s" with header "%s" should have groups: %s',
         (taskLine: string, header: string | null, groups: string[]) => {
             // Arrange
-            const grouper = new HeadingField().createGrouper().grouper;
+            const grouper = new HeadingField().createNormalGrouper().grouper;
 
             // Assert
             expect(grouper(fromLine({ line: taskLine, precedingHeader: header }))).toEqual(groups);
diff --git a/tests/Query/Filter/PathField.test.ts b/tests/Query/Filter/PathField.test.ts
@@ -158,7 +158,7 @@ describe('grouping by path', () => {
         ['- [ ] a', 'a\\b\\c.md', ['a\\\\b\\\\c']],
     ])('task "%s" with path "%s" should have groups: %s', (taskLine: string, path: string, groups: string[]) => {
         // Arrange
-        const grouper = new PathField().createGrouper().grouper;
+        const grouper = new PathField().createNormalGrouper().grouper;
 
         // Assert
         expect(grouper(fromLine({ line: taskLine, path: path }))).toEqual(groups);
diff --git a/tests/Query/Filter/PriorityField.test.ts b/tests/Query/Filter/PriorityField.test.ts
@@ -169,7 +169,7 @@ describe('grouping by priority', () => {
         ['- [ ] a 🔽', ['Priority 4: Low']],
     ])('task "%s" should have groups: %s', (taskLine: string, groups: string[]) => {
         // Arrange
-        const grouper = new PriorityField().createGrouper().grouper;
+        const grouper = new PriorityField().createNormalGrouper().grouper;
 
         // Assert
         expect(grouper(fromLine({ line: taskLine }))).toEqual(groups);
diff --git a/tests/Query/Filter/RecurrenceField.test.ts b/tests/Query/Filter/RecurrenceField.test.ts
@@ -88,7 +88,7 @@ describe('grouping by recurrence', () => {
         ['- [ ] a 🔁 every 6 months on the 2nd Wednesday', ['every 6 months on the 2nd Wednesday']],
     ])('task "%s" should have groups: %s', (taskLine: string, groups: string[]) => {
         // Arrange
-        const grouper = new RecurrenceField().createGrouper().grouper;
+        const grouper = new RecurrenceField().createNormalGrouper().grouper;
 
         // Assert
         expect(grouper(fromLine({ line: taskLine }))).toEqual(groups);
diff --git a/tests/Query/Filter/RecurringField.test.ts b/tests/Query/Filter/RecurringField.test.ts
@@ -96,7 +96,7 @@ describe('grouping by recurring', () => {
         ['- [ ] a 🔁 every Sunday', ['Recurring']],
     ])('task "%s" should have groups: %s', (taskLine: string, groups: string[]) => {
         // Arrange
-        const grouper = new RecurringField().createGrouper().grouper;
+        const grouper = new RecurringField().createNormalGrouper().grouper;
 
         // Assert
         expect(grouper(fromLine({ line: taskLine }))).toEqual(groups);
diff --git a/tests/Query/Filter/RootField.test.ts b/tests/Query/Filter/RootField.test.ts
@@ -46,7 +46,7 @@ describe('grouping by root', () => {
         ['- [ ] a', 'a.md', ['/']],
     ])('task "%s" with path "%s" should have groups: %s', (taskLine: string, path: string, groups: string[]) => {
         // Arrange
-        const grouper = new RootField().createGrouper().grouper;
+        const grouper = new RootField().createNormalGrouper().grouper;
 
         // Assert
         expect(grouper(fromLine({ line: taskLine, path: path }))).toEqual(groups);
diff --git a/tests/Query/Filter/ScheduledDateField.test.ts b/tests/Query/Filter/ScheduledDateField.test.ts
@@ -48,7 +48,7 @@ describe('grouping by scheduled date', () => {
 
     it('group by scheduled date', () => {
         // Arrange
-        const grouper = new ScheduledDateField().createGrouper();
+        const grouper = new ScheduledDateField().createNormalGrouper();
         const taskWithDate = new TaskBuilder().scheduledDate('1970-01-01').build();
         const taskWithoutDate = new TaskBuilder().build();
 
diff --git a/tests/Query/Filter/StartDateField.test.ts b/tests/Query/Filter/StartDateField.test.ts
@@ -64,7 +64,7 @@ describe('grouping by start date', () => {
 
     it('group by start date', () => {
         // Arrange
-        const grouper = new StartDateField().createGrouper();
+        const grouper = new StartDateField().createNormalGrouper();
         const taskWithDate = new TaskBuilder().startDate('1970-01-01').build();
         const taskWithoutDate = new TaskBuilder().build();
 
diff --git a/tests/Query/Filter/StatusField.test.ts b/tests/Query/Filter/StatusField.test.ts
@@ -96,7 +96,7 @@ describe('grouping by status', () => {
         ['- [!] a', ['Done']],
     ])('task "%s" should have groups: %s', (taskLine: string, groups: string[]) => {
         // Arrange
-        const grouper = new StatusField().createGrouper().grouper;
+        const grouper = new StatusField().createNormalGrouper().grouper;
 
         // Assert
         expect(grouper(fromLine({ line: taskLine }))).toEqual(groups);
diff --git a/tests/Query/Filter/StatusNameField.test.ts b/tests/Query/Filter/StatusNameField.test.ts
@@ -91,7 +91,7 @@ describe('grouping by status.name', () => {
 
     it('group by status.name', () => {
         // Arrange
-        const grouper = new StatusNameField().createGrouper();
+        const grouper = new StatusNameField().createNormalGrouper();
 
         // // Assert
         expect(grouper.grouper(todoTask)).toEqual(['Todo']);
diff --git a/tests/Query/Filter/StatusTypeField.test.ts b/tests/Query/Filter/StatusTypeField.test.ts
@@ -149,7 +149,7 @@ describe('grouping by status.type', () => {
 
     it('group by status.type', () => {
         // Arrange
-        const grouper = new StatusTypeField().createGrouper();
+        const grouper = new StatusTypeField().createNormalGrouper();
 
         // // Assert
         expect(grouper.grouper(inprTask)).toEqual(['1 IN_PROGRESS']);
diff --git a/tests/Query/Filter/TagsField.test.ts b/tests/Query/Filter/TagsField.test.ts
@@ -641,7 +641,7 @@ describe('grouping by tag', () => {
         ['- [x] a', ['(No tags)']],
     ])('task "%s" should have groups: %s', (taskLine: string, groups: string[]) => {
         // Arrange
-        const grouper = new TagsField().createGrouper().grouper;
+        const grouper = new TagsField().createNormalGrouper().grouper;
 
         // Assert
         expect(grouper(fromLine({ line: taskLine }))).toEqual(groups);
diff --git a/tests/Query/Filter/UrgencyField.test.ts b/tests/Query/Filter/UrgencyField.test.ts
@@ -91,7 +91,7 @@ describe('grouping by urgency', () => {
         ['- [ ] a 🔽', ['0.00']],
     ])('task "%s" should have groups: %s', (taskLine: string, groups: string[]) => {
         // Arrange
-        const grouper = new UrgencyField().createGrouper().grouper;
+        const grouper = new UrgencyField().createNormalGrouper().grouper;
 
         // Assert
         expect(grouper(fromLine({ line: taskLine }))).toEqual(groups);
diff --git a/tests/TaskGroups.test.ts b/tests/TaskGroups.test.ts
@@ -25,7 +25,7 @@ describe('Grouping tasks', () => {
         const inputs = [a, b, c];
 
         // Act
-        const grouping = [new PathField().createGrouper()];
+        const grouping = [new PathField().createNormalGrouper()];
         const groups = new TaskGroups(grouping, inputs);
 
         // Assert
@@ -79,7 +79,7 @@ describe('Grouping tasks', () => {
     it('groups empty task list correctly', () => {
         // Arrange
         const inputs: Task[] = [];
-        const grouping = [new PathField().createGrouper()];
+        const grouping = [new PathField().createNormalGrouper()];
 
         // Act
         const groups = new TaskGroups(grouping, inputs);
@@ -105,7 +105,7 @@ describe('Grouping tasks', () => {
         });
         const inputs = [a, b, c];
 
-        const grouping = [new PathField().createGrouper()];
+        const grouping = [new PathField().createNormalGrouper()];
         const groups = new TaskGroups(grouping, inputs);
         expect(groups.toString()).toMatchInlineSnapshot(`
             "
@@ -143,7 +143,7 @@ describe('Grouping tasks', () => {
         });
         const inputs = [a, b];
 
-        const grouping = [new FilenameField().createGrouper()];
+        const grouping = [new FilenameField().createNormalGrouper()];
         const groups = new TaskGroups(grouping, inputs);
         expect(groups.toString()).toMatchInlineSnapshot(`
             "
@@ -207,7 +207,7 @@ describe('Grouping tasks', () => {
         });
         const inputs = [a, b, c];
 
-        const grouping = [new TagsField().createGrouper()];
+        const grouping = [new TagsField().createNormalGrouper()];
         const groups = new TaskGroups(grouping, inputs);
         expect(groups.toString()).toMatchInlineSnapshot(`
             "
@@ -295,8 +295,8 @@ describe('Grouping tasks', () => {
         const inputs = [a, b, c];
 
         const grouping = [
-            new StatusTypeField().createGrouper(), // Two group levels
-            new HappensDateField().createGrouper(),
+            new StatusTypeField().createNormalGrouper(), // Two group levels
+            new HappensDateField().createNormalGrouper(),
         ];
         const groups = new TaskGroups(grouping, inputs);
         // This result is incorrect. The '2 TODO' heading is shown before

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export function toSupportGroupingWithProperty(field: Field, property: string) {`
`24`	`24`	`};`
`25`	`25`	`}`
`26`	`26`
`27`		`- const fieldGrouper = field.createGrouper();`
	`27`	`+ const fieldGrouper = field.createNormalGrouper();`
`28`	`28`	`if (fieldGrouper.property !== property) {`
`29`	`29`	`return {`
`30`	`30`	`message: () =>`
Original file line number	Diff line number	Diff line change
`@@ -208,9 +208,9 @@ function verifyTransitionsAsMarkdownTable(statuses: Status[]) {`
`208`	`208`	`table.addRow(cells);`
`209`	`209`	`}`
`210`	`210`
`211`		`- showGroupNamesForAllTasks('status', new StatusField().createGrouper().grouper);`
`212`		`- showGroupNamesForAllTasks('status.type', new StatusTypeField().createGrouper().grouper);`
`213`		`- showGroupNamesForAllTasks('status.name', new StatusNameField().createGrouper().grouper);`
	`211`	`+ showGroupNamesForAllTasks('status', new StatusField().createNormalGrouper().grouper);`
	`212`	`+ showGroupNamesForAllTasks('status.type', new StatusTypeField().createNormalGrouper().grouper);`
	`213`	`+ showGroupNamesForAllTasks('status.name', new StatusNameField().createNormalGrouper().grouper);`
`214`	`214`
`215`	`215`	`table.verifyForDocs();`
`216`	`216`	`}`