diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource.repository.spec.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource.repository.spec.ts index 58e5b99e8488d2accca1534423d1ad912fa11af8..d9b2b8cd5662996a5c8eb0129e54779ee289a105 100644 --- a/alfa-client/libs/tech-shared/src/lib/resource/resource.repository.spec.ts +++ b/alfa-client/libs/tech-shared/src/lib/resource/resource.repository.spec.ts @@ -1,13 +1,13 @@ -import { ResourceRepository } from './resource.repository'; -import { Resource, ResourceFactory, ResourceUri, getUrl } from '@ngxp/rest'; import { mock, useFromMock } from '@alfa-client/test-utils'; -import { createDummyListResource, createDummyResource } from 'libs/tech-shared/test/resource'; -import { ListResource } from './resource.util'; +import { faker } from '@faker-js/faker'; +import { Resource, ResourceFactory, ResourceUri, getUrl } from '@ngxp/rest'; import { DummyLinkRel, DummyListLinkRel } from 'libs/tech-shared/test/dummy'; +import { createDummyListResource, createDummyResource } from 'libs/tech-shared/test/resource'; import { Observable } from 'rxjs'; -import { faker } from '@faker-js/faker'; +import { singleCold, singleHot } from '../../../test/marbles'; import { CreateResourceData, LinkRelationName, SaveResourceData } from './resource.model'; -import { singleHot, singleCold } from '../../../test/marbles'; +import { ResourceRepository } from './resource.repository'; +import { ListResource } from './resource.util'; describe('ResourceRepository', () => { let repository: ResourceRepository; diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource.service.itcase.spec.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource.service.itcase.spec.ts index e28dc79a316f02fc773a6d40d79963464e88562e..cff64cc4e17979a6d14e59a8f017e1b7cd2c9076 100644 --- a/alfa-client/libs/tech-shared/src/lib/resource/resource.service.itcase.spec.ts +++ b/alfa-client/libs/tech-shared/src/lib/resource/resource.service.itcase.spec.ts @@ -3,9 +3,10 @@ import { fakeAsync, tick } from '@angular/core/testing'; import faker from '@faker-js/faker'; import { Resource, getUrl } from '@ngxp/rest'; import { BehaviorSubject, of } from 'rxjs'; -import { DummyResourceService, createDummyResource } from '../../../test/resource'; +import { createDummyResource } from '../../../test/resource'; import { LinkRelationName, ResourceServiceConfig } from './resource.model'; import { ResourceRepository } from './resource.repository'; +import { DummyResourceService } from './resource.service.spec'; import { StateResource, createEmptyStateResource, createStateResource } from './resource.util'; describe.skip('FIXME: mocking.ts issue due to module test | ResourceService ITCase', () => { diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource.service.spec.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource.service.spec.ts index 96b0ead259d334cdb071eb5f1873af084aaf7321..c9cf9b18661a56f0551f9e3f8992c303fcffa60b 100644 --- a/alfa-client/libs/tech-shared/src/lib/resource/resource.service.spec.ts +++ b/alfa-client/libs/tech-shared/src/lib/resource/resource.service.spec.ts @@ -7,7 +7,7 @@ import { cold } from 'jest-marbles'; import { Observable, lastValueFrom, of, throwError } from 'rxjs'; import { createProblemDetail } from '../../../test//error'; import { singleCold, singleHot } from '../../../test/marbles'; -import { DummyResourceService, createDummyResource } from '../../../test/resource'; +import { createDummyResource } from '../../../test/resource'; import { HttpError, ProblemDetail } from '../tech.model'; import { LinkRelationName, ResourceServiceConfig } from './resource.model'; import { ResourceRepository } from './resource.repository'; @@ -18,6 +18,8 @@ import { createStateResource, } from './resource.util'; +import { Type } from '@angular/core'; +import { ResourceService } from './resource.service'; import * as ResourceUtil from './resource.util'; describe('ResourceService', () => { @@ -507,3 +509,23 @@ describe('ResourceService', () => { }); }); }); + +export function mockResourceService<T>(service: Type<T>): Mock<T> { + return <Mock<T>>{ ...mock(service), get: jest.fn(), save: jest.fn() }; +} + +export class DummyResourceService<B extends Resource, T extends Resource> extends ResourceService< + B, + T +> { + constructor( + protected config: ResourceServiceConfig<B>, + protected repository: ResourceRepository, + ) { + super(config, repository); + } + + doSave(resource: T, toSave: unknown): Observable<T> { + return of(resource); + } +} diff --git a/alfa-client/libs/tech-shared/test/resource.ts b/alfa-client/libs/tech-shared/test/resource.ts index dc23c32fe2bcfd337c580047f211dea905e484c8..cf93fb97578b9e4f707014f4441d746b86a740be 100644 --- a/alfa-client/libs/tech-shared/test/resource.ts +++ b/alfa-client/libs/tech-shared/test/resource.ts @@ -21,15 +21,9 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -import { Type } from '@angular/core'; import { faker } from '@faker-js/faker'; import { Resource } from '@ngxp/rest'; import { times, zipObject } from 'lodash-es'; -import { Observable, of } from 'rxjs'; -import { Mock, mock } from '../../test-utils/src/lib/mocking'; -import { ResourceServiceConfig } from '../src/lib/resource/resource.model'; -import { ResourceRepository } from '../src/lib/resource/resource.repository'; -import { ResourceService } from '../src/lib/resource/resource.service'; import { ListResource } from '../src/lib/resource/resource.util'; import { isNotUndefined } from '../src/lib/tech.util'; import { DummyListLinkRel, createDummy } from './dummy'; @@ -88,23 +82,3 @@ export function createFilledDummyListResource( [DummyListLinkRel.LIST]: resources, }); } - -export function mockResourceService<T>(service: Type<T>): Mock<T> { - return <Mock<T>>{ ...mock(service), get: jest.fn(), save: jest.fn() }; -} - -export class DummyResourceService<B extends Resource, T extends Resource> extends ResourceService< - B, - T -> { - constructor( - protected config: ResourceServiceConfig<B>, - protected repository: ResourceRepository, - ) { - super(config, repository); - } - - doSave(resource: T, toSave: unknown): Observable<T> { - return of(resource); - } -}