70834: Test fixes + data service tests

src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts

@@ -21,7 +21,8 @@ describe('MetadataSchemaFormComponent', () => {
   const registryServiceStub = {
     getActiveMetadataSchema: () => observableOf(undefined),
     createOrUpdateMetadataSchema: (schema: MetadataSchema) => observableOf(schema),
-    cancelEditMetadataSchema: () => {}
+    cancelEditMetadataSchema: () => {},
+    clearMetadataSchemaRequests: () => observableOf(undefined)
   };
   const formBuilderServiceStub = {
     createFormGroup: () => {

src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts

@@ -30,6 +30,7 @@ describe('MetadataFieldFormComponent', () => {
     createOrUpdateMetadataField: (field: MetadataField) => observableOf(field),
     cancelEditMetadataField: () => {},
     cancelEditMetadataSchema: () => {},
+    clearMetadataFieldRequests: () => observableOf(undefined)
   };
   const formBuilderServiceStub = {
     createFormGroup: () => {

src/app/core/data/metadata-field-data.service.spec.ts

@@ -0,0 +1,102 @@
+import { RequestService } from './request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { RestResponse } from '../cache/response.models';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { CreateMetadataFieldRequest, FindListOptions, UpdateMetadataFieldRequest } from './request.models';
+import { MetadataFieldDataService } from './metadata-field-data.service';
+import { MetadataField } from '../metadata/metadata-field.model';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { SearchParam } from '../cache/models/search-param.model';
+
+describe('MetadataFieldDataService', () => {
+  let metadataFieldService: MetadataFieldDataService;
+  let requestService: RequestService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let schema: MetadataSchema;
+
+  const endpoint = 'api/metadatafield/endpoint';
+
+  function init() {
+    schema = Object.assign(new MetadataSchema(), {
+      prefix: 'dc',
+      namespace: 'namespace'
+    });
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: '34cfed7c-f597-49ef-9cbe-ea351f0023c2',
+      configure: {},
+      getByUUID: observableOf({ response: new RestResponse(true, 200, 'OK') }),
+      removeByHrefSubstring: {}
+    });
+    halService = Object.assign(new HALEndpointServiceStub(endpoint));
+    notificationsService = jasmine.createSpyObj('notificationsService', {
+      error: {}
+    });
+    metadataFieldService = new MetadataFieldDataService(requestService, undefined, undefined, halService, undefined, undefined, undefined, notificationsService);
+  }
+
+  beforeEach(() => {
+    init();
+  });
+
+  describe('findBySchema', () => {
+    beforeEach(() => {
+      spyOn(metadataFieldService, 'searchBy');
+    });
+
+    it('should call searchBy with the correct arguments', () => {
+      metadataFieldService.findBySchema(schema);
+      const expectedOptions = Object.assign(new FindListOptions(), {
+        searchParams: [new SearchParam('schema', schema.prefix)]
+      });
+      expect(metadataFieldService.searchBy).toHaveBeenCalledWith('bySchema', expectedOptions);
+    });
+  });
+
+  describe('createOrUpdateMetadataField', () => {
+    let field: MetadataField;
+
+    beforeEach(() => {
+      field = Object.assign(new MetadataField(), {
+        element: 'identifier',
+        qualifier: undefined,
+        schema: schema
+      });
+    });
+
+    describe('called with a new metadata field', () => {
+      it('should send a CreateMetadataFieldRequest', (done) => {
+        metadataFieldService.createOrUpdateMetadataField(field).subscribe(() => {
+          expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(CreateMetadataFieldRequest));
+          done();
+        });
+      });
+    });
+
+    describe('called with an existing metadata field', () => {
+      beforeEach(() => {
+        field = Object.assign(field, {
+          id: 'id-of-existing-field'
+        });
+      });
+
+      it('should send a UpdateMetadataFieldRequest', (done) => {
+        metadataFieldService.createOrUpdateMetadataField(field).subscribe(() => {
+          expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(UpdateMetadataFieldRequest));
+          done();
+        });
+      });
+    });
+  });
+
+  describe('clearRequests', () => {
+    it('should remove requests on the data service\'s endpoint', (done) => {
+      metadataFieldService.clearRequests().subscribe(() => {
+        expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(`${endpoint}/${(metadataFieldService as any).linkPath}`);
+        done();
+      });
+    });
+  });
+});

src/app/core/data/metadata-schema-data.service.spec.ts

@@ -0,0 +1,80 @@
+import { RequestService } from './request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { MetadataSchemaDataService } from './metadata-schema-data.service';
+import { of as observableOf } from 'rxjs';
+import { RestResponse } from '../cache/response.models';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { CreateMetadataSchemaRequest, UpdateMetadataSchemaRequest } from './request.models';
+
+describe('MetadataSchemaDataService', () => {
+  let metadataSchemaService: MetadataSchemaDataService;
+  let requestService: RequestService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+
+  const endpoint = 'api/metadataschema/endpoint';
+
+  function init() {
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: '34cfed7c-f597-49ef-9cbe-ea351f0023c2',
+      configure: {},
+      getByUUID: observableOf({ response: new RestResponse(true, 200, 'OK') }),
+      removeByHrefSubstring: {}
+    });
+    halService = Object.assign(new HALEndpointServiceStub(endpoint));
+    notificationsService = jasmine.createSpyObj('notificationsService', {
+      error: {}
+    });
+    metadataSchemaService = new MetadataSchemaDataService(requestService, undefined, undefined, halService, undefined, undefined, undefined, notificationsService);
+  }
+
+  beforeEach(() => {
+    init();
+  });
+
+  describe('createOrUpdateMetadataSchema', () => {
+    let schema: MetadataSchema;
+
+    beforeEach(() => {
+      schema = Object.assign(new MetadataSchema(), {
+        prefix: 'dc',
+        namespace: 'namespace'
+      });
+    });
+
+    describe('called with a new metadata schema', () => {
+      it('should send a CreateMetadataSchemaRequest', (done) => {
+        metadataSchemaService.createOrUpdateMetadataSchema(schema).subscribe(() => {
+          expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(CreateMetadataSchemaRequest));
+          done();
+        });
+      });
+    });
+
+    describe('called with an existing metadata schema', () => {
+      beforeEach(() => {
+        schema = Object.assign(schema, {
+          id: 'id-of-existing-schema'
+        });
+      });
+
+      it('should send a UpdateMetadataSchemaRequest', (done) => {
+        metadataSchemaService.createOrUpdateMetadataSchema(schema).subscribe(() => {
+          expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(UpdateMetadataSchemaRequest));
+          done();
+        });
+      });
+    });
+  });
+
+  describe('clearRequests', () => {
+    it('should remove requests on the data service\'s endpoint', (done) => {
+      metadataSchemaService.clearRequests().subscribe(() => {
+        expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(`${endpoint}/${(metadataSchemaService as any).linkPath}`);
+        done();
+      });
+    });
+  });
+});