From d78e7ea8e1a7d74f7a5bd00a5199f348b67d8253 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 15 May 2024 16:35:11 +0200
Subject: [PATCH] OZG-5012 adjust imports; move dummy service
---
.../lib/resource/api-resource.service.spec.ts | 2 +-
.../resource/resource.service.itcase.spec.ts | 4 +--
.../src/lib/resource/resource.service.spec.ts | 19 +-------------
alfa-client/libs/tech-shared/test/resource.ts | 26 ++++++++++++++++---
4 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/api-resource.service.spec.ts b/alfa-client/libs/tech-shared/src/lib/resource/api-resource.service.spec.ts
index 4776a77377..1a742a30f0 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/api-resource.service.spec.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/api-resource.service.spec.ts
@@ -1,9 +1,9 @@
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { fakeAsync, tick } from '@angular/core/testing';
import { Resource } from '@ngxp/rest';
-import { createProblemDetail } from 'libs/tech-shared/test/error';
import { Observable, of, throwError } from 'rxjs';
import { singleCold, singleHot } from '../../../test//marbles';
+import { createProblemDetail } from '../../../test/error';
import { createDummyResource } from '../../../test/resource';
import { HttpError, ProblemDetail } from '../tech.model';
import { ApiResourceService } from './api-resource.service';
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 7718eb280e..fd41087e4f 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,10 +3,9 @@ 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 { createDummyResource } from '../../../test/resource';
+import { DummyResourceService, 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('ResourceService ITCase', () => {
@@ -99,7 +98,6 @@ describe('ResourceService ITCase', () => {
const EXPECTED_EMITTED_TIMES: number = EXPECTED_EMITTED_TIMES_FOR_GET + 2;
- // const newConfigResource: Resource = createDummyResource([getLinkRel, editLinkRel]);
const newConfigResource: Resource = createDummyResource([deleteLinkRel, getLinkRel]);
const newConfigStateResource: StateResource<Resource> = createStateResource(newConfigResource);
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 bbba48c914..96b0ead259 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,11 +7,10 @@ import { cold } from 'jest-marbles';
import { Observable, lastValueFrom, of, throwError } from 'rxjs';
import { createProblemDetail } from '../../../test//error';
import { singleCold, singleHot } from '../../../test/marbles';
-import { createDummyResource } from '../../../test/resource';
+import { DummyResourceService, createDummyResource } from '../../../test/resource';
import { HttpError, ProblemDetail } from '../tech.model';
import { LinkRelationName, ResourceServiceConfig } from './resource.model';
import { ResourceRepository } from './resource.repository';
-import { ResourceService } from './resource.service';
import {
StateResource,
createEmptyStateResource,
@@ -508,19 +507,3 @@ describe('ResourceService', () => {
});
});
});
-
-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 f750e2879e..dc23c32fe2 100644
--- a/alfa-client/libs/tech-shared/test/resource.ts
+++ b/alfa-client/libs/tech-shared/test/resource.ts
@@ -21,14 +21,18 @@
* 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 { createDummy, DummyListLinkRel } from './dummy';
-import { mock, Mock } from '../../test-utils/src/lib/mocking';
-import { Type } from '@angular/core';
+import { DummyListLinkRel, createDummy } from './dummy';
// @ts-ignore
export function toResource<R = T & Resource, T = any>(
@@ -88,3 +92,19 @@ export function createFilledDummyListResource(
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);
+ }
+}
--
GitLab