113904: Added tests for the getEPersonName function

Author: Kuno Vercammen

src/app/process-page/overview/table/process-overview-table.component.spec.ts

@@ -56,11 +56,12 @@ describe('ProcessOverviewTableComponent', () => {
   let modalService: NgbModal;
   let authService; // : AuthService; Not typed as the mock does not fully implement AuthService
   let routeService: RouteService;
-  let translateService: TranslateService;
 
   let processes: Process[];
   let ePerson: EPerson;
 
+  let translateServiceSpy: jasmine.SpyObj<TranslateService>;
+
   function init() {
     processes = [
       Object.assign(new Process(), {
@@ -69,23 +70,28 @@ describe('ProcessOverviewTableComponent', () => {
         startTime: '2020-03-19 00:30:00',
         endTime: '2020-03-19 23:30:00',
         processStatus: ProcessStatus.COMPLETED,
+        userId: 'testid',
       }),
       Object.assign(new Process(), {
         processId: 2,
         scriptName: 'script-b',
         startTime: '2020-03-20 00:30:00',
         endTime: '2020-03-20 23:30:00',
         processStatus: ProcessStatus.FAILED,
+        userId: 'testid',
       }),
       Object.assign(new Process(), {
         processId: 3,
         scriptName: 'script-c',
         startTime: '2020-03-21 00:30:00',
         endTime: '2020-03-21 23:30:00',
         processStatus: ProcessStatus.RUNNING,
+        userId: 'testid',
       }),
     ];
     ePerson = Object.assign(new EPerson(), {
+      id: 'testid',
+      uuid: 'testid',
       metadata: {
         'eperson.firstname': [
           {
@@ -144,6 +150,8 @@ describe('ProcessOverviewTableComponent', () => {
   beforeEach(waitForAsync(() => {
     init();
 
+    translateServiceSpy = jasmine.createSpyObj('TranslateService', ['get']);
+
     void TestBed.configureTestingModule({
       declarations: [NgbCollapse],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), VarDirective, ProcessOverviewTableComponent],
@@ -228,50 +236,43 @@ describe('ProcessOverviewTableComponent', () => {
     });
 
   });
-/*
-  describe('getEPersonName', () => {
-    beforeEach(() => {
-      init();
-      translateService = getMockTranslateService();
-    });
 
-    it('should return the name when the ID is valid', () => {
-      const id = 'valid_id';
-      const expectedName = 'John Doe';
+  describe('getEPersonName function', () => {
+    it('should return unknown user when id is null', (done: DoneFn) => {
+      const id = null;
+      const expectedTranslation = 'process.overview.unknown.user';
 
-      spyOn(dsoNameService, 'getName').and.returnValue(expectedName);
+      translateServiceSpy.get(expectedTranslation);
 
-      component.getEPersonName(id).subscribe(name => {
-        expect(name).toEqual(expectedName);
+      component.getEPersonName(id).subscribe((result: string) => {
+        expect(result).toBe(expectedTranslation);
+        done();
       });
-
-      expect(ePersonService.findById).toHaveBeenCalledWith(id);
+      expect(translateServiceSpy.get).toHaveBeenCalledWith('process.overview.unknown.user');
     });
 
-    fit('should return "Unknown" when the ID is invalid', () => {
-      const id = 'invalid_id';
-      const translationKey = 'unknown_user';
-      const expectedMessage = 'Unknown';
+    it('should return unknown user when id is invalid', (done: DoneFn) => {
+      const id = '';
+      const expectedTranslation = 'process.overview.unknown.user';
 
-      spyOn(translateService, 'get').and.returnValue(of(expectedMessage));
+      translateServiceSpy.get(expectedTranslation);
 
-      component.getEPersonName(id).subscribe(name => {
-        expect(name).toEqual(expectedMessage);
+      component.getEPersonName(id).subscribe((result: string) => {
+        expect(result).toBe(expectedTranslation);
+        done();
       });
-
-      expect(ePersonService.findById).toHaveBeenCalledWith(id);
-      expect(translateService.get).toHaveBeenCalledWith(translationKey);
+      expect(translateServiceSpy.get).toHaveBeenCalledWith('process.overview.unknown.user');
     });
 
-    it('should return an empty observable when the ID is null', () => {
-      const id = null;
+    it('should return EPerson name when id is correct', (done: DoneFn) => {
+      const id = 'testid';
+      const expectedName = 'John Doe';
 
-      component.getEPersonName(id).subscribe(name => {
-        expect(name).toBeUndefined();
+      component.getEPersonName(id).subscribe((result: string) => {
+        expect(result).toEqual(expectedName);
+        done();
       });
-
-      expect(ePersonService.findById).not.toHaveBeenCalled();
+      expect(translateServiceSpy.get).not.toHaveBeenCalled();
     });
   });
-*/
 });

src/app/process-page/overview/table/process-overview-table.component.ts

@@ -38,6 +38,10 @@ import { PaginationService } from 'src/app/core/pagination/pagination.service';
 import { AuthService } from '../../../core/auth/auth.service';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { Component, Input, OnInit, Inject, PLATFORM_ID, OnDestroy } from '@angular/core';
+import { ProcessStatus } from '../../processes/process-status.model';
+import { Observable, mergeMap, from as observableFrom, BehaviorSubject, Subscription, of } from 'rxjs';
+import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
@@ -165,8 +169,8 @@ export class ProcessOverviewTableComponent implements OnInit, OnDestroy {
 
   constructor(protected processOverviewService: ProcessOverviewService,
               protected processBulkDeleteService: ProcessBulkDeleteService,
-              protected ePersonDataService: EPersonDataService,
-              protected dsoNameService: DSONameService,
+              public ePersonDataService: EPersonDataService,
+              public dsoNameService: DSONameService,
               protected paginationService: PaginationService,
               protected routeService: RouteService,
               protected router: Router,
@@ -284,11 +288,11 @@ export class ProcessOverviewTableComponent implements OnInit, OnDestroy {
         getFirstCompletedRemoteData(),
         switchMap((rd: RemoteData<EPerson>) => {
           if (rd.hasSucceeded) {
-            return observableFrom([this.dsoNameService.getName(rd.payload)]);
+            return [this.dsoNameService.getName(rd.payload)];
           } else {
             return this.translateService.get('process.overview.unknown.user');
           }
-        })
+        }),
       );
     } else {
       return this.translateService.get('process.overview.unknown.user');