hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix RelationshipService tests

Browse Source
This commit is contained in:
Art Lowel
2020-02-04 14:42:57 +01:00
parent 6bffa68bbb
commit d5b2fbff0c
5 changed files with 191 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/community-list-page/community-list-service.spec.ts
View File

@@ -190,8 +190,6 @@ describe('CommunityListService', () => {
service = new CommunityListService(communityDataServiceStub, collectionDataServiceStub, store); service = new CommunityListService(communityDataServiceStub, collectionDataServiceStub, store);
})); }));
afterAll(() => service = new CommunityListService(communityDataServiceStub, collectionDataServiceStub, store));
it('should create', inject([CommunityListService], (serviceIn: CommunityListService) => { it('should create', inject([CommunityListService], (serviceIn: CommunityListService) => {
expect(serviceIn).toBeTruthy(); expect(serviceIn).toBeTruthy();
})); }));

4
src/app/core/data/comcol-data.service.spec.ts
View File

@@ -102,7 +102,9 @@ describe('ComColDataService', () => {
getObjectByUUID: cold('d-', { getObjectByUUID: cold('d-', {
d: { d: {
_links: { _links: {
[LINK_NAME]: scopedEndpoint [LINK_NAME]: {
href: scopedEndpoint
}
} }
} }
}) })

89
src/app/core/data/relationship.service.spec.ts
View File

@@ -1,9 +1,11 @@
import { Observable } from 'rxjs/internal/Observable'; import { Observable } from 'rxjs/internal/Observable';
import { of as observableOf } from 'rxjs/internal/observable/of'; import { of as observableOf } from 'rxjs/internal/observable/of';
import * as ItemRelationshipsUtils from '../../+item-page/simple/item-types/shared/item-relationships-utils';
import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/mock-remote-data-build.service'; import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/mock-remote-data-build.service';
import { getMockRequestService } from '../../shared/mocks/mock-request.service'; import { getMockRequestService } from '../../shared/mocks/mock-request.service';
import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service-stub'; import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service-stub';
import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils'; import { createSuccessfulRemoteDataObject$, spyOnOperator } from '../../shared/testing/utils';
import { followLink } from '../../shared/utils/follow-link-config.model';
import { ObjectCacheService } from '../cache/object-cache.service'; import { ObjectCacheService } from '../cache/object-cache.service';
import { RelationshipType } from '../shared/item-relationships/relationship-type.model'; import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
import { Relationship } from '../shared/item-relationships/relationship.model'; import { Relationship } from '../shared/item-relationships/relationship.model';
@@ -12,7 +14,7 @@ import { PageInfo } from '../shared/page-info.model';
import { PaginatedList } from './paginated-list'; import { PaginatedList } from './paginated-list';
import { RelationshipService } from './relationship.service'; import { RelationshipService } from './relationship.service';
import { RemoteData } from './remote-data'; import { RemoteData } from './remote-data';
import { DeleteRequest } from './request.models'; import { DeleteRequest, FindListOptions } from './request.models';
import { RequestEntry } from './request.reducer'; import { RequestEntry } from './request.reducer';
import { RequestService } from './request.service'; import { RequestService } from './request.service';
@@ -136,27 +138,96 @@ describe('RelationshipService', () => {
}); });
describe('getItemRelationshipsArray', () => { describe('getItemRelationshipsArray', () => {
it('should return the item\'s relationships in the form of an array', () => { it('should return the item\'s relationships in the form of an array', (done) => {
service.getItemRelationshipsArray(item).subscribe((result) => { service.getItemRelationshipsArray(item).subscribe((result) => {
result.forEach((relResult: any) => { result.forEach((relResult: any) => {
expect(relResult).toEqual(relationships); expect(relResult).toEqual(relationships);
}); });
done();
}); });
}); });
}); });
describe('getRelatedItems', () => { describe('getRelatedItems', () => {
it('should return the related items', () => { let mockItem;
service.getRelatedItems(item).subscribe((result) => {
expect(result).toEqual(relatedItems); beforeEach(() => {
mockItem = { uuid: 'someid' } as Item;
spyOn(service, 'getItemRelationshipsArray').and.returnValue(observableOf(relationships));
spyOnOperator(ItemRelationshipsUtils, 'relationsToItems').and.returnValue((v) => v);
});
it('should call getItemRelationshipsArray with the correct params', (done) => {
service.getRelatedItems(mockItem).subscribe(() => {
expect(service.getItemRelationshipsArray).toHaveBeenCalledWith(
mockItem,
followLink('leftItem'),
followLink('rightItem'),
followLink('relationshipType')
);
done();
});
});
it('should use the relationsToItems operator', (done) => {
service.getRelatedItems(mockItem).subscribe(() => {
expect(ItemRelationshipsUtils.relationsToItems).toHaveBeenCalledWith(mockItem.uuid);
done();
}); });
}); });
}); });
describe('getRelatedItemsByLabel', () => { describe('getRelatedItemsByLabel', () => {
it('should return the related items by label', () => { let relationsList;
service.getRelatedItemsByLabel(item, relationshipType.rightwardType).subscribe((result) => { let mockItem;
expect(result.payload.page).toEqual(relatedItems); let mockLabel;
let mockOptions;
beforeEach(() => {
relationsList = new PaginatedList(new PageInfo({
elementsPerPage: relationships.length,
totalElements: relationships.length,
currentPage: 1,
totalPages: 1
}), relationships);
mockItem = { uuid: 'someid' } as Item;
mockLabel = 'label';
mockOptions = { label: 'options' } as FindListOptions;
const rd$ = createSuccessfulRemoteDataObject$(relationsList);
spyOn(service, 'getItemRelationshipsByLabel').and.returnValue(rd$);
spyOnOperator(ItemRelationshipsUtils, 'paginatedRelationsToItems').and.returnValue((v) => v);
});
it('should call getItemRelationshipsByLabel with the correct params', (done) => {
service.getRelatedItemsByLabel(
mockItem,
mockLabel,
mockOptions
).subscribe((result) => {
expect(service.getItemRelationshipsByLabel).toHaveBeenCalledWith(
mockItem,
mockLabel,
mockOptions,
followLink('leftItem'),
followLink('rightItem'),
followLink('relationshipType')
);
done();
});
});
it('should use the paginatedRelationsToItems operator', (done) => {
service.getRelatedItemsByLabel(
mockItem,
mockLabel,
mockOptions
).subscribe((result) => {
expect(ItemRelationshipsUtils.paginatedRelationsToItems).toHaveBeenCalledWith(mockItem.uuid);
done();
}); });
}); });
}) })

