gh-470: Fix broken tests

(cherry picked from commit 59b2602)
MauroDataMapper · Oct 15, 2024 · 544df94 · 544df94
1 parent 054705d
commit 544df94
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 31 deletions.
diff --git a/src/app/data-explorer/pipes/meql.pipe.spec.ts b/src/app/data-explorer/pipes/meql.pipe.spec.ts
@@ -43,7 +43,7 @@ describe('MeqlPipe', () => {
         condition: 'and',
         rules: [
           {
-            field: 'field name',
+            field: 'some entity.field name',
             entity: 'some entity',
             operator: '=',
             value: 'String 1',
@@ -52,7 +52,7 @@ describe('MeqlPipe', () => {
       };
 
       const line1 = `(${newline}`;
-      const line2 = `${tab}"${query.rules[0].entity}.${query.rules[0].field}" ${query.rules[0].operator} "${query.rules[0].value}"${newline}`;
+      const line2 = `${tab}"${query.rules[0].field}" ${query.rules[0].operator} "${query.rules[0].value}"${newline}`;
       const line3 = ')';
 
       const actual = pipe.transform(query);

diff --git a/src/app/data-explorer/query-builder-wrapper.service.spec.ts b/src/app/data-explorer/query-builder-wrapper.service.spec.ts
@@ -37,6 +37,7 @@ import {
 import { QueryBuilderConfig } from './query-builder/query-builder.interfaces';
 import { createProfileServiceStub } from '../testing/stubs/profile.stub';
 import { QueryBuilderTestingHelper } from '../testing/querybuilder.testing.helpers';
+import { Console } from 'console';
 describe('QueryBuilderService', () => {
   let service: QueryBuilderWrapperService;
   const profilesStub = createProfileServiceStub();
@@ -255,7 +256,7 @@ describe('QueryBuilderService', () => {
               condition: 'and',
               rules: [
                 {
-                  field: `field (${expectedMappedType})`,
+                  field: `schema.class.field (${expectedMappedType})`,
                   operator: '=',
                   value: 'value-1',
                 },
@@ -268,15 +269,15 @@ describe('QueryBuilderService', () => {
         fields:
           expectedMappedType !== undefined
             ? {
-                field: {
+                [`${entityName}.field`]: {
                   defaultValue:
                     expectedMappedType === 'number'
                       ? 0
                       : expectedMappedType === 'string'
-                      ? ''
-                      : expectedMappedType === 'boolean'
-                      ? false
-                      : null,
+                        ? ''
+                        : expectedMappedType === 'boolean'
+                          ? false
+                          : null,
                   name: `field (${expectedMappedType})`,
                   entity: entityName,
                   options:
@@ -286,14 +287,14 @@ describe('QueryBuilderService', () => {
                           { name: 'Option 2', value: 'Option 2' },
                         ]
                       : expectedMappedType === 'terminology'
-                      ? [
-                          {
-                            name: 'modelResourceDomainType',
-                            value: dataType.modelResourceDomainType,
-                          },
-                          { name: 'modelResourceId', value: dataType.modelResourceId },
-                        ]
-                      : [],
+                        ? [
+                            {
+                              name: 'modelResourceDomainType',
+                              value: dataType.modelResourceDomainType,
+                            },
+                            { name: 'modelResourceId', value: dataType.modelResourceId },
+                          ]
+                        : [],
                   type: expectedMappedType,
                 },
               }

diff --git a/src/app/data-explorer/query-builder-wrapper/query-builder-wrapper.component.spec.ts b/src/app/data-explorer/query-builder-wrapper/query-builder-wrapper.component.spec.ts
@@ -18,21 +18,15 @@ SPDX-License-Identifier: Apache-2.0
 */
 import { QueryBuilderWrapperComponent } from './query-builder-wrapper.component';
 
-import {
-  ComponentHarness,
-  setupTestModuleForComponent,
-} from 'src/app/testing/testing.helpers';
+import { ComponentHarness, setupTestModuleForComponent } from 'src/app/testing/testing.helpers';
 import { createTerminologyServiceStub } from 'src/app/testing/stubs/terminology.stub';
 import { TerminologyService } from 'src/app/mauro/terminology.service';
 import { MockComponent } from 'ng-mocks';
 import { MeqlOutputComponent } from '../meql-output/meql-output.component';
 import { MatCard } from '@angular/material/card';
 import { QueryCondition } from '../data-explorer.types';
 import { mapModelDataTypeToOptionsArray } from '../query-builder-wrapper.service';
-import {
-  CatalogueItemDomainType,
-  MdmResourcesConfiguration,
-} from '@maurodatamapper/mdm-resources';
+import { CatalogueItemDomainType, MdmResourcesConfiguration } from '@maurodatamapper/mdm-resources';
 import { of } from 'rxjs';
 import { AutocompleteSelectOptionSet } from 'src/app/shared/autocomplete-select/autocomplete-select.component';
 import { QueryBuilderComponent } from '../query-builder/query-builder.component';
@@ -133,12 +127,8 @@ describe('QueryBuilderComponent', () => {
         options: [],
       };
 
-      expect(harness.component.termSearchResults['testField1']).toStrictEqual(
-        expectedSetup
-      );
-      expect(harness.component.termSearchResults['testField2']).toStrictEqual(
-        expectedSetup
-      );
+      expect(harness.component.termSearchResults['testField1']).toStrictEqual(expectedSetup);
+      expect(harness.component.termSearchResults['testField2']).toStrictEqual(expectedSetup);
     });
 
     it('should reset the query when empty', () => {

diff --git a/src/app/data-explorer/query-builder-wrapper/query-builder-wrapper.component.ts b/src/app/data-explorer/query-builder-wrapper/query-builder-wrapper.component.ts
@@ -137,7 +137,7 @@ export class QueryBuilderWrapperComponent implements OnInit {
             options: terms.items.map((item) => {
               return {
                 name: item.definition,
-                value: item.definition,
+                value: item,
               };
             }),
           };