Move test back into test file

projecttacoma · Feb 1, 2024 · aab6334 · aab6334
1 parent 3e6487c
commit aab6334
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 59 deletions.
diff --git a/src/helpers/elm/QueryFilterParser.ts b/src/helpers/elm/QueryFilterParser.ts
@@ -1363,61 +1363,3 @@ export function flattenFilters(filter: AnyFilter): AnyFilter[] {
     return a;
   }
 }
-
-describe('Flatten Filters', () => {
-  test('should pass through standard equals filter', () => {
-    const equalsFilter: EqualsFilter = {
-      type: 'equals',
-      alias: 'R',
-      attribute: 'attr-0',
-      value: 'value-0'
-    };
-
-    const flattenedFilters = flattenFilters(equalsFilter);
-
-    expect(flattenedFilters).toHaveLength(1);
-    expect(flattenedFilters[0]).toEqual(equalsFilter);
-  });
-
-  test('should flatten AND filters', () => {
-    const equalsFilter0: EqualsFilter = {
-      type: 'equals',
-      alias: 'R',
-      attribute: 'attr-0',
-      value: 'value-0'
-    };
-
-    const equalsFilter1: EqualsFilter = {
-      type: 'equals',
-      alias: 'R',
-      attribute: 'attr-1',
-      value: 'value-1'
-    };
-
-    const duringFilter: DuringFilter = {
-      type: 'during',
-      alias: 'R',
-      attribute: 'attr-3',
-      valuePeriod: {
-        start: '2021-01-01',
-        end: '2021-12-01'
-      }
-    };
-
-    const filter: AndFilter = {
-      type: 'and',
-      children: [equalsFilter0, duringFilter, equalsFilter1]
-    };
-
-    const flattenedFilters = flattenFilters(filter);
-
-    expect(flattenedFilters).toHaveLength(3);
-    expect(flattenedFilters).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({ ...equalsFilter0 }),
-        expect.objectContaining({ ...equalsFilter1 }),
-        expect.objectContaining({ ...duringFilter })
-      ])
-    );
-  });
-});
diff --git a/test/unit/queryFilters/QueryFilterParser.test.ts b/test/unit/queryFilters/QueryFilterParser.test.ts
@@ -4,7 +4,8 @@ import {
   generateDetailedCodeFilter,
   generateDetailedDateFilter,
   generateDetailedValueFilter,
-  codeLookup
+  codeLookup,
+  flattenFilters
 } from '../../../src/helpers/elm/QueryFilterParser';
 import { FHIRWrapper } from 'cql-exec-fhir';
 import { DateTime, Interval } from 'cql-execution';
@@ -924,3 +925,61 @@ describe('codeLookup', () => {
     expect(codeLookup('Procedure', 'nonsense')).toBeNull();
   });
 });
+
+describe('Flatten Filters', () => {
+  test('should pass through standard equals filter', () => {
+    const equalsFilter: EqualsFilter = {
+      type: 'equals',
+      alias: 'R',
+      attribute: 'attr-0',
+      value: 'value-0'
+    };
+
+    const flattenedFilters = flattenFilters(equalsFilter);
+
+    expect(flattenedFilters).toHaveLength(1);
+    expect(flattenedFilters[0]).toEqual(equalsFilter);
+  });
+
+  test('should flatten AND filters', () => {
+    const equalsFilter0: EqualsFilter = {
+      type: 'equals',
+      alias: 'R',
+      attribute: 'attr-0',
+      value: 'value-0'
+    };
+
+    const equalsFilter1: EqualsFilter = {
+      type: 'equals',
+      alias: 'R',
+      attribute: 'attr-1',
+      value: 'value-1'
+    };
+
+    const duringFilter: DuringFilter = {
+      type: 'during',
+      alias: 'R',
+      attribute: 'attr-3',
+      valuePeriod: {
+        start: '2021-01-01',
+        end: '2021-12-01'
+      }
+    };
+
+    const filter: AndFilter = {
+      type: 'and',
+      children: [equalsFilter0, duringFilter, equalsFilter1]
+    };
+
+    const flattenedFilters = flattenFilters(filter);
+
+    expect(flattenedFilters).toHaveLength(3);
+    expect(flattenedFilters).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ ...equalsFilter0 }),
+        expect.objectContaining({ ...equalsFilter1 }),
+        expect.objectContaining({ ...duringFilter })
+      ])
+    );
+  });
+});