[DURACOM-327] Reorganize pagination model and testing mocks

Author: atarix83

src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts

@@ -14,13 +14,13 @@ import {
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
-import { getMockThemeService } from '../../../shared/mocks/theme-service.mock';
 import { ListableObjectComponentLoaderComponent } from '../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
 import { SelectableListItemControlComponent } from '../../../shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
 import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
 import { SelectableObject } from '../../../shared/object-list/selectable-list/selectable-list.service.spec';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import { ThemedSearchComponent } from '../../../shared/search/themed-search.component';
+import { getMockThemeService } from '../../../shared/theme-support/test/theme-service.mock';
 import { ThemeService } from '../../../shared/theme-support/theme.service';
 import { BulkAccessBrowseComponent } from './bulk-access-browse.component';
 

src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts

@@ -10,6 +10,7 @@ import {
   PaginatedList,
 } from '@core/data/paginated-list.model';
 import { RemoteData } from '@core/data/remote-data';
+import { PaginationComponentOptions } from '@core/pagination/pagination-component-options.model';
 import { PageInfo } from '@core/shared/page-info.model';
 import { SearchConfigurationService } from '@core/shared/search/search-configuration.service';
 import { createSuccessfulRemoteDataObject } from '@core/utilities/remote-data.utils';
@@ -36,7 +37,6 @@ import { SelectableListItemControlComponent } from '../../../shared/object-colle
 import { SelectableListState } from '../../../shared/object-list/selectable-list/selectable-list.reducer';
 import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { ThemedSearchComponent } from '../../../shared/search/themed-search.component';
 import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
 

src/app/access-control/bulk-access/bulk-access.component.spec.ts

@@ -9,15 +9,15 @@ import {
 import { RouterTestingModule } from '@angular/router/testing';
 import { NotificationsService } from '@core/notification-system/notifications.service';
 import { Process } from '@core/processes/process.model';
+import { NotificationsServiceStub } from '@core/testing/notifications-service.stub';
 import { createSuccessfulRemoteDataObject$ } from '@core/utilities/remote-data.utils';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
 import { BulkAccessControlService } from '../../shared/access-control-form-container/bulk-access-control.service';
-import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
 import { SelectableListState } from '../../shared/object-list/selectable-list/selectable-list.reducer';
 import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { getMockThemeService } from '../../shared/theme-support/test/theme-service.mock';
 import { ThemeService } from '../../shared/theme-support/theme.service';
 import { BulkAccessComponent } from './bulk-access.component';
 import { BulkAccessSettingsComponent } from './settings/bulk-access-settings.component';

src/app/access-control/epeople-registry/epeople-registry.component.spec.ts

@@ -33,6 +33,13 @@ import { EPerson } from '@core/eperson/models/eperson.model';
 import { NotificationsService } from '@core/notification-system/notifications.service';
 import { PaginationService } from '@core/pagination/pagination.service';
 import { PageInfo } from '@core/shared/page-info.model';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '@core/testing/eperson.mock';
+import { NotificationsServiceStub } from '@core/testing/notifications-service.stub';
+import { PaginationServiceStub } from '@core/testing/pagination-service.stub';
+import { RouterMock } from '@core/testing/router.mock';
 import { createSuccessfulRemoteDataObject$ } from '@core/utilities/remote-data.utils';
 import {
   NgbModal,
@@ -46,16 +53,9 @@ import {
 
 import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
+import { getMockFormBuilderService } from '../../shared/form/testing/form-builder-service.mock';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
-import { getMockFormBuilderService } from '../../shared/mocks/form-builder-service.mock';
-import { RouterMock } from '../../shared/mocks/router.mock';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
-import {
-  EPersonMock,
-  EPersonMock2,
-} from '../../shared/testing/eperson.mock';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { EPeopleRegistryComponent } from './epeople-registry.component';
 import { EpeopleRegistryService } from './epeople-registry.service';
 import { EPersonFormComponent } from './eperson-form/eperson-form.component';

src/app/access-control/epeople-registry/epeople-registry.component.ts

@@ -29,6 +29,7 @@ import { EPerson } from '@core/eperson/models/eperson.model';
 import { EpersonDtoModel } from '@core/eperson/models/eperson-dto.model';
 import { NotificationsService } from '@core/notification-system/notifications.service';
 import { PaginationService } from '@core/pagination/pagination.service';
+import { PaginationComponentOptions } from '@core/pagination/pagination-component-options.model';
 import { NoContent } from '@core/shared/NoContent.model';
 import {
   getAllSucceededRemoteData,
@@ -56,7 +57,6 @@ import {
 import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import {
   getEPersonEditRoute,
   getEPersonsRoute,

src/app/access-control/epeople-registry/epeople-registry.reducers.spec.ts

@@ -1,4 +1,5 @@
-import { EPersonMock } from '../../shared/testing/eperson.mock';
+import { EPersonMock } from '@core/testing/eperson.mock';
+
 import {
   EPeopleRegistryCancelEPersonAction,
   EPeopleRegistryEditEPersonAction,

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts

@@ -38,6 +38,16 @@ import { NotificationsService } from '@core/notification-system/notifications.se
 import { PaginationService } from '@core/pagination/pagination.service';
 import { FollowLinkConfig } from '@core/shared/follow-link-config.model';
 import { PageInfo } from '@core/shared/page-info.model';
+import { ActivatedRouteStub } from '@core/testing/active-router.stub';
+import { AuthServiceStub } from '@core/testing/auth-service.stub';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '@core/testing/eperson.mock';
+import { NotificationsServiceStub } from '@core/testing/notifications-service.stub';
+import { PaginationServiceStub } from '@core/testing/pagination-service.stub';
+import { RouterStub } from '@core/testing/router.stub';
+import { createPaginatedList } from '@core/testing/utils.test';
 import { createSuccessfulRemoteDataObject$ } from '@core/utilities/remote-data.utils';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
@@ -49,19 +59,9 @@ import {
 import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
+import { getMockFormBuilderService } from '../../../shared/form/testing/form-builder-service.mock';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
-import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
-import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
-import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
-import {
-  EPersonMock,
-  EPersonMock2,
-} from '../../../shared/testing/eperson.mock';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe';
 import { GroupRegistryService } from '../../group-registry/group-registry.service';
 import { EPeopleRegistryComponent } from '../epeople-registry.component';

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts

@@ -27,6 +27,7 @@ import { EPerson } from '@core/eperson/models/eperson.model';
 import { Group } from '@core/eperson/models/group.model';
 import { NotificationsService } from '@core/notification-system/notifications.service';
 import { PaginationService } from '@core/pagination/pagination.service';
+import { PaginationComponentOptions } from '@core/pagination/pagination-component-options.model';
 import { followLink } from '@core/shared/follow-link-config.model';
 import { NoContent } from '@core/shared/NoContent.model';
 import {
@@ -69,7 +70,6 @@ import { FormBuilderService } from '../../../shared/form/builder/form-builder.se
 import { FormComponent } from '../../../shared/form/form.component';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe';
 import { getEPersonsRoute } from '../../access-control-routing-paths';
 import { GroupRegistryService } from '../../group-registry/group-registry.service';

src/app/access-control/group-registry/group-form/group-form.component.spec.ts

@@ -42,6 +42,14 @@ import { HALEndpointService } from '@core/shared/hal-endpoint.service';
 import { NoContent } from '@core/shared/NoContent.model';
 import { PageInfo } from '@core/shared/page-info.model';
 import { UUIDService } from '@core/shared/uuid.service';
+import { ActivatedRouteStub } from '@core/testing/active-router.stub';
+import { DSONameServiceMock } from '@core/testing/dso-name.service.mock';
+import {
+  GroupMock,
+  GroupMock2,
+} from '@core/testing/group-mock';
+import { NotificationsServiceStub } from '@core/testing/notifications-service.stub';
+import { RouterMock } from '@core/testing/router.mock';
 import { createSuccessfulRemoteDataObject$ } from '@core/utilities/remote-data.utils';
 import { XSRFService } from '@core/xsrf/xsrf.service';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
@@ -57,15 +65,7 @@ import { AlertComponent } from '../../../shared/alert/alert.component';
 import { ContextHelpDirective } from '../../../shared/context-help.directive';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
-import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
-import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
-import { RouterMock } from '../../../shared/mocks/router.mock';
-import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
-import {
-  GroupMock,
-  GroupMock2,
-} from '../../../shared/testing/group-mock';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { getMockFormBuilderService } from '../../../shared/form/testing/form-builder-service.mock';
 import { GroupRegistryService } from '../group-registry.service';
 import { GroupFormComponent } from './group-form.component';
 import { MembersListComponent } from './members-list/members-list.component';

src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts

@@ -38,6 +38,18 @@ import { Group } from '@core/eperson/models/group.model';
 import { NotificationsService } from '@core/notification-system/notifications.service';
 import { PaginationService } from '@core/pagination/pagination.service';
 import { PageInfo } from '@core/shared/page-info.model';
+import { ActivatedRouteStub } from '@core/testing/active-router.stub';
+import { DSONameServiceMock } from '@core/testing/dso-name.service.mock';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '@core/testing/eperson.mock';
+import { GroupMock } from '@core/testing/group-mock';
+import { NotificationsServiceStub } from '@core/testing/notifications-service.stub';
+import { PaginationServiceStub } from '@core/testing/pagination-service.stub';
+import { RouterMock } from '@core/testing/router.mock';
+import { getMockTranslateService } from '@core/testing/translate.service.mock';
+import { TranslateLoaderMock } from '@core/testing/translate-loader.mock';
 import { createSuccessfulRemoteDataObject$ } from '@core/utilities/remote-data.utils';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import {
@@ -52,20 +64,8 @@ import {
 
 import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
-import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
-import { RouterMock } from '../../../../shared/mocks/router.mock';
-import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
+import { getMockFormBuilderService } from '../../../../shared/form/testing/form-builder-service.mock';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
-import { ActivatedRouteStub } from '../../../../shared/testing/active-router.stub';
-import {
-  EPersonMock,
-  EPersonMock2,
-} from '../../../../shared/testing/eperson.mock';
-import { GroupMock } from '../../../../shared/testing/group-mock';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
-import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
-import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
 import { GroupRegistryService } from '../../group-registry.service';
 import { MembersListComponent } from './members-list.component';