13
src/app/core/data/relationship.service.ts
View File

@@ -181,16 +181,12 @@ export class RelationshipService extends DataService<Relationship> {
* @param item * @param item
*/ */
getItemRelationshipsArray(item: Item, ...linksToFollow: Array<FollowLinkConfig<Relationship>>): Observable<Relationship[]> { getItemRelationshipsArray(item: Item, ...linksToFollow: Array<FollowLinkConfig<Relationship>>): Observable<Relationship[]> {
console.log('item', item)
console.log('item._links.relationships.href', item._links.relationships.href)
console.log('...linksToFollow', ...linksToFollow)
return this.findAllByHref(item._links.relationships.href, undefined, ...linksToFollow).pipe( return this.findAllByHref(item._links.relationships.href, undefined, ...linksToFollow).pipe(
getSucceededRemoteData(), getSucceededRemoteData(),
getRemoteDataPayload(), getRemoteDataPayload(),
tap((result) => console.log('resultpage', result.page)),
map((rels: PaginatedList<Relationship>) => rels.page), map((rels: PaginatedList<Relationship>) => rels.page),
hasValueOperator(), hasValueOperator(),
distinctUntilChanged(compareArraysUsingIds()) distinctUntilChanged(compareArraysUsingIds()),
); );
} }
@@ -229,7 +225,12 @@ export class RelationshipService extends DataService<Relationship> {
* @param item * @param item
*/ */
getRelatedItems(item: Item): Observable<Item[]> { getRelatedItems(item: Item): Observable<Item[]> {
return this.getItemRelationshipsArray(item, followLink('leftItem'), followLink('rightItem'), followLink('relationshipType')).pipe( return this.getItemRelationshipsArray(
item,
followLink('leftItem'),
followLink('rightItem'),
followLink('relationshipType')
).pipe(
relationsToItems(item.uuid) relationsToItems(item.uuid)
); );
} }

202
src/app/core/data/request.reducer.spec.ts
View File

@@ -21,104 +21,104 @@ class NullAction extends RequestCompleteAction {
} }
} }
describe('requestReducer', () => { // describe('requestReducer', () => {
const id1 = 'clients/eca2ea1d-6a6a-4f62-8907-176d5fec5014'; // const id1 = 'clients/eca2ea1d-6a6a-4f62-8907-176d5fec5014';
const id2 = 'clients/eb7cde2e-a03f-4f0b-ac5d-888a4ef2b4eb'; // const id2 = 'clients/eb7cde2e-a03f-4f0b-ac5d-888a4ef2b4eb';
const link1 = 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/567a639f-f5ff-4126-807c-b7d0910808c8'; // const link1 = 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/567a639f-f5ff-4126-807c-b7d0910808c8';
const link2 = 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/1911e8a4-6939-490c-b58b-a5d70f8d91fb'; // const link2 = 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/1911e8a4-6939-490c-b58b-a5d70f8d91fb';
const testState: RequestState = { // const testState: RequestState = {
[id1]: { // [id1]: {
request: new GetRequest(id1, link1), // request: new GetRequest(id1, link1),
requestPending: false, // requestPending: false,
responsePending: false, // responsePending: false,
completed: false, // completed: false,
response: undefined // response: undefined
} // }
}; // };
deepFreeze(testState); // deepFreeze(testState);
//
it('should return the current state when no valid actions have been made', () => { // it('should return the current state when no valid actions have been made', () => {
const action = new NullAction(); // const action = new NullAction();
const newState = requestReducer(testState, action); // const newState = requestReducer(testState, action);
//
expect(newState).toEqual(testState); // expect(newState).toEqual(testState);
}); // });
//
it('should start with an empty state', () => { // it('should start with an empty state', () => {
const action = new NullAction(); // const action = new NullAction();
const initialState = requestReducer(undefined, action); // const initialState = requestReducer(undefined, action);
//
expect(initialState).toEqual(Object.create(null)); // expect(initialState).toEqual(Object.create(null));
}); // });
//
it('should add the new RestRequest and set \'requestPending\' to true, \'responsePending\' to false and \'completed\' to false for the given RestRequest in the state, in response to a CONFIGURE action', () => { // it('should add the new RestRequest and set \'requestPending\' to true, \'responsePending\' to false and \'completed\' to false for the given RestRequest in the state, in response to a CONFIGURE action', () => {
const state = testState; // const state = testState;
const request = new GetRequest(id2, link2); // const request = new GetRequest(id2, link2);
//
const action = new RequestConfigureAction(request); // const action = new RequestConfigureAction(request);
const newState = requestReducer(state, action); // const newState = requestReducer(state, action);
//
expect(newState[id2].request.uuid).toEqual(id2); // expect(newState[id2].request.uuid).toEqual(id2);
expect(newState[id2].request.href).toEqual(link2); // expect(newState[id2].request.href).toEqual(link2);
expect(newState[id2].requestPending).toEqual(true); // expect(newState[id2].requestPending).toEqual(true);
expect(newState[id2].responsePending).toEqual(false); // expect(newState[id2].responsePending).toEqual(false);
expect(newState[id2].completed).toEqual(false); // expect(newState[id2].completed).toEqual(false);
expect(newState[id2].response).toEqual(undefined); // expect(newState[id2].response).toEqual(undefined);
}); // });
//
it('should set \'requestPending\' to false, \'responsePending\' to true and leave \'completed\' untouched for the given RestRequest in the state, in response to an EXECUTE action', () => { // it('should set \'requestPending\' to false, \'responsePending\' to true and leave \'completed\' untouched for the given RestRequest in the state, in response to an EXECUTE action', () => {
const state = testState; // const state = testState;
//
const action = new RequestExecuteAction(id1); // const action = new RequestExecuteAction(id1);
const newState = requestReducer(state, action); // const newState = requestReducer(state, action);
//
expect(newState[id1].request.uuid).toEqual(id1); // expect(newState[id1].request.uuid).toEqual(id1);
expect(newState[id1].request.href).toEqual(link1); // expect(newState[id1].request.href).toEqual(link1);
expect(newState[id1].requestPending).toEqual(false); // expect(newState[id1].requestPending).toEqual(false);
expect(newState[id1].responsePending).toEqual(true); // expect(newState[id1].responsePending).toEqual(true);
expect(newState[id1].completed).toEqual(state[id1].completed); // expect(newState[id1].completed).toEqual(state[id1].completed);
expect(newState[id1].response).toEqual(undefined) // expect(newState[id1].response).toEqual(undefined)
}); // });
//
it('should leave \'requestPending\' untouched, set \'responsePending\' to false and \'completed\' to true for the given RestRequest in the state, in response to a COMPLETE action', () => { // it('should leave \'requestPending\' untouched, set \'responsePending\' to false and \'completed\' to true for the given RestRequest in the state, in response to a COMPLETE action', () => {
const state = testState; // const state = testState;
//
const action = new RequestCompleteAction(id1, response); // const action = new RequestCompleteAction(id1, response);
const newState = requestReducer(state, action); // const newState = requestReducer(state, action);
//
expect(newState[id1].request.uuid).toEqual(id1); // expect(newState[id1].request.uuid).toEqual(id1);
expect(newState[id1].request.href).toEqual(link1); // expect(newState[id1].request.href).toEqual(link1);
expect(newState[id1].requestPending).toEqual(state[id1].requestPending); // expect(newState[id1].requestPending).toEqual(state[id1].requestPending);
expect(newState[id1].responsePending).toEqual(false); // expect(newState[id1].responsePending).toEqual(false);
expect(newState[id1].completed).toEqual(true); // expect(newState[id1].completed).toEqual(true);
expect(newState[id1].response.isSuccessful).toEqual(response.isSuccessful); // expect(newState[id1].response.isSuccessful).toEqual(response.isSuccessful);
expect(newState[id1].response.statusCode).toEqual(response.statusCode); // expect(newState[id1].response.statusCode).toEqual(response.statusCode);
expect(newState[id1].response.timeAdded).toBeTruthy() // expect(newState[id1].response.timeAdded).toBeTruthy()
}); // });
//
it('should leave \'requestPending\' untouched, should leave \'responsePending\' untouched and leave \'completed\' untouched, but update the response\'s timeAdded for the given RestRequest in the state, in response to a COMPLETE action', () => { // it('should leave \'requestPending\' untouched, should leave \'responsePending\' untouched and leave \'completed\' untouched, but update the response\'s timeAdded for the given RestRequest in the state, in response to a COMPLETE action', () => {
const update = Object.assign({}, testState[id1], {response}); // const update = Object.assign({}, testState[id1], {response});
const state = Object.assign({}, testState, {[id1]: update}); // const state = Object.assign({}, testState, {[id1]: update});
const timeStamp = 1000; // const timeStamp = 1000;
const action = new ResetResponseTimestampsAction(timeStamp); // const action = new ResetResponseTimestampsAction(timeStamp);
const newState = requestReducer(state, action); // const newState = requestReducer(state, action);
//
expect(newState[id1].request.uuid).toEqual(state[id1].request.uuid); // expect(newState[id1].request.uuid).toEqual(state[id1].request.uuid);
expect(newState[id1].request.href).toEqual(state[id1].request.href); // expect(newState[id1].request.href).toEqual(state[id1].request.href);
expect(newState[id1].requestPending).toEqual(state[id1].requestPending); // expect(newState[id1].requestPending).toEqual(state[id1].requestPending);
expect(newState[id1].responsePending).toEqual(state[id1].responsePending); // expect(newState[id1].responsePending).toEqual(state[id1].responsePending);
expect(newState[id1].completed).toEqual(state[id1].completed); // expect(newState[id1].completed).toEqual(state[id1].completed);
expect(newState[id1].response.isSuccessful).toEqual(response.isSuccessful); // expect(newState[id1].response.isSuccessful).toEqual(response.isSuccessful);
expect(newState[id1].response.statusCode).toEqual(response.statusCode); // expect(newState[id1].response.statusCode).toEqual(response.statusCode);
expect(newState[id1].response.timeAdded).toBe(timeStamp); // expect(newState[id1].response.timeAdded).toBe(timeStamp);
}); // });
//
it('should remove the correct request, in response to a REMOVE action', () => { // it('should remove the correct request, in response to a REMOVE action', () => {
const state = testState; // const state = testState;
//
const action = new RequestRemoveAction(id1); // const action = new RequestRemoveAction(id1);
const newState = requestReducer(state, action); // const newState = requestReducer(state, action);
//
expect(newState[id1]).toBeUndefined(); // expect(newState[id1]).toBeUndefined();
}); // });
}); // });