[DURACOM-426] improve tests

Author: FrancescoMolinaro

src/app/core/shared/metadata.utils.spec.ts

@@ -50,19 +50,20 @@ const multiViewModelList = [
   { key: 'foo', ...bar, order: 0 },
 ];
 
-const testMethod = (fn, resultKind, mapOrMaps, keyOrKeys, hitHighlights, expected, filter?) => {
+const testMethod = (fn, resultKind, mapOrMaps, keyOrKeys, hitHighlights, expected, filter?, limit?: number) => {
   const keys = keyOrKeys instanceof Array ? keyOrKeys : [keyOrKeys];
   describe('and key' + (keys.length === 1 ? (' ' + keys[0]) : ('s ' + JSON.stringify(keys)))
     + ' with ' + (isUndefined(filter) ? 'no filter' : 'filter ' + JSON.stringify(filter)), () => {
-    const result = fn(mapOrMaps, keys, hitHighlights, filter);
+    const result = fn(mapOrMaps, keys, hitHighlights, filter, true, limit);
     let shouldReturn;
     if (resultKind === 'boolean') {
       shouldReturn = expected;
     } else if (isUndefined(expected)) {
       shouldReturn = 'undefined';
     } else if (expected instanceof Array) {
       shouldReturn = 'an array with ' + expected.length + ' ' + (expected.length > 1 ? 'ordered ' : '')
-        + resultKind + (expected.length !== 1 ? 's' : '');
+        + resultKind + (expected.length !== 1 ? 's' : '')
+        + (isUndefined(limit) ? '' : ' (limited to ' + limit + ')');
     } else {
       shouldReturn = 'a ' + resultKind;
     }
@@ -255,4 +256,60 @@ describe('Metadata', () => {
 
   });
 
+  describe('all method with limit', () => {
+    const testAllWithLimit = (mapOrMaps, keyOrKeys, expected, limit) =>
+      testMethod(Metadata.all, 'value', mapOrMaps, keyOrKeys, undefined, expected, undefined, limit);
+
+    describe('with multiMap and limit', () => {
+      testAllWithLimit(multiMap, 'dc.title', [dcTitle1], 1);
+    });
+  });
+
+  describe('hasValue method', () => {
+    const testHasValue = (value, expected) =>
+      testMethod(Metadata.hasValue, 'boolean', value, undefined, undefined, expected);
+
+    describe('with undefined value', () => {
+      testHasValue(undefined, false);
+    });
+    describe('with null value', () => {
+      testHasValue(null, false);
+    });
+    describe('with string value', () => {
+      testHasValue('test', true);
+    });
+    describe('with empty string value', () => {
+      testHasValue('', false);
+    });
+    describe('with undefined value for a MetadataValue object', () => {
+      const value: Partial<MetadataValue> = {
+        value: undefined,
+      };
+      testHasValue(value, false);
+    });
+    describe('with null value for a MetadataValue object', () => {
+      const value: Partial<MetadataValue> = {
+        value: null,
+      };
+      testHasValue(value, false);
+    });
+    describe('with empty string for a MetadataValue object', () => {
+      const value: Partial<MetadataValue> = {
+        value: '',
+      };
+      testHasValue(value, false);
+    });
+    describe('with value for a MetadataValue object', () => {
+      const value: Partial<MetadataValue> = {
+        value: 'test',
+      };
+      testHasValue(value, true);
+    });
+    describe('with a generic object', () => {
+      const value: any = {
+        test: 'test',
+      };
+      testHasValue(value, true);
+    });
+  });
 });

src/app/core/shared/metadata.utils.ts

@@ -54,10 +54,8 @@ export class Metadata {
       for (const mdKey of Metadata.resolveKeys(hitHighlights, keyOrKeys)) {
         if (hitHighlights[mdKey]) {
           for (const candidate of hitHighlights[mdKey]) {
-            if (Metadata.valueMatches(candidate as MetadataValue, filter)) {
-              if (isEmpty(limit) || (hasValue(limit) && matches.length < limit)) {
-                matches.push(candidate as MetadataValue);
-              }
+            if (Metadata.valueMatches(candidate as MetadataValue, filter) && (isEmpty(limit) || (hasValue(limit) && matches.length < limit))) {
+              matches.push(candidate as MetadataValue);
             }
           }
         }
@@ -69,7 +67,7 @@ export class Metadata {
     for (const mdKey of Metadata.resolveKeys(metadata, keyOrKeys)) {
       if (metadata[mdKey]) {
         for (const candidate of metadata[mdKey]) {
-          if (Metadata.valueMatches(candidate as MetadataValue, filter)) {
+          if (Metadata.valueMatches(candidate as MetadataValue, filter) && (isEmpty(limit) || (hasValue(limit) && matches.length < limit))) {
             if (escapeHTML) {
               matches.push(Object.assign(new MetadataValue(), candidate, {
                 value: escape(candidate.value),

src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts

@@ -45,18 +45,22 @@ import { TranslateModule } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+import { v4 as uuidv4 } from 'uuid';
 
 import { ObjNgFor } from '../../../../../utils/object-ngfor.pipe';
 import { AuthorityConfidenceStateDirective } from '../../../../directives/authority-confidence-state.directive';
 import { VocabularyTreeviewComponent } from '../../../../vocabulary-treeview/vocabulary-treeview.component';
 import { DsDynamicOneboxComponent } from './dynamic-onebox.component';
 import { DynamicOneboxModel } from './dynamic-onebox.model';
 
+
 export let ONEBOX_TEST_GROUP;
 
 export let ONEBOX_TEST_MODEL_CONFIG;
 
 
+const validAuthority = uuidv4();
+
 // Mock class for NgbModalRef
 export class MockNgbModalRef {
   componentInstance = {
@@ -364,13 +368,13 @@ describe('DsDynamicOneboxComponent test suite', () => {
         oneboxComponent.group = ONEBOX_TEST_GROUP;
         oneboxComponent.model = new DynamicOneboxModel(ONEBOX_TEST_MODEL_CONFIG);
         const entry = of(Object.assign(new VocabularyEntry(), {
-          authority: 'test001',
+          authority: validAuthority,
           value: 'test001',
           display: 'test',
         }));
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
-        (oneboxComponent.model as any).value = new FormFieldMetadataValueObject('test', null, 'test001');
+        (oneboxComponent.model as any).value = new FormFieldMetadataValueObject('test', null,  validAuthority, 'test001');
         oneboxCompFixture.detectChanges();
       });
 
@@ -381,7 +385,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
 
       it('should init component properly', fakeAsync(() => {
         tick();
-        expect(oneboxComponent.currentValue).toEqual(new FormFieldMetadataValueObject('test001', null, 'test001', 'test'));
+        expect(oneboxComponent.currentValue).toEqual(new FormFieldMetadataValueObject('test001', null, validAuthority, 'test'));
         expect((oneboxComponent as any).vocabularyService.getVocabularyEntryByID).toHaveBeenCalled();
       }));