From 7a79835a8d43a36902d8b285e9d1c3c4c7c8a69a Mon Sep 17 00:00:00 2001 From: Rajnikant Lodhi Date: Thu, 21 Jul 2022 13:57:09 +0530 Subject: [PATCH] I renamed servers service file into controller.service --- .../{server.po.ts => controller.po.ts} | 8 ++--- e2e/project-map.e2e-spec.ts | 10 +++--- e2e/projects.e2e-spec.ts | 10 +++--- e2e/servers.e2e-spec.ts | 14 ++++---- src/app/app-routing.module.ts | 4 +-- src/app/app.module.ts | 10 +++--- .../bundled-controller-finder.component.html} | 0 .../bundled-controller-finder.component.scss} | 0 ...ndled-controller-finder.component.spec.ts} | 16 ++++----- .../bundled-controller-finder.component.ts} | 8 ++--- .../controller-discovery.component.spec.ts | 6 ++-- .../controllers/controllers.component.spec.ts | 6 ++-- .../add-image-dialog.component.spec.ts | 4 +-- .../deleteallfiles-dialog.component.spec.ts | 4 +-- .../image-manager.component.spec.ts | 4 +-- ...cloud-nodes-add-template.component.spec.ts | 4 +-- ...d-nodes-template-details.component.spec.ts | 4 +-- .../cloud-nodes-templates.component.spec.ts | 4 +-- ...hernet-hubs-add-template.component.spec.ts | 4 +-- ...et-hubs-template-details.component.spec.ts | 4 +-- .../ethernet-hubs-templates.component.spec.ts | 4 +-- ...et-switches-add-template.component.spec.ts | 4 +-- ...witches-template-details.component.spec.ts | 4 +-- ...ernet-switches-templates.component.spec.ts | 4 +-- .../add-docker-template.component.spec.ts | 4 +-- .../docker-template-details.component.spec.ts | 4 +-- .../docker-templates.component.spec.ts | 4 +-- .../add-ios-template.component.spec.ts | 4 +-- .../dynamips-preferences.component.spec.ts | 4 +-- .../ios-template-details.component.spec.ts | 4 +-- .../ios-templates.component.spec.ts | 4 +-- .../add-iou-template.component.spec.ts | 4 +-- .../iou-template-details.component.spec.ts | 4 +-- .../iou-templates.component.spec.ts | 4 +-- .../add-qemu-vm-template.component.spec.ts | 4 +-- .../qemu-preferences.component.spec.ts | 4 +-- ...qemu-vm-template-details.component.spec.ts | 4 +-- .../qemu-vm-templates.component.spec.ts | 4 +-- ...add-virtual-box-template.component.spec.ts | 4 +-- .../virtual-box-prefernces.component.spec.ts | 4 +-- ...ual-box-template-details.component.spec.ts | 4 +-- .../virtual-box-templates.component.spec.ts | 4 +-- .../add-vmware.component.template.spec.ts | 4 +-- .../vmware-preferences.component.spec.ts | 4 +-- .../vmware-template-details.component.spec.ts | 4 +-- .../vmware-templates.component.spec.ts | 4 +-- .../add-vpcs-template.component.spec.ts | 4 +-- .../vpcs-preferences.component.spec.ts | 4 +-- .../vpcs-template-details.component.spec.ts | 4 +-- .../vpcs-templates.component.spec.ts | 4 +-- .../console-device-action.component.spec.ts | 6 ++-- .../start-node-action.component.spec.ts | 4 +-- .../stop-node-action.component.spec.ts | 2 +- .../log-console/log-console.component.spec.ts | 6 ++-- .../log-console/log-console.component.ts | 4 +-- .../project-map/project-map.component.spec.ts | 4 +-- .../projects/projects.component.spec.ts | 4 +-- .../snapshot-menu-item.component.spec.ts | 6 ++-- .../template-list-dialog.component.spec.ts | 6 ++-- .../template/template.component.spec.ts | 6 ++-- src/app/filters/authImageFilter.ts | 4 +-- .../default-layout.component.spec.ts | 20 +++++------ src/app/services/appliances.service.ts | 4 +-- .../built-in-templates.service.spec.ts | 8 ++--- .../services/built-in-templates.service.ts | 4 +-- src/app/services/compute.service.ts | 4 +-- .../controller-settings.service.spec.ts | 8 ++--- .../services/controller-settings.service.ts | 4 +-- src/app/services/controller.service.spec.ts | 2 +- src/app/services/controller.service.ts | 4 +-- src/app/services/docker.service.ts | 4 +-- src/app/services/drawing.service.spec.ts | 8 ++--- src/app/services/drawing.service.ts | 4 +-- ...pec.ts => http-controller.service.spec.ts} | 28 +++++++-------- ....service.ts => http-controller.service.ts} | 36 +++++++++---------- .../services/image-manager.service.spec.ts | 8 ++--- src/app/services/image-manager.service.ts | 4 +-- src/app/services/ios.service.ts | 4 +-- src/app/services/iou.service.ts | 4 +-- src/app/services/link.service.spec.ts | 8 ++--- src/app/services/link.service.ts | 4 +-- src/app/services/login.service.ts | 4 +-- src/app/services/node.service.spec.ts | 8 ++--- src/app/services/node.service.ts | 4 +-- src/app/services/project.service.spec.ts | 8 ++--- src/app/services/project.service.ts | 4 +-- src/app/services/qemu.service.spec.ts | 8 ++--- src/app/services/qemu.service.ts | 4 +-- src/app/services/snapshot.service.spec.ts | 8 ++--- src/app/services/snapshot.service.ts | 4 +-- src/app/services/symbol.service.spec.ts | 8 ++--- src/app/services/symbol.service.ts | 4 +-- src/app/services/template.service.spec.ts | 4 +-- src/app/services/template.service.ts | 4 +-- src/app/services/user.service.ts | 4 +-- src/app/services/version.service.spec.ts | 8 ++--- src/app/services/version.service.ts | 4 +-- src/app/services/virtual-box.service.spec.ts | 8 ++--- src/app/services/virtual-box.service.ts | 4 +-- src/app/services/vmware.service.spec.ts | 8 ++--- src/app/services/vmware.service.ts | 4 +-- src/app/services/vpcs.service.spec.ts | 8 ++--- src/app/services/vpcs.service.ts | 4 +-- .../testing/app-testing/app-testing.module.ts | 4 +-- 104 files changed, 297 insertions(+), 297 deletions(-) rename e2e/helpers/{server.po.ts => controller.po.ts} (88%) rename src/app/components/{bundled-server-finder/bundled-server-finder.component.html => bundled-controller-finder/bundled-controller-finder.component.html} (100%) rename src/app/components/{bundled-server-finder/bundled-server-finder.component.scss => bundled-controller-finder/bundled-controller-finder.component.scss} (100%) rename src/app/components/{bundled-server-finder/bundled-server-finder.component.spec.ts => bundled-controller-finder/bundled-controller-finder.component.spec.ts} (79%) rename src/app/components/{bundled-server-finder/bundled-server-finder.component.ts => bundled-controller-finder/bundled-controller-finder.component.ts} (83%) rename src/app/services/{http-server.service.spec.ts => http-controller.service.spec.ts} (89%) rename src/app/services/{http-server.service.ts => http-controller.service.ts} (83%) diff --git a/e2e/helpers/server.po.ts b/e2e/helpers/controller.po.ts similarity index 88% rename from e2e/helpers/server.po.ts rename to e2e/helpers/controller.po.ts index 808aa630..fa620b69 100644 --- a/e2e/helpers/server.po.ts +++ b/e2e/helpers/controller.po.ts @@ -1,22 +1,22 @@ import { browser, by } from 'protractor'; import { TestHelper } from './common.po'; -export class ServersPage { +export class ControllersPage { helper = new TestHelper(); maximizeWindow() { browser.driver.manage().window().maximize(); } - navigateToServersPage() { + navigateToControllersPage() { return browser.get('/controllers'); } - getAddServerNotificationText() { + getAddControllerNotificationText() { return browser.driver.findElement(by.className('mat-card-content')).getText(); } - async clickAddServer() { + async clickAddController() { let controllerTable = await this.checkControllersTable(); if (controllerTable.length === 0) { let buttons = await browser.driver.findElements(by.className('mat-button mat-button-base')); diff --git a/e2e/project-map.e2e-spec.ts b/e2e/project-map.e2e-spec.ts index 249325aa..80106796 100644 --- a/e2e/project-map.e2e-spec.ts +++ b/e2e/project-map.e2e-spec.ts @@ -1,23 +1,23 @@ import { TestHelper } from './helpers/common.po'; import { ProjectMapPage } from './helpers/project-map.po'; import { ProjectsPage } from './helpers/project.po'; -import { ServersPage } from './helpers/server.po'; +import { ControllersPage } from './helpers/controller.po'; describe('Project map page', () => { - let controllersPage: ServersPage; + let controllersPage: ControllersPage; let projectsPage: ProjectsPage; let projectMapPage: ProjectMapPage; let helper: TestHelper; beforeEach(async () => { - controllersPage = new ServersPage(); + controllersPage = new ControllersPage(); projectsPage = new ProjectsPage(); projectMapPage = new ProjectMapPage(); helper = new TestHelper(); controllersPage.maximizeWindow(); - await controllersPage.navigateToServersPage(); - await controllersPage.clickAddServer(); + await controllersPage.navigateToControllersPage(); + await controllersPage.clickAddController(); await controllersPage.navigateToServerProjects(); await projectsPage.openAddProjectDialog(); helper.sleep(2000); diff --git a/e2e/projects.e2e-spec.ts b/e2e/projects.e2e-spec.ts index d05394f9..f7d87baf 100644 --- a/e2e/projects.e2e-spec.ts +++ b/e2e/projects.e2e-spec.ts @@ -1,14 +1,14 @@ import { TestHelper } from './helpers/common.po'; import { ProjectsPage } from './helpers/project.po'; -import { ServersPage } from './helpers/server.po'; +import { ControllersPage } from './helpers/server.po'; describe('Projects page', () => { - let controllersPage: ServersPage; + let controllersPage: ControllersPage; let projectsPage: ProjectsPage; let helper: TestHelper; beforeEach(() => { - controllersPage = new ServersPage(); + controllersPage = new ControllersPage(); projectsPage = new ProjectsPage(); helper = new TestHelper(); }); @@ -16,8 +16,8 @@ describe('Projects page', () => { it('user should have possibility to create new project', async () => { // arrange controllersPage.maximizeWindow(); - await controllersPage.navigateToServersPage(); - await controllersPage.clickAddServer(); + await controllersPage.navigateToControllersPage(); + await controllersPage.clickAddController(); await controllersPage.navigateToServerProjects(); helper.sleep(2000); diff --git a/e2e/servers.e2e-spec.ts b/e2e/servers.e2e-spec.ts index 95b3b780..de798a72 100644 --- a/e2e/servers.e2e-spec.ts +++ b/e2e/servers.e2e-spec.ts @@ -1,22 +1,22 @@ import { TestHelper } from './helpers/common.po'; -import { ServersPage } from './helpers/server.po'; +import { ControllersPage } from './helpers/server.po'; describe('Servers page', () => { - let page: ServersPage; + let page: ControllersPage; let helper: TestHelper; beforeEach(() => { - page = new ServersPage(); + page = new ControllersPage(); helper = new TestHelper(); }); xit('user should have possibility to add controller', async () => { // arrange page.maximizeWindow(); - await page.navigateToServersPage(); + await page.navigateToControllersPage(); // act - let text = await page.getAddServerNotificationText(); + let text = await page.getAddControllerNotificationText(); // assert expect(text).toBe("We've discovered GNS3 controller on 127.0.0.1:3080, would you like to add to the list?"); @@ -25,8 +25,8 @@ describe('Servers page', () => { it('user should see added controller in the list', async () => { // arrange page.maximizeWindow(); - await page.navigateToServersPage(); - await page.clickAddServer(); + await page.navigateToControllersPage(); + await page.clickAddController(); helper.sleep(1000); // act diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 01f4be77..9dae716c 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { BundledServerFinderComponent } from './components/bundled-server-finder/bundled-server-finder.component'; +import { BundledControllerFinderComponent } from './components/bundled-controller-finder/bundled-controller-finder.component'; import { DirectLinkComponent } from './components/direct-link/direct-link.component'; import { HelpComponent } from './components/help/help.component'; import { InstalledSoftwareComponent } from './components/installed-software/installed-software.component'; @@ -65,7 +65,7 @@ const routes: Routes = [ children: [ { path: '', redirectTo: 'controllers', pathMatch: 'full' }, { path: 'controllers', component: ControllersComponent }, - { path: 'bundled', component: BundledServerFinderComponent }, + { path: 'bundled', component: BundledControllerFinderComponent }, { path: 'controller/:controller_id/login', component: LoginComponent }, { path: 'controller/:controller_id/loggeduser', component: LoggedUserComponent }, {path : 'controller/:controller_id/image-manager', component: ImageManagerComponent}, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 90074ec3..1b45568c 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -29,7 +29,7 @@ import { ProgressDialogService } from './common/progress-dialog/progress-dialog. import { ProgressComponent } from './common/progress/progress.component'; import { ProgressService } from './common/progress/progress.service'; import { AdbutlerComponent } from './components/adbutler/adbutler.component'; -import { BundledServerFinderComponent } from './components/bundled-server-finder/bundled-server-finder.component'; +import { BundledControllerFinderComponent } from './components/bundled-controller-finder/bundled-controller-finder.component'; import { InformationDialogComponent } from './components/dialogs/information-dialog.component'; import { DirectLinkComponent } from './components/direct-link/direct-link.component'; import { DrawingAddedComponent } from './components/drawings-listeners/drawing-added/drawing-added.component'; @@ -224,7 +224,7 @@ import { DockerService } from './services/docker.service'; import { DrawingService } from './services/drawing.service'; import { ExternalSoftwareDefinitionService } from './services/external-software-definition.service'; import { GoogleAnalyticsService } from './services/google-analytics.service'; -import { HttpServer, ServerErrorHandler } from './services/http-server.service'; +import { HttpController, ControllerErrorHandler } from './services/http-controller.service'; import { InfoService } from './services/info.service'; import { InstalledSoftwareService } from './services/installed-software.service'; import { IosConfigurationService } from './services/ios-configuration.service'; @@ -319,7 +319,7 @@ import { NodesMenuConfirmationDialogComponent } from './components/project-map/n SuspendLinkActionComponent, SettingsComponent, PreferencesComponent, - BundledServerFinderComponent, + BundledControllerFinderComponent, ProgressComponent, ControllerDiscoveryComponent, NodeSelectInterfaceComponent, @@ -510,7 +510,7 @@ import { NodesMenuConfirmationDialogComponent } from './components/project-map/n NodeService, LinkService, DrawingService, - HttpServer, + HttpController, SnapshotService, ProgressDialogService, ToasterService, @@ -523,7 +523,7 @@ import { NodesMenuConfirmationDialogComponent } from './components/project-map/n SelectionManager, InRectangleHelper, DrawingsDataSource, - ServerErrorHandler, + ControllerErrorHandler, ControllerDatabase, ProjectNameValidator, ToolsService, diff --git a/src/app/components/bundled-server-finder/bundled-server-finder.component.html b/src/app/components/bundled-controller-finder/bundled-controller-finder.component.html similarity index 100% rename from src/app/components/bundled-server-finder/bundled-server-finder.component.html rename to src/app/components/bundled-controller-finder/bundled-controller-finder.component.html diff --git a/src/app/components/bundled-server-finder/bundled-server-finder.component.scss b/src/app/components/bundled-controller-finder/bundled-controller-finder.component.scss similarity index 100% rename from src/app/components/bundled-server-finder/bundled-server-finder.component.scss rename to src/app/components/bundled-controller-finder/bundled-controller-finder.component.scss diff --git a/src/app/components/bundled-server-finder/bundled-server-finder.component.spec.ts b/src/app/components/bundled-controller-finder/bundled-controller-finder.component.spec.ts similarity index 79% rename from src/app/components/bundled-server-finder/bundled-server-finder.component.spec.ts rename to src/app/components/bundled-controller-finder/bundled-controller-finder.component.spec.ts index b761810e..dbfd25cd 100644 --- a/src/app/components/bundled-server-finder/bundled-server-finder.component.spec.ts +++ b/src/app/components/bundled-controller-finder/bundled-controller-finder.component.spec.ts @@ -6,13 +6,13 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ProgressService } from '../../common/progress/progress.service'; import{ Controller } from '../../models/controller'; import { ControllerService } from '../../services/controller.service'; -import { MockedServerService } from '../../services/controller.service.spec'; +import { MockedControllerService } from '../../services/controller.service.spec'; import { MockedProgressService } from '../project-map/project-map.component.spec'; -import { BundledServerFinderComponent } from './bundled-server-finder.component'; +import { BundledControllerFinderComponent } from './bundled-controller-finder.component'; -describe('BundledServerFinderComponent', () => { - let component: BundledServerFinderComponent; - let fixture: ComponentFixture; +describe('BundledControllerFinderComponent', () => { + let component: BundledControllerFinderComponent; + let fixture: ComponentFixture; let router: any; let service: ControllerService; let progressService: MockedProgressService = new MockedProgressService(); @@ -31,7 +31,7 @@ describe('BundledServerFinderComponent', () => { ]); - // serverService = new MockedServerService(); + // serverService = new MockedControllerService(); // spyOn(serverService, 'getLocalServer').and.returnValue(Promise.resolve(server)); await TestBed.configureTestingModule({ @@ -40,11 +40,11 @@ describe('BundledServerFinderComponent', () => { { provide: ControllerService, useValue: controllerServiceMock }, { provide: ProgressService, useValue: progressService }, ], - declarations: [BundledServerFinderComponent], + declarations: [BundledControllerFinderComponent], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); - fixture = TestBed.createComponent(BundledServerFinderComponent); + fixture = TestBed.createComponent(BundledControllerFinderComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/components/bundled-server-finder/bundled-server-finder.component.ts b/src/app/components/bundled-controller-finder/bundled-controller-finder.component.ts similarity index 83% rename from src/app/components/bundled-server-finder/bundled-server-finder.component.ts rename to src/app/components/bundled-controller-finder/bundled-controller-finder.component.ts index df124b30..d762d1bc 100644 --- a/src/app/components/bundled-server-finder/bundled-server-finder.component.ts +++ b/src/app/components/bundled-controller-finder/bundled-controller-finder.component.ts @@ -6,11 +6,11 @@ import{ Controller } from '../../models/controller'; import { ControllerService } from '../../services/controller.service'; @Component({ - selector: 'app-bundled-server-finder', - templateUrl: './bundled-server-finder.component.html', - styleUrls: ['./bundled-server-finder.component.scss'], + selector: 'app-bundled-controller-finder', + templateUrl: './bundled-controller-finder.component.html', + styleUrls: ['./bundled-controller-finder.component.scss'], }) -export class BundledServerFinderComponent implements OnInit { +export class BundledControllerFinderComponent implements OnInit { constructor( private router: Router, private serverService: ControllerService, diff --git a/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts b/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts index c17f479f..9bf9d7ec 100644 --- a/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts +++ b/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts @@ -6,7 +6,7 @@ import{ Controller } from '../../../models/controller'; import { Version } from '../../../models/version'; import { ControllerDatabase } from '../../../services/controller.database'; import { ControllerService } from '../../../services/controller.service'; -import { MockedServerService } from '../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../services/controller.service.spec'; import { VersionService } from '../../../services/version.service'; import { MockedVersionService } from '../../../services/version.service.spec'; import { ControllerDiscoveryComponent } from './controller-discovery.component'; @@ -15,10 +15,10 @@ xdescribe('ControllerDiscoveryComponent', () => { let component: ControllerDiscoveryComponent; let fixture: ComponentFixture; let mockedVersionService: MockedVersionService; - let mockedServerService: MockedServerService; + let mockedServerService: MockedControllerService; beforeEach(async () => { - mockedServerService = new MockedServerService(); + mockedServerService = new MockedControllerService(); mockedVersionService = new MockedVersionService(); await TestBed.configureTestingModule({ imports: [MatCardModule, MatDividerModule], diff --git a/src/app/components/controllers/controllers.component.spec.ts b/src/app/components/controllers/controllers.component.spec.ts index 7df1d2a2..0385691a 100644 --- a/src/app/components/controllers/controllers.component.spec.ts +++ b/src/app/components/controllers/controllers.component.spec.ts @@ -6,9 +6,9 @@ import { MatMenuModule } from '@angular/material/menu'; import { MatToolbarModule } from '@angular/material/toolbar'; import { ControllerDatabase } from '../../services/controller.database'; import { ControllerService } from '../../services/controller.service'; -import { MockedServerService } from 'app/services/controller.service.spec'; +import { MockedControllerService } from 'app/services/controller.service.spec'; import { ControllersComponent } from './controllers.component'; -import { ControllerManagementService } from 'app/services/server-management.service'; +import { ControllerManagementService } from '../../services/controller-management.service'; import { ElectronService } from 'ngx-electron'; import { ChildProcessService } from 'ngx-childprocess'; import { MatBottomSheet, MatBottomSheetModule } from '@angular/material/bottom-sheet'; @@ -21,7 +21,7 @@ import { MockedRouter } from 'app/common/progress/progress.component.spec'; describe('ControllersComponent', () => { let component: ControllersComponent; let fixture: ComponentFixture; - let serverMockedService: MockedServerService + let serverMockedService: MockedControllerService let mockedActivatedRoute: MockedActivatedRoute let mockedRouter : MockedRouter diff --git a/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts b/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts index c8875178..1c72ce43 100644 --- a/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts +++ b/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts @@ -6,7 +6,7 @@ import { MatMenuModule } from '@angular/material/menu'; import { MatToolbarModule } from '@angular/material/toolbar'; import { ImageManagerService } from 'app/services/image-manager.service'; import { ControllerService } from '../../../services/controller.service'; -import { MockedServerService } from '../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../services/controller.service.spec'; import { of } from 'rxjs'; import{ Controller } from '../../../models/controller'; @@ -27,7 +27,7 @@ describe('AddImageDialogComponent', () => { let component: AddImageDialogComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedImageManagerService = new MockedImageManagerService() let mockedToasterService = new MockedToasterService() diff --git a/src/app/components/image-manager/deleteallfiles-dialog/deleteallfiles-dialog.component.spec.ts b/src/app/components/image-manager/deleteallfiles-dialog/deleteallfiles-dialog.component.spec.ts index 1f80e7be..3125956a 100644 --- a/src/app/components/image-manager/deleteallfiles-dialog/deleteallfiles-dialog.component.spec.ts +++ b/src/app/components/image-manager/deleteallfiles-dialog/deleteallfiles-dialog.component.spec.ts @@ -11,7 +11,7 @@ import{ Server } from 'http'; import { of } from 'rxjs'; import { ImageManagerService } from '../../../services/image-manager.service'; import { ControllerService } from '../../../services/controller.service'; -import { MockedServerService } from '../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../services/controller.service.spec'; import { ImageManagerComponent } from '../image-manager.component'; import { DeleteAllImageFilesDialogComponent } from './deleteallfiles-dialog.component'; @@ -25,7 +25,7 @@ export class MockedImageManagerService { describe('DeleteAllImageFilesDialogComponent', () => { let component: DeleteAllImageFilesDialogComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedImageManagerService = new MockedImageManagerService() let mockedToasterService = new MockedToasterService() diff --git a/src/app/components/image-manager/image-manager.component.spec.ts b/src/app/components/image-manager/image-manager.component.spec.ts index 4753bc8d..38a4f0ba 100644 --- a/src/app/components/image-manager/image-manager.component.spec.ts +++ b/src/app/components/image-manager/image-manager.component.spec.ts @@ -7,7 +7,7 @@ import { MatMenuModule } from '@angular/material/menu'; import { MatToolbarModule } from '@angular/material/toolbar'; import { ImageManagerService } from 'app/services/image-manager.service'; import { ControllerService } from 'app/services/controller.service'; -import { MockedServerService } from 'app/services/controller.service.spec'; +import { MockedControllerService } from 'app/services/controller.service.spec'; import { of } from 'rxjs'; import{ Controller } from '../../models/controller'; @@ -37,7 +37,7 @@ describe('ImageManagerComponent', () => { let component: ImageManagerComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedImageManagerService = new MockedImageManagerService() let mockedProgressService = new MockedProgressService() let mockedVersionService = new MockedVersionService() diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts index ec732096..d73dad23 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts @@ -15,7 +15,7 @@ import { CloudTemplate } from '../../../../../models/templates/cloud-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { ComputeService } from '../../../../../services/compute.service'; import { ControllerService } from '../../../../../services/controller.service'; -import { MockedServerService } from '../../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../../services/controller.service.spec'; import { TemplateMocksService } from '../../../../../services/template-mocks.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { MockedToasterService } from '../../../../../services/toaster.service.spec'; @@ -33,7 +33,7 @@ describe('CloudNodesAddTemplateComponent', () => { let component: CloudNodesAddTemplateComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); let mockedToasterService = new MockedToasterService(); let mockedComputeService = new MockedComputeService(); diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts index 5d761cc8..57fb75fa 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts @@ -16,7 +16,7 @@ import { CloudTemplate } from '../../../../../models/templates/cloud-template'; import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { ControllerService } from '../../../../../services/controller.service'; -import { MockedServerService } from '../../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../../services/controller.service.spec'; import { ToasterService } from '../../../../../services/toaster.service'; import { MockedToasterService } from '../../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../../preferences.component.spec'; @@ -36,7 +36,7 @@ describe('CloudNodesTemplateDetailsComponent', () => { let component: CloudNodesTemplateDetailsComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts index f8d84642..10033ca0 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts @@ -13,7 +13,7 @@ import{ Controller } from '../../../../../models/controller'; import { CloudTemplate } from '../../../../../models/templates/cloud-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { ControllerService } from '../../../../../services/controller.service'; -import { MockedServerService } from '../../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { CloudNodesTemplatesComponent } from './cloud-nodes-templates.component'; @@ -27,7 +27,7 @@ describe('CloudNodesTemplatesComponent', () => { let component: CloudNodesTemplatesComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts index 219cd37f..89ee7e43 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts @@ -15,7 +15,7 @@ import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hu import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { ComputeService } from '../../../../../services/compute.service'; import { ControllerService } from '../../../../../services/controller.service'; -import { MockedServerService } from '../../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../../services/controller.service.spec'; import { TemplateMocksService } from '../../../../../services/template-mocks.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { MockedToasterService } from '../../../../../services/toaster.service.spec'; @@ -33,7 +33,7 @@ describe('EthernetHubsAddTemplateComponent', () => { let component: EthernetHubsAddTemplateComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); let mockedToasterService = new MockedToasterService(); let mockedComputeService = new MockedComputeService(); diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts index a652174a..91d7391e 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts @@ -16,7 +16,7 @@ import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hu import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { ControllerService } from '../../../../../services/controller.service'; -import { MockedServerService } from '../../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../../services/controller.service.spec'; import { ToasterService } from '../../../../../services/toaster.service'; import { MockedToasterService } from '../../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../../preferences.component.spec'; @@ -36,7 +36,7 @@ describe('EthernetHubsTemplateDetailsComponent', () => { let component: EthernetHubsTemplateDetailsComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts index 723c2236..9c9164b7 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts @@ -13,7 +13,7 @@ import{ Controller } from '../../../../../models/controller'; import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hub-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { ControllerService } from '../../../../../services/controller.service'; -import { MockedServerService } from '../../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { EthernetHubsTemplatesComponent } from './ethernet-hubs-templates.component'; @@ -27,7 +27,7 @@ describe('EthernetHubsTemplatesComponent', () => { let component: EthernetHubsTemplatesComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts index fbc4101c..5cf87b38 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts @@ -15,7 +15,7 @@ import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { ComputeService } from '../../../../../services/compute.service'; import { ControllerService } from '../../../../../services/controller.service'; -import { MockedServerService } from '../../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../../services/controller.service.spec'; import { TemplateMocksService } from '../../../../../services/template-mocks.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { MockedToasterService } from '../../../../../services/toaster.service.spec'; @@ -33,7 +33,7 @@ describe('EthernetSwitchesAddTemplateComponent', () => { let component: EthernetSwitchesAddTemplateComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); let mockedToasterService = new MockedToasterService(); let mockedComputeService = new MockedComputeService(); diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts index 2aa6a7bc..f7d17885 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts @@ -16,7 +16,7 @@ import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { ControllerService } from '../../../../../services/controller.service'; -import { MockedServerService } from '../../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../../services/controller.service.spec'; import { ToasterService } from '../../../../../services/toaster.service'; import { MockedToasterService } from '../../../../../services/toaster.service.spec'; import { PortsComponent } from '../../../common/ports/ports.component'; @@ -37,7 +37,7 @@ describe('EthernetSwitchesTemplateDetailsComponent', () => { let component: EthernetSwitchesTemplateDetailsComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts index ca1fa45a..2f0f6a61 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts @@ -13,7 +13,7 @@ import{ Controller } from '../../../../../models/controller'; import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { ControllerService } from '../../../../../services/controller.service'; -import { MockedServerService } from '../../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { EthernetSwitchesTemplatesComponent } from './ethernet-switches-templates.component'; @@ -27,7 +27,7 @@ describe('EthernetSwitchesTemplatesComponent', () => { let component: EthernetSwitchesTemplatesComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts index b6902eeb..ebac09db 100644 --- a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts +++ b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts @@ -23,7 +23,7 @@ import { DockerTemplate } from '../../../../models/templates/docker-template'; import { DockerConfigurationService } from '../../../../services/docker-configuration.service'; import { DockerService } from '../../../../services/docker.service'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { TemplateMocksService } from '../../../../services/template-mocks.service'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; @@ -41,7 +41,7 @@ xdescribe('AddDockerTemplateComponent', () => { let component: AddDockerTemplateComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedDockerService = new MockedDockerService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts index d5c3086b..3af27f03 100644 --- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts +++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts @@ -15,7 +15,7 @@ import { DockerTemplate } from '../../../../models/templates/docker-template'; import { DockerConfigurationService } from '../../../../services/docker-configuration.service'; import { DockerService } from '../../../../services/docker.service'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; @@ -35,7 +35,7 @@ describe('DockerTemplateDetailsComponent', () => { let component: DockerTemplateDetailsComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedDockerService = new MockedDockerService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts b/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts index 66c86de7..feaf94d4 100644 --- a/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts +++ b/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts @@ -13,7 +13,7 @@ import{ Controller } from '../../../../models/controller'; import { DockerTemplate } from '../../../../models/templates/docker-template'; import { DockerService } from '../../../../services/docker.service'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { DockerTemplatesComponent } from './docker-templates.component'; @@ -27,7 +27,7 @@ describe('DockerTemplatesComponent', () => { let component: DockerTemplatesComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedDockerService = new MockedDockerService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts index 6d683835..e6168868 100644 --- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts +++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts @@ -21,7 +21,7 @@ import { IosTemplate } from '../../../../models/templates/ios-template'; import { IosConfigurationService } from '../../../../services/ios-configuration.service'; import { IosService } from '../../../../services/ios.service'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { TemplateMocksService } from '../../../../services/template-mocks.service'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; @@ -39,7 +39,7 @@ xdescribe('AddIosTemplateComponent', () => { let component: AddIosTemplateComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedIosService = new MockedIosService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.spec.ts b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.spec.ts index 4bf212c0..8dc3447e 100644 --- a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.spec.ts +++ b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.spec.ts @@ -12,7 +12,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ControllerSettingsService } from '../../../../services/controller-settings.service'; import { MockedControllerSettingsService } from '../../../../services/controller-settings.service.spec'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; @@ -22,7 +22,7 @@ describe('DynamipsPreferencesComponent', () => { let component: DynamipsPreferencesComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let activatedRoute = new MockedActivatedRoute().get(); let mockedServerSettingsService = new MockedControllerSettingsService(); let mockedToasterService = new MockedToasterService(); diff --git a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts index 35a59d44..89cdfbae 100644 --- a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts +++ b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts @@ -15,7 +15,7 @@ import { IosTemplate } from '../../../../models/templates/ios-template'; import { IosConfigurationService } from '../../../../services/ios-configuration.service'; import { IosService } from '../../../../services/ios.service'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; @@ -35,7 +35,7 @@ describe('IosTemplateDetailsComponent', () => { let component: IosTemplateDetailsComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedIosService = new MockedIosService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts index 5865eeff..d9d2fb8a 100644 --- a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts +++ b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts @@ -13,7 +13,7 @@ import{ Controller } from '../../../../models/controller'; import { IosTemplate } from '../../../../models/templates/ios-template'; import { IosService } from '../../../../services/ios.service'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { IosTemplatesComponent } from './ios-templates.component'; @@ -27,7 +27,7 @@ describe('IosTemplatesComponent', () => { let component: IosTemplatesComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedIosService = new MockedIosService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts index b587917f..245db980 100644 --- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts +++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts @@ -21,7 +21,7 @@ import { IouTemplate } from '../../../../models/templates/iou-template'; import { IouConfigurationService } from '../../../../services/iou-configuration.service'; import { IouService } from '../../../../services/iou.service'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { TemplateMocksService } from '../../../../services/template-mocks.service'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; @@ -39,7 +39,7 @@ xdescribe('AddIouTemplateComponent', () => { let component: AddIouTemplateComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedIouService = new MockedIouService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts index 210cfa79..931fe240 100644 --- a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts +++ b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts @@ -15,7 +15,7 @@ import { IouTemplate } from '../../../../models/templates/iou-template'; import { IouConfigurationService } from '../../../../services/iou-configuration.service'; import { IouService } from '../../../../services/iou.service'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; @@ -35,7 +35,7 @@ describe('IouTemplateDetailsComponent', () => { let component: IouTemplateDetailsComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedIouService = new MockedIouService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts index 89be60ca..5cb8b07c 100644 --- a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts +++ b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts @@ -13,7 +13,7 @@ import{ Controller } from '../../../../models/controller'; import { IouTemplate } from '../../../../models/templates/iou-template'; import { IouService } from '../../../../services/iou.service'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { IouTemplatesComponent } from './iou-templates.component'; @@ -27,7 +27,7 @@ describe('IouTemplatesComponent', () => { let component: IouTemplatesComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedIouService = new MockedIouService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts index 234b4c03..901c6665 100644 --- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts +++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts @@ -20,7 +20,7 @@ import { QemuTemplate } from '../../../../models/templates/qemu-template'; import { QemuConfigurationService } from '../../../../services/qemu-configuration.service'; import { QemuService } from '../../../../services/qemu.service'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { TemplateMocksService } from '../../../../services/template-mocks.service'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; @@ -46,7 +46,7 @@ xdescribe('AddQemuVmTemplateComponent', () => { let component: AddQemuVmTemplateComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedQemuService = new MockedQemuService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.spec.ts b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.spec.ts index 2c541f15..52ea2179 100644 --- a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.spec.ts +++ b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.spec.ts @@ -13,7 +13,7 @@ import { of } from 'rxjs'; import { ControllerSettingsService } from '../../../../services/controller-settings.service'; import { MockedControllerSettingsService } from '../../../../services/controller-settings.service.spec'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; @@ -23,7 +23,7 @@ describe('QemuPreferencesComponent', () => { let component: QemuPreferencesComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let activatedRoute = new MockedActivatedRoute().get(); let mockedServerSettingsService = new MockedControllerSettingsService(); let mockedToasterService = new MockedToasterService(); diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts index 168491bd..e6c206fb 100644 --- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts +++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts @@ -16,7 +16,7 @@ import { QemuTemplate } from '../../../../models/templates/qemu-template'; import { QemuConfigurationService } from '../../../../services/qemu-configuration.service'; import { QemuService } from '../../../../services/qemu.service'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; @@ -44,7 +44,7 @@ describe('QemuVmTemplateDetailsComponent', () => { let component: QemuVmTemplateDetailsComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedQemuService = new MockedQemuService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts index 07a17ffa..43aa55c9 100644 --- a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts +++ b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts @@ -13,7 +13,7 @@ import{ Controller } from '../../../../models/controller'; import { QemuTemplate } from '../../../../models/templates/qemu-template'; import { QemuService } from '../../../../services/qemu.service'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { QemuVmTemplatesComponent } from './qemu-vm-templates.component'; @@ -27,7 +27,7 @@ describe('QemuTemplatesComponent', () => { let component: QemuVmTemplatesComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedQemuService = new MockedQemuService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts index 3685e18c..8a683c72 100644 --- a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts +++ b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts @@ -13,7 +13,7 @@ import { of } from 'rxjs'; import{ Controller } from '../../../../models/controller'; import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { TemplateMocksService } from '../../../../services/template-mocks.service'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; @@ -35,7 +35,7 @@ describe('AddVirtualBoxTemplateComponent', () => { let component: AddVirtualBoxTemplateComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedVirtualBoxService = new MockedVirtualBoxService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-prefernces.component.spec.ts b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-prefernces.component.spec.ts index 35a0a94d..cea7d4f0 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-prefernces.component.spec.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-prefernces.component.spec.ts @@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VirtualBoxPreferencesComponent } from './virtual-box-preferences.component'; @@ -17,7 +17,7 @@ describe('VirtualBoxPreferencesComponent', () => { let component: VirtualBoxPreferencesComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let activatedRoute = new MockedActivatedRoute().get(); beforeEach(async() => { diff --git a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts index a5794141..84ef5c61 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts @@ -14,7 +14,7 @@ import { of } from 'rxjs'; import{ Controller } from '../../../../models/controller'; import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { VirtualBoxConfigurationService } from '../../../../services/virtual-box-configuration.service'; @@ -36,7 +36,7 @@ describe('VirtualBoxTemplateDetailsComponent', () => { let component: VirtualBoxTemplateDetailsComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedVirtualBoxService = new MockedVirtualBoxService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts index 0d91fc5d..d44b3fb9 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts @@ -12,7 +12,7 @@ import { of } from 'rxjs'; import{ Controller } from '../../../../models/controller'; import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { VirtualBoxService } from '../../../../services/virtual-box.service'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VirtualBoxTemplatesComponent } from './virtual-box-templates.component'; @@ -27,7 +27,7 @@ describe('VirtualBoxTemplatesComponent', () => { let component: VirtualBoxTemplatesComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedVirtualBoxService = new MockedVirtualBoxService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts b/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts index dbcef221..13342d5c 100644 --- a/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts +++ b/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts @@ -14,7 +14,7 @@ import{ Controller } from '../../../../models/controller'; import { VmwareTemplate } from '../../../../models/templates/vmware-template'; import { VmwareVm } from '../../../../models/vmware/vmware-vm'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { TemplateMocksService } from '../../../../services/template-mocks.service'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; @@ -36,7 +36,7 @@ describe('AddVmwareTemplateComponent', () => { let component: AddVmwareTemplateComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedVmwareService = new MockedVmwareService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.spec.ts b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.spec.ts index 30de44ed..cdfa046b 100644 --- a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.spec.ts +++ b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.spec.ts @@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VmwarePreferencesComponent } from './vmware-preferences.component'; @@ -17,7 +17,7 @@ describe('VmwarePreferencesComponent', () => { let component: VmwarePreferencesComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let activatedRoute = new MockedActivatedRoute().get(); beforeEach(async() => { diff --git a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts index 6384a835..dd450ec7 100644 --- a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts +++ b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts @@ -14,7 +14,7 @@ import { of } from 'rxjs'; import{ Controller } from '../../../../models/controller'; import { VmwareTemplate } from '../../../../models/templates/vmware-template'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { VmwareConfigurationService } from '../../../../services/vmware-configuration.service'; @@ -36,7 +36,7 @@ describe('VmwareTemplateDetailsComponent', () => { let component: VmwareTemplateDetailsComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedVmwareService = new MockedVmwareService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts index 424e725a..1972985a 100644 --- a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts +++ b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts @@ -12,7 +12,7 @@ import { of } from 'rxjs'; import{ Controller } from '../../../../models/controller'; import { VmwareTemplate } from '../../../../models/templates/vmware-template'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { VmwareService } from '../../../../services/vmware.service'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VmwareTemplatesComponent } from './vmware-templates.component'; @@ -27,7 +27,7 @@ describe('VmwareTemplatesComponent', () => { let component: VmwareTemplatesComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedVmwareService = new MockedVmwareService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts index 5da6b23c..077d881b 100644 --- a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts +++ b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts @@ -14,7 +14,7 @@ import{ Controller } from '../../../../models/controller'; import { VpcsTemplate } from '../../../../models/templates/vpcs-template'; import { ComputeService } from '../../../../services/compute.service'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { TemplateMocksService } from '../../../../services/template-mocks.service'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; @@ -38,7 +38,7 @@ describe('AddVpcsTemplateComponent', () => { let component: AddVpcsTemplateComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedVpcsService = new MockedVpcsService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.spec.ts b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.spec.ts index 27cd2a53..ceb4646a 100644 --- a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.spec.ts +++ b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.spec.ts @@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VpcsPreferencesComponent } from './vpcs-preferences.component'; @@ -17,7 +17,7 @@ describe('VpcsPreferencesComponent', () => { let component: VpcsPreferencesComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let activatedRoute = new MockedActivatedRoute().get(); beforeEach(async() => { diff --git a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts index a55a733d..67cc5156 100644 --- a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts +++ b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts @@ -13,7 +13,7 @@ import { of } from 'rxjs'; import{ Controller } from '../../../../models/controller'; import { VpcsTemplate } from '../../../../models/templates/vpcs-template'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { VpcsConfigurationService } from '../../../../services/vpcs-configuration.service'; @@ -35,7 +35,7 @@ describe('VpcsTemplateDetailsComponent', () => { let component: VpcsTemplateDetailsComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedVpcsService = new MockedVpcsService(); let mockedToasterService = new MockedToasterService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts index c1a13905..df6d160f 100644 --- a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts +++ b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts @@ -12,7 +12,7 @@ import { of } from 'rxjs'; import{ Controller } from '../../../../models/controller'; import { VpcsTemplate } from '../../../../models/templates/vpcs-template'; import { ControllerService } from '../../../../services/controller.service'; -import { MockedServerService } from '../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../services/controller.service.spec'; import { VpcsService } from '../../../../services/vpcs.service'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VpcsTemplatesComponent } from './vpcs-templates.component'; @@ -27,7 +27,7 @@ describe('VpcsTemplatesComponent', () => { let component: VpcsTemplatesComponent; let fixture: ComponentFixture; - let mockedServerService = new MockedServerService(); + let mockedServerService = new MockedControllerService(); let mockedVpcsService = new MockedVpcsService(); let activatedRoute = new MockedActivatedRoute().get(); diff --git a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts index 9022762e..8cd60cf2 100644 --- a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts +++ b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts @@ -5,7 +5,7 @@ import { Node } from '../../../../../cartography/models/node'; import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; import { ControllerService } from '../../../../../services/controller.service'; -import { MockedServerService } from '../../../../../services/controller.service.spec'; +import { MockedControllerService } from '../../../../../services/controller.service.spec'; import { SettingsService } from '../../../../../services/settings.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { MockedToasterService } from '../../../../../services/toaster.service.spec'; @@ -18,7 +18,7 @@ describe('ConsoleDeviceActionComponent', () => { let electronService; let controller:Controller ; let settingsService: SettingsService; - let mockedServerService: MockedServerService; + let mockedServerService: MockedControllerService; let mockedToaster: MockedToasterService; let mockedNodeService: MockedNodeService = new MockedNodeService(); @@ -34,7 +34,7 @@ describe('ConsoleDeviceActionComponent', () => { }, }; - mockedServerService = new MockedServerService(); + mockedServerService = new MockedControllerService(); mockedToaster = new MockedToasterService(); controller = { host: 'localhost', port: 222 } as Controller ; diff --git a/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.spec.ts b/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.spec.ts index 54576831..2a689131 100644 --- a/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.spec.ts +++ b/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MockedNodeService } from 'app/components/project-map/project-map.component.spec'; -import { HttpServer } from 'app/services/http-server.service'; +import { HttpController } from 'app/services/http-controller.service'; import { NodeService } from 'app/services/node.service'; import { ToasterService } from 'app/services/toaster.service'; import { MockedToasterService } from 'app/services/toaster.service.spec'; @@ -19,7 +19,7 @@ describe('StartNodeActionComponent', () => { imports:[MatProgressSpinnerModule ], providers: [ { provide: NodeService, useValue: mockedNodeService }, - { provide: HttpServer, useValue: {} }, + { provide: HttpController, useValue: {} }, { provide: ToasterService, useValue: mockedToasterService }, ], }).compileComponents(); diff --git a/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.spec.ts b/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.spec.ts index a363d8fc..79e322a4 100644 --- a/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.spec.ts +++ b/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MockedNodeService } from 'app/components/project-map/project-map.component.spec'; -import { HttpServer } from 'app/services/http-server.service'; +import { HttpController } from 'app/services/http-controller.service'; import { NodeService } from 'app/services/node.service'; import { StopNodeActionComponent } from './stop-node-action.component'; diff --git a/src/app/components/project-map/log-console/log-console.component.spec.ts b/src/app/components/project-map/log-console/log-console.component.spec.ts index 3f42461b..d7e52e48 100644 --- a/src/app/components/project-map/log-console/log-console.component.spec.ts +++ b/src/app/components/project-map/log-console/log-console.component.spec.ts @@ -10,7 +10,7 @@ import { of } from 'rxjs'; import { NodesDataSource } from '../../../cartography/datasources/nodes-datasource'; import { ProjectWebServiceHandler, WebServiceMessage } from '../../../handlers/project-web-service-handler'; import{ Controller } from '../../../models/controller'; -import { HttpServer, ServerErrorHandler } from '../../../services/http-server.service'; +import { HttpController, ControllerErrorHandler } from '../../../services/http-controller.service'; import { NodeService } from '../../../services/node.service'; import { NodeConsoleService } from '../../../services/nodeConsole.service'; import { MockedNodesDataSource, MockedNodeService } from '../project-map.component.spec'; @@ -39,7 +39,7 @@ describe('LogConsoleComponent', () => { let mapSettingsService: MapSettingsService; let toasterService: ToasterService; - let httpServer = new HttpServer({} as HttpClient, {} as ServerErrorHandler); + let httpServer = new HttpController({} as HttpClient, {} as ControllerErrorHandler); beforeEach(async() => { await TestBed.configureTestingModule({ @@ -49,7 +49,7 @@ describe('LogConsoleComponent', () => { { provide: NodeService, useValue: mockedNodeService }, { provide: NodesDataSource, useValue: mockedNodesDataSource }, { provide: LogEventsDataSource, useClass: LogEventsDataSource }, - { provide: HttpServer, useValue: httpServer }, + { provide: HttpController, useValue: httpServer }, NodeConsoleService, ToasterService, MapSettingsService diff --git a/src/app/components/project-map/log-console/log-console.component.ts b/src/app/components/project-map/log-console/log-console.component.ts index c6d8e01e..bc4db86e 100644 --- a/src/app/components/project-map/log-console/log-console.component.ts +++ b/src/app/components/project-map/log-console/log-console.component.ts @@ -20,7 +20,7 @@ import { LogEvent } from '../../../models/logEvent'; import { Port } from '../../../models/port'; import { Project } from '../../../models/project'; import{ Controller } from '../../../models/controller'; -import { HttpServer } from '../../../services/http-server.service'; +import { HttpController } from '../../../services/http-controller.service'; import { NodeService } from '../../../services/node.service'; import { NodeConsoleService } from '../../../services/nodeConsole.service'; import { ThemeService } from '../../../services/theme.service'; @@ -70,7 +70,7 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy { private nodeService: NodeService, private nodesDataSource: NodesDataSource, private logEventsDataSource: LogEventsDataSource, - private httpService: HttpServer, + private httpService: HttpController, private themeService: ThemeService, private cd: ChangeDetectorRef, private nodeConsoleService: NodeConsoleService, diff --git a/src/app/components/project-map/project-map.component.spec.ts b/src/app/components/project-map/project-map.component.spec.ts index 24497636..f460e892 100644 --- a/src/app/components/project-map/project-map.component.spec.ts +++ b/src/app/components/project-map/project-map.component.spec.ts @@ -57,7 +57,7 @@ import { ProjectService } from '../../services/project.service'; import { MockedProjectService } from '../../services/project.service.spec'; import { RecentlyOpenedProjectService } from '../../services/recentlyOpenedProject.service'; import { ControllerService } from '../../services/controller.service'; -import { MockedServerService } from '../../services/controller.service.spec'; +import { MockedControllerService } from '../../services/controller.service.spec'; import { SettingsService } from '../../services/settings.service'; import { ToasterService } from '../../services/toaster.service'; import { MockedToasterService } from '../../services/toaster.service.spec'; @@ -276,7 +276,7 @@ xdescribe('ProjectMapComponent', () => { ], providers: [ { provide: ActivatedRoute }, - { provide: ControllerService, useClass: MockedServerService }, + { provide: ControllerService, useClass: MockedControllerService }, { provide: ProjectService, useClass: MockedProjectService }, { provide: NodeService }, { provide: LinkService }, diff --git a/src/app/components/projects/projects.component.spec.ts b/src/app/components/projects/projects.component.spec.ts index 1ba94600..2bf0f588 100644 --- a/src/app/components/projects/projects.component.spec.ts +++ b/src/app/components/projects/projects.component.spec.ts @@ -21,7 +21,7 @@ import{ Controller } from '../../models/controller'; import { ProjectService } from '../../services/project.service'; import { MockedProjectService } from '../../services/project.service.spec'; import { ControllerService } from '../../services/controller.service'; -import { MockedServerService } from '../../services/controller.service.spec'; +import { MockedControllerService } from '../../services/controller.service.spec'; import { Settings, SettingsService } from '../../services/settings.service'; import { ToasterService } from '../../services/toaster.service'; import { ChooseNameDialogComponent } from './choose-name-dialog/choose-name-dialog.component'; @@ -66,7 +66,7 @@ xdescribe('ProjectsComponent', () => { RouterTestingModule.withRoutes([]), ], providers: [ - { provide: ControllerService, useClass: MockedServerService }, + { provide: ControllerService, useClass: MockedControllerService }, { provide: ProjectService, useValue: mockedProjectService }, { provide: SettingsService }, { provide: ToasterService }, diff --git a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.spec.ts b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.spec.ts index 1c0e8496..05db7df7 100644 --- a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.spec.ts +++ b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.spec.ts @@ -5,7 +5,7 @@ import { MatDialog, MatDialogModule } from '@angular/material/dialog'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { Context } from 'app/cartography/models/context'; import { ProgressDialogService } from 'app/common/progress-dialog/progress-dialog.service'; -import { HttpServer, ServerErrorHandler } from 'app/services/http-server.service'; +import { HttpController, ControllerErrorHandler } from 'app/services/http-controller.service'; import { SnapshotService } from 'app/services/snapshot.service'; import { ToasterService } from 'app/services/toaster.service'; import { SnapshotMenuItemComponent } from './snapshot-menu-item.component'; @@ -21,11 +21,11 @@ describe('SnapshotMenuItemComponent', () => { providers: [ SnapshotService, MatDialog, - HttpServer, + HttpController, Overlay, ScrollStrategyOptions, HttpClient, - ServerErrorHandler, + ControllerErrorHandler, ProgressDialogService, Context, ToasterService diff --git a/src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts b/src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts index d18494fc..204caafa 100644 --- a/src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts +++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts @@ -3,8 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormBuilder, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { RouterTestingModule } from '@angular/router/testing'; -import { HttpServer } from 'app/services/http-server.service'; -import { MockedServerService } from 'app/services/controller.service.spec'; +import { HttpController } from '../../../services/http-controller.service'; +import { MockedControllerService } from 'app/services/controller.service.spec'; import { TemplateMocksService } from 'app/services/template-mocks.service'; import { TemplateService } from 'app/services/template.service'; import { ToasterService } from 'app/services/toaster.service'; @@ -28,7 +28,7 @@ describe('TemplateListDialogComponent', () => { { provide: MatDialogRef, useValue: {} }, { provide: MAT_DIALOG_DATA, useValue: {} }, { provide: NonNegativeValidator, useValue: {} }, - HttpServer, + HttpController, HttpClient ] }).compileComponents(); diff --git a/src/app/components/template/template.component.spec.ts b/src/app/components/template/template.component.spec.ts index f7e6c34a..9b3b4d5a 100644 --- a/src/app/components/template/template.component.spec.ts +++ b/src/app/components/template/template.component.spec.ts @@ -5,7 +5,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog, MatDialogModule } from '@angular/material/dialog'; import { MatMenuModule } from '@angular/material/menu'; import { Context } from 'app/cartography/models/context'; -import { HttpServer, ServerErrorHandler } from 'app/services/http-server.service'; +import { HttpController, ControllerErrorHandler } from 'app/services/http-controller.service'; import { MapScaleService } from 'app/services/mapScale.service'; import { SymbolService } from 'app/services/symbol.service'; import { TemplateService } from 'app/services/template.service'; @@ -24,11 +24,11 @@ describe('TemplateComponent', () => { MatDialog, Overlay, TemplateService, - HttpServer, + HttpController, MapScaleService, HttpClient, HttpHandler, - ServerErrorHandler, + ControllerErrorHandler, Context, { provide: SymbolService, useClass: mockedSymbolService }, ], diff --git a/src/app/filters/authImageFilter.ts b/src/app/filters/authImageFilter.ts index 4752c1bd..bf05b1c4 100644 --- a/src/app/filters/authImageFilter.ts +++ b/src/app/filters/authImageFilter.ts @@ -1,7 +1,7 @@ import { Pipe, PipeTransform } from '@angular/core'; import { Console } from 'console'; import{ Controller } from '../models/controller'; -import { HttpServer } from '../services/http-server.service'; +import { HttpController } from '../services/http-controller.service'; import { DomSanitizer } from '@angular/platform-browser'; import { environment } from 'environments/environment'; @@ -11,7 +11,7 @@ import { environment } from 'environments/environment'; export class AuthImageFilter implements PipeTransform { constructor( - private httpServer: HttpServer, + private httpServer: HttpController, private domSanitizer: DomSanitizer ) { } diff --git a/src/app/layouts/default-layout/default-layout.component.spec.ts b/src/app/layouts/default-layout/default-layout.component.spec.ts index 71d622b0..b356b8ea 100644 --- a/src/app/layouts/default-layout/default-layout.component.spec.ts +++ b/src/app/layouts/default-layout/default-layout.component.spec.ts @@ -10,11 +10,11 @@ import { Subject } from 'rxjs'; import { ProgressComponent } from '../../common/progress/progress.component'; import { ProgressService } from '../../common/progress/progress.service'; import { RecentlyOpenedProjectService } from '../../services/recentlyOpenedProject.service'; -import { ControllerManagementService, ServerStateEvent } from '../../services/controller-management.service'; +import { ControllerManagementService, ControllerStateEvent } from '../../services/controller-management.service'; import { ToasterService } from '../../services/toaster.service'; import { MockedToasterService } from '../../services/toaster.service.spec'; import { DefaultLayoutComponent } from './default-layout.component'; -import { HttpServer, ServerErrorHandler } from '../../services/http-server.service'; +import { HttpController, ControllerErrorHandler } from '../../services/http-controller.service'; import { HttpClientModule } from '@angular/common/http'; class ElectronServiceMock { @@ -22,7 +22,7 @@ class ElectronServiceMock { } class MockedServerManagementService { - public serverStatusChanged; + public controllerStatusChanged; public stopAll() {} } @@ -32,12 +32,12 @@ describe('DefaultLayoutComponent', () => { let electronServiceMock: ElectronServiceMock; let serverManagementService = new MockedServerManagementService(); let serverService: ControllerService; - let httpServer: HttpServer; - let errorHandler: ServerErrorHandler; + let httpServer: HttpController; + let errorHandler: ControllerErrorHandler; beforeEach(async() => { electronServiceMock = new ElectronServiceMock(); - serverManagementService.controllerStatusChanged = new Subject(); + serverManagementService.controllerStatusChanged = new Subject(); await TestBed.configureTestingModule({ declarations: [DefaultLayoutComponent, ProgressComponent], @@ -60,14 +60,14 @@ describe('DefaultLayoutComponent', () => { useClass: RecentlyOpenedProjectService, }, { provide: ControllerService }, - { provide: HttpServer }, - { provide: ServerErrorHandler }, + { provide: HttpController }, + { provide: ControllerErrorHandler }, ProgressService, ], }).compileComponents(); - errorHandler = TestBed.inject(ServerErrorHandler); - httpServer = TestBed.inject(HttpServer); + errorHandler = TestBed.inject(ControllerErrorHandler); + httpServer = TestBed.inject(HttpController); serverService = TestBed.inject(ControllerService); }); diff --git a/src/app/services/appliances.service.ts b/src/app/services/appliances.service.ts index 326460b5..9b6ee849 100644 --- a/src/app/services/appliances.service.ts +++ b/src/app/services/appliances.service.ts @@ -3,11 +3,11 @@ import { environment } from 'environments/environment'; import { Observable } from 'rxjs'; import { Appliance } from '../models/appliance'; import{ Controller } from '../models/controller'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; @Injectable() export class ApplianceService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpController) {} getAppliances(controller:Controller ): Observable { return this.httpServer.get(controller, '/appliances') as Observable; diff --git a/src/app/services/built-in-templates.service.spec.ts b/src/app/services/built-in-templates.service.spec.ts index 9e78de48..30beadb9 100644 --- a/src/app/services/built-in-templates.service.spec.ts +++ b/src/app/services/built-in-templates.service.spec.ts @@ -7,24 +7,24 @@ import { CloudTemplate } from '../models/templates/cloud-template'; import { EthernetHubTemplate } from '../models/templates/ethernet-hub-template'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; import { BuiltInTemplatesService } from './built-in-templates.service'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; import { getTestServer } from './testing'; describe('BuiltInTemplatesService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; - let httpServer: HttpServer; + let httpServer: HttpController; let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, BuiltInTemplatesService], + providers: [HttpController, BuiltInTemplatesService], }); httpClient = TestBed.get(HttpClient); httpTestingController = TestBed.get(HttpTestingController); - httpServer = TestBed.get(HttpServer); + httpServer = TestBed.get(HttpController); controller = getTestServer(); }); diff --git a/src/app/services/built-in-templates.service.ts b/src/app/services/built-in-templates.service.ts index e1fa4dcb..6d690648 100644 --- a/src/app/services/built-in-templates.service.ts +++ b/src/app/services/built-in-templates.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import{ Controller } from '../models/controller'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; @Injectable() export class BuiltInTemplatesService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpController) {} getTemplates(controller:Controller ): Observable { return this.httpServer.get(controller, '/templates') as Observable; diff --git a/src/app/services/compute.service.ts b/src/app/services/compute.service.ts index aa919323..8e5ea922 100644 --- a/src/app/services/compute.service.ts +++ b/src/app/services/compute.service.ts @@ -4,11 +4,11 @@ import { Observable } from 'rxjs'; import { Compute } from '../models/compute'; import { ComputeStatistics } from '../models/computeStatistics'; import{ Controller } from '../models/controller'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; @Injectable() export class ComputeService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpController) {} getComputes(controller:Controller ): Observable { return this.httpServer.get(controller, '/computes') as Observable; diff --git a/src/app/services/controller-settings.service.spec.ts b/src/app/services/controller-settings.service.spec.ts index 4318af09..afe1aa7d 100644 --- a/src/app/services/controller-settings.service.spec.ts +++ b/src/app/services/controller-settings.service.spec.ts @@ -4,7 +4,7 @@ import { of } from 'rxjs'; import{ Controller } from '../models/controller'; import { QemuSettings } from '../models/settings/qemu-settings'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; import { ControllerSettingsService } from './controller-settings.service'; export class MockedControllerSettingsService { @@ -18,15 +18,15 @@ export class MockedControllerSettingsService { } describe('ControllerSettingsService', () => { - let httpServer: HttpServer; + let httpServer: HttpController; beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, ControllerSettingsService], + providers: [HttpController, ControllerSettingsService], }); - httpServer = TestBed.get(HttpServer); + httpServer = TestBed.get(HttpController); }); it('should be created', inject([ControllerSettingsService], (service: ControllerSettingsService) => { diff --git a/src/app/services/controller-settings.service.ts b/src/app/services/controller-settings.service.ts index 034e944b..6a65ae94 100644 --- a/src/app/services/controller-settings.service.ts +++ b/src/app/services/controller-settings.service.ts @@ -2,11 +2,11 @@ import { Injectable } from '@angular/core'; import{ Controller } from '../models/controller'; import { ServerSettings } from '../models/serverSettings'; import { QemuSettings } from '../models/settings/qemu-settings'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; @Injectable() export class ControllerSettingsService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpController) {} get(controller:Controller ) { return this.httpServer.get(controller, `/settings`); diff --git a/src/app/services/controller.service.spec.ts b/src/app/services/controller.service.spec.ts index f5717e66..6163a8a7 100644 --- a/src/app/services/controller.service.spec.ts +++ b/src/app/services/controller.service.spec.ts @@ -1,6 +1,6 @@ import{ Controller } from '../models/controller'; -export class MockedServerService { +export class MockedControllerService { public servers:Controller [] = []; public create(controller:Controller ) { diff --git a/src/app/services/controller.service.ts b/src/app/services/controller.service.ts index 92d5c97d..894139e5 100644 --- a/src/app/services/controller.service.ts +++ b/src/app/services/controller.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs'; import {Controller , ServerProtocol } from '../models/controller'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; @Injectable() export class ControllerService { @@ -9,7 +9,7 @@ export class ControllerService { public serviceInitialized: Subject = new Subject(); public isServiceInitialized: boolean; - constructor(private httpServer: HttpServer) { + constructor(private httpServer: HttpController) { this.controllerIds = this.getcontrollerIds(); this.isServiceInitialized = true; this.serviceInitialized.next(this.isServiceInitialized); diff --git a/src/app/services/docker.service.ts b/src/app/services/docker.service.ts index be5a8801..75e595c1 100644 --- a/src/app/services/docker.service.ts +++ b/src/app/services/docker.service.ts @@ -4,11 +4,11 @@ import { Observable } from 'rxjs'; import { DockerImage } from '../models/docker/docker-image'; import{ Controller } from '../models/controller'; import { DockerTemplate } from '../models/templates/docker-template'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; @Injectable() export class DockerService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpController) {} getTemplates(controller:Controller ): Observable { return this.httpServer.get(controller, '/templates') as Observable; diff --git a/src/app/services/drawing.service.spec.ts b/src/app/services/drawing.service.spec.ts index 75905d60..f56e7615 100644 --- a/src/app/services/drawing.service.spec.ts +++ b/src/app/services/drawing.service.spec.ts @@ -8,25 +8,25 @@ import { Project } from '../models/project'; import{ Controller } from '../models/controller'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; import { DrawingService } from './drawing.service'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; import { getTestServer } from './testing'; describe('DrawingService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; - let httpServer: HttpServer; + let httpServer: HttpController; let controller:Controller ; let project: Project = new Project(); beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, SvgToDrawingConverter, DrawingService], + providers: [HttpController, SvgToDrawingConverter, DrawingService], }); httpClient = TestBed.get(HttpClient); httpTestingController = TestBed.get(HttpTestingController); - httpServer = TestBed.get(HttpServer); + httpServer = TestBed.get(HttpController); controller = getTestServer(); }); diff --git a/src/app/services/drawing.service.ts b/src/app/services/drawing.service.ts index 369a0148..8864af8e 100644 --- a/src/app/services/drawing.service.ts +++ b/src/app/services/drawing.service.ts @@ -5,11 +5,11 @@ import { SvgToDrawingConverter } from '../cartography/helpers/svg-to-drawing-con import { Drawing } from '../cartography/models/drawing'; import { Project } from '../models/project'; import{ Controller } from '../models/controller'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; @Injectable() export class DrawingService { - constructor(private httpServer: HttpServer, private svgToDrawingConverter: SvgToDrawingConverter) {} + constructor(private httpServer: HttpController, private svgToDrawingConverter: SvgToDrawingConverter) {} add(controller:Controller , project_id: string, x: number, y: number, svg: string) { return this.httpServer.post(controller, `/projects/${project_id}/drawings`, { diff --git a/src/app/services/http-server.service.spec.ts b/src/app/services/http-controller.service.spec.ts similarity index 89% rename from src/app/services/http-server.service.spec.ts rename to src/app/services/http-controller.service.spec.ts index 0d342edc..af1a82bf 100644 --- a/src/app/services/http-server.service.spec.ts +++ b/src/app/services/http-controller.service.spec.ts @@ -4,36 +4,36 @@ import { TestBed } from '@angular/core/testing'; import { environment } from 'environments/environment'; import{ Controller } from '../models/controller'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; -import { HttpServer, ServerError, ServerErrorHandler } from './http-server.service'; +import { HttpController, ControllerError, ControllerErrorHandler } from './http-controller.service'; import { getTestServer } from './testing'; class MyType { id: number; } -describe('ServerError', () => { +describe('ControllerError', () => { it('should construct with message', () => { const error = new Error('test'); expect(error.message).toEqual('test'); }); - it('should construct ServerError from error', () => { + it('should construct ControllerError from error', () => { const error = new Error('test'); - const serverError = ServerError.fromError('new message', error); - expect(serverError.originalError).toEqual(error); - expect(serverError.message).toEqual('new message'); + const controllerError = ControllerError.fromError('new message', error); + expect(controllerError.originalError).toEqual(error); + expect(controllerError.message).toEqual('new message'); }); }); -describe('ServerErrorHandler', () => { +describe('ControllerErrorHandler', () => { it('should handle HttpErrorResponse with status 0', (done) => { const error = new HttpErrorResponse({ status: 0 }); - const handler = new ServerErrorHandler(); + const handler = new ControllerErrorHandler(); const result = handler.handleError(error); result.subscribe(null, (err) => { - expect(err.message).toEqual('Server is unreachable'); + expect(err.message).toEqual('Controller is unreachable'); done(); }); }); @@ -41,7 +41,7 @@ describe('ServerErrorHandler', () => { it('should not handle HttpErrorResponse with status!=0', (done) => { const error = new HttpErrorResponse({ status: 499 }); - const handler = new ServerErrorHandler(); + const handler = new ControllerErrorHandler(); const result = handler.handleError(error); result.subscribe(null, (err) => { @@ -51,21 +51,21 @@ describe('ServerErrorHandler', () => { }); }); -describe('HttpServer', () => { +describe('HttpController', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; - let service: HttpServer; + let service: HttpController; let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer], + providers: [HttpController], }); httpClient = TestBed.get(HttpClient); httpTestingController = TestBed.get(HttpTestingController); - service = TestBed.get(HttpServer); + service = TestBed.get(HttpController); controller = getTestServer(); }); diff --git a/src/app/services/http-server.service.ts b/src/app/services/http-controller.service.ts similarity index 83% rename from src/app/services/http-server.service.ts rename to src/app/services/http-controller.service.ts index a2d7aec0..85fa6c15 100644 --- a/src/app/services/http-server.service.ts +++ b/src/app/services/http-controller.service.ts @@ -66,7 +66,7 @@ export type HeadersOptions = { }; /* tslint:enable:interface-over-type-literal */ -export class ServerError extends Error { +export class ControllerError extends Error { public originalError: Error; constructor(message: string) { @@ -74,19 +74,19 @@ export class ServerError extends Error { } static fromError(message: string, originalError: Error) { - const serverError = new ServerError(message); - serverError.originalError = originalError; - return serverError; + const controllerError = new ControllerError(message); + controllerError.originalError = originalError; + return controllerError; } } @Injectable() -export class ServerErrorHandler { +export class ControllerErrorHandler { handleError(error: HttpErrorResponse) { let err: Error = error; if (error.name === 'HttpErrorResponse' && error.status === 0) { - err = ServerError.fromError('Server is unreachable', error); + err = ControllerError.fromError('Controller is unreachable', error); } if (error.status === 401) { @@ -98,14 +98,14 @@ export class ServerErrorHandler { } @Injectable() -export class HttpServer { +export class HttpController { public requestsNotificationEmitter = new EventEmitter(); - constructor(private http: HttpClient, private errorHandler: ServerErrorHandler) {} + constructor(private http: HttpClient, private errorHandler: ControllerErrorHandler) {} get(controller:Controller , url: string, options?: JsonOptions): Observable { options = this.getJsonOptions(options); - const intercepted = this.getOptionsForServer(controller, url, options); + const intercepted = this.getOptionsForController(controller, url, options); this.requestsNotificationEmitter.emit(`GET ${intercepted.url}`); return this.http @@ -115,7 +115,7 @@ export class HttpServer { getText(controller:Controller , url: string, options?: TextOptions): Observable { options = this.getTextOptions(options); - const intercepted = this.getOptionsForServer(controller, url, options); + const intercepted = this.getOptionsForController(controller, url, options); this.requestsNotificationEmitter.emit(`GET ${intercepted.url}`); return this.http @@ -125,7 +125,7 @@ export class HttpServer { getBlob(controller:Controller , url: string, options?: BlobOptions): Observable { options = this.getBlobOptions(options); - const intercepted = this.getOptionsForServer(controller, url, options); + const intercepted = this.getOptionsForController(controller, url, options); this.requestsNotificationEmitter.emit(`GET ${intercepted.url}`); return this.http @@ -135,7 +135,7 @@ export class HttpServer { post(controller:Controller , url: string, body: any | null, options?: JsonOptions): Observable { options = this.getJsonOptions(options); - const intercepted = this.getOptionsForServer(controller, url, options); + const intercepted = this.getOptionsForController(controller, url, options); this.requestsNotificationEmitter.emit(`POST ${intercepted.url}`); return this.http @@ -145,7 +145,7 @@ export class HttpServer { put(controller:Controller , url: string, body: any, options?: JsonOptions): Observable { options = this.getJsonOptions(options); - const intercepted = this.getOptionsForServer(controller, url, options); + const intercepted = this.getOptionsForController(controller, url, options); this.requestsNotificationEmitter.emit(`PUT ${intercepted.url}`); return this.http @@ -155,7 +155,7 @@ export class HttpServer { delete(controller:Controller , url: string, options?: JsonOptions): Observable { options = this.getJsonOptions(options); - const intercepted = this.getOptionsForServer(controller, url, options); + const intercepted = this.getOptionsForController(controller, url, options); this.requestsNotificationEmitter.emit(`DELETE ${intercepted.url}`); return this.http @@ -165,7 +165,7 @@ export class HttpServer { patch(controller:Controller , url: string, body: any, options?: JsonOptions): Observable { options = this.getJsonOptions(options); - const intercepted = this.getOptionsForServer(controller, url, options); + const intercepted = this.getOptionsForController(controller, url, options); return this.http .patch(intercepted.url, body, intercepted.options) .pipe(catchError(this.errorHandler.handleError)) as Observable; @@ -173,7 +173,7 @@ export class HttpServer { head(controller:Controller , url: string, options?: JsonOptions): Observable { options = this.getJsonOptions(options); - const intercepted = this.getOptionsForServer(controller, url, options); + const intercepted = this.getOptionsForController(controller, url, options); return this.http .head(intercepted.url, intercepted.options) .pipe(catchError(this.errorHandler.handleError)) as Observable; @@ -181,7 +181,7 @@ export class HttpServer { options(controller:Controller , url: string, options?: JsonOptions): Observable { options = this.getJsonOptions(options); - const intercepted = this.getOptionsForServer(controller, url, options); + const intercepted = this.getOptionsForController(controller, url, options); return this.http .options(intercepted.url, intercepted.options) .pipe(catchError(this.errorHandler.handleError)) as Observable; @@ -214,7 +214,7 @@ export class HttpServer { return options; } - private getOptionsForServer(controller:Controller , url: string, options: T) { + private getOptionsForController(controller:Controller , url: string, options: T) { if (controller && controller.host && controller.port) { if (!controller.protocol) { controller.protocol = location.protocol as ServerProtocol; diff --git a/src/app/services/image-manager.service.spec.ts b/src/app/services/image-manager.service.spec.ts index b8f77590..55b0fcbb 100644 --- a/src/app/services/image-manager.service.spec.ts +++ b/src/app/services/image-manager.service.spec.ts @@ -3,7 +3,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { inject, TestBed } from '@angular/core/testing'; import { AppTestingModule } from 'app/testing/app-testing/app-testing.module'; import{ Controller } from '../models/controller'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; import { getTestServer } from './testing'; import { ImageManagerService } from './image-manager.service'; @@ -13,18 +13,18 @@ import { environment } from 'environments/environment'; describe('ImageManagerService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; - let httpServer: HttpServer; + let httpServer: HttpController; let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, ImageManagerService], + providers: [HttpController, ImageManagerService], }); httpClient = TestBed.get(HttpClient); httpTestingController = TestBed.get(HttpTestingController); - httpServer = TestBed.get(HttpServer); + httpServer = TestBed.get(HttpController); controller = getTestServer(); // service = TestBed.inject(ImageManagerService); }); diff --git a/src/app/services/image-manager.service.ts b/src/app/services/image-manager.service.ts index f71ca275..fc552ccc 100644 --- a/src/app/services/image-manager.service.ts +++ b/src/app/services/image-manager.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import{ Controller } from '../models/controller'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; import { Observable } from 'rxjs'; import { Image } from "../models/images"; import { environment } from 'environments/environment'; @@ -10,7 +10,7 @@ import { environment } from 'environments/environment'; }) export class ImageManagerService { - constructor(private httpServer: HttpServer) { } + constructor(private httpServer: HttpController) { } getImages(controller:Controller ) { return this.httpServer.get(controller, '/images') as Observable; diff --git a/src/app/services/ios.service.ts b/src/app/services/ios.service.ts index cb023311..582b0c80 100644 --- a/src/app/services/ios.service.ts +++ b/src/app/services/ios.service.ts @@ -4,11 +4,11 @@ import { Observable } from 'rxjs'; import { IosImage } from '../models/images/ios-image'; import{ Controller } from '../models/controller'; import { IosTemplate } from '../models/templates/ios-template'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; @Injectable() export class IosService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpController) {} getImages(controller:Controller ): Observable { return this.httpServer.get(controller, '/images?image_type=ios') as Observable; diff --git a/src/app/services/iou.service.ts b/src/app/services/iou.service.ts index 8917e2ab..c85e6f12 100644 --- a/src/app/services/iou.service.ts +++ b/src/app/services/iou.service.ts @@ -4,11 +4,11 @@ import { Observable } from 'rxjs'; import { IouImage } from '../models/iou/iou-image'; import{ Controller } from '../models/controller'; import { IouTemplate } from '../models/templates/iou-template'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; @Injectable() export class IouService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpController) {} getTemplates(controller:Controller ): Observable { return this.httpServer.get(controller, '/templates') as Observable; diff --git a/src/app/services/link.service.spec.ts b/src/app/services/link.service.spec.ts index 38bc8357..1e172393 100644 --- a/src/app/services/link.service.spec.ts +++ b/src/app/services/link.service.spec.ts @@ -6,25 +6,25 @@ import { Node } from '../cartography/models/node'; import { Port } from '../models/port'; import{ Controller } from '../models/controller'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; import { LinkService } from './link.service'; import { getTestServer } from './testing'; describe('LinkService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; - let httpServer: HttpServer; + let httpServer: HttpController; let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, LinkService], + providers: [HttpController, LinkService], }); httpClient = TestBed.get(HttpClient); httpTestingController = TestBed.get(HttpTestingController); - httpServer = TestBed.get(HttpServer); + httpServer = TestBed.get(HttpController); controller = getTestServer(); }); diff --git a/src/app/services/link.service.ts b/src/app/services/link.service.ts index 535616a1..5435eaaf 100644 --- a/src/app/services/link.service.ts +++ b/src/app/services/link.service.ts @@ -7,11 +7,11 @@ import { Link } from '../models/link'; import { LinkNode } from '../models/link-node'; import { Port } from '../models/port'; import{ Controller } from '../models/controller'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; @Injectable() export class LinkService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpController) {} createLink( controller:Controller , diff --git a/src/app/services/login.service.ts b/src/app/services/login.service.ts index 4a3d93cc..62b807a2 100644 --- a/src/app/services/login.service.ts +++ b/src/app/services/login.service.ts @@ -2,13 +2,13 @@ import { HttpHeaders, HttpParams } from '@angular/common/http'; import { Injectable } from '@angular/core'; import 'rxjs/add/operator/map'; import{ Controller } from '../models/controller'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; import { AuthResponse } from '../models/authResponse'; @Injectable() export class LoginService { controller_id:string ='' - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpController) {} login(controller:Controller , username: string, password: string) { const payload = new HttpParams() diff --git a/src/app/services/node.service.spec.ts b/src/app/services/node.service.spec.ts index 8046a59b..2f5fdb39 100644 --- a/src/app/services/node.service.spec.ts +++ b/src/app/services/node.service.spec.ts @@ -8,14 +8,14 @@ import { Project } from '../models/project'; import{ Controller } from '../models/controller'; import { Template } from '../models/template'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; import { NodeService } from './node.service'; import { getTestServer } from './testing'; describe('NodeService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; - let httpServer: HttpServer; + let httpServer: HttpController; let service: NodeService; let controller:Controller ; @@ -23,14 +23,14 @@ describe('NodeService', () => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], providers: [ - HttpServer, + HttpController, NodeService, ], }); httpClient = TestBed.get(HttpClient); httpTestingController = TestBed.get(HttpTestingController); - httpServer = TestBed.get(HttpServer); + httpServer = TestBed.get(HttpController); service = TestBed.get(NodeService); controller = getTestServer(); }); diff --git a/src/app/services/node.service.ts b/src/app/services/node.service.ts index 15c93e3a..783e1a25 100644 --- a/src/app/services/node.service.ts +++ b/src/app/services/node.service.ts @@ -6,11 +6,11 @@ import { Node } from '../cartography/models/node'; import { Project } from '../models/project'; import{ Controller } from '../models/controller'; import { Template } from '../models/template'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; @Injectable() export class NodeService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpController) {} getNodeById(controller:Controller , projectId: string, nodeId: string) { return this.httpServer.get(controller, `/projects/${projectId}/nodes/${nodeId}`); diff --git a/src/app/services/project.service.spec.ts b/src/app/services/project.service.spec.ts index 92562fa0..64622c10 100644 --- a/src/app/services/project.service.spec.ts +++ b/src/app/services/project.service.spec.ts @@ -6,7 +6,7 @@ import { of } from 'rxjs'; import { Project } from '../models/project'; import{ Controller } from '../models/controller'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; import { ProjectService } from './project.service'; import { RecentlyOpenedProjectService } from './recentlyOpenedProject.service'; import { SettingsService } from './settings.service'; @@ -63,7 +63,7 @@ export class MockedProjectService { describe('ProjectService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; - let httpServer: HttpServer; + let httpServer: HttpController; let service: ProjectService; let controller:Controller ; let settingsService: SettingsService; @@ -72,7 +72,7 @@ describe('ProjectService', () => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], providers: [ - HttpServer, + HttpController, ProjectService, RecentlyOpenedProjectService, { provide: SettingsService }, @@ -81,7 +81,7 @@ describe('ProjectService', () => { httpClient = TestBed.get(HttpClient); httpTestingController = TestBed.get(HttpTestingController); - httpServer = TestBed.get(HttpServer); + httpServer = TestBed.get(HttpController); service = TestBed.get(ProjectService); settingsService = TestBed.get(SettingsService); diff --git a/src/app/services/project.service.ts b/src/app/services/project.service.ts index f0d5f6e3..b7b0e244 100644 --- a/src/app/services/project.service.ts +++ b/src/app/services/project.service.ts @@ -6,7 +6,7 @@ import { Node } from '../cartography/models/node'; import { Link } from '../models/link'; import { Project } from '../models/project'; import{ Controller } from '../models/controller'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; import { RecentlyOpenedProjectService } from './recentlyOpenedProject.service'; import { SettingsService } from './settings.service'; @@ -34,7 +34,7 @@ export class ProjectService { public projectListSubject = new Subject(); constructor( - private httpServer: HttpServer, + private httpServer: HttpController, private settingsService: SettingsService, private recentlyOpenedProjectService: RecentlyOpenedProjectService ) {} diff --git a/src/app/services/qemu.service.spec.ts b/src/app/services/qemu.service.spec.ts index 1355f663..fee12436 100644 --- a/src/app/services/qemu.service.spec.ts +++ b/src/app/services/qemu.service.spec.ts @@ -5,25 +5,25 @@ import { environment } from 'environments/environment'; import{ Controller } from '../models/controller'; import { QemuTemplate } from '../models/templates/qemu-template'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; import { QemuService } from './qemu.service'; import { getTestServer } from './testing'; describe('QemuService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; - let httpServer: HttpServer; + let httpServer: HttpController; let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, QemuService], + providers: [HttpController, QemuService], }); httpClient = TestBed.get(HttpClient); httpTestingController = TestBed.get(HttpTestingController); - httpServer = TestBed.get(HttpServer); + httpServer = TestBed.get(HttpController); controller = getTestServer(); }); diff --git a/src/app/services/qemu.service.ts b/src/app/services/qemu.service.ts index d73b2d69..b4f1f78a 100644 --- a/src/app/services/qemu.service.ts +++ b/src/app/services/qemu.service.ts @@ -5,11 +5,11 @@ import { QemuImage } from '../models/qemu/qemu-image'; import { QemuImg } from '../models/qemu/qemu-img'; import{ Controller } from '../models/controller'; import { QemuTemplate } from '../models/templates/qemu-template'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; @Injectable() export class QemuService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpController) {} getTemplates(controller:Controller ): Observable { return this.httpServer.get(controller, '/templates') as Observable; diff --git a/src/app/services/snapshot.service.spec.ts b/src/app/services/snapshot.service.spec.ts index 9e655622..726a4a07 100644 --- a/src/app/services/snapshot.service.spec.ts +++ b/src/app/services/snapshot.service.spec.ts @@ -5,26 +5,26 @@ import { environment } from 'environments/environment'; import{ Controller } from '../models/controller'; import { Snapshot } from '../models/snapshot'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; import { SnapshotService } from './snapshot.service'; import { getTestServer } from './testing'; describe('SnapshotService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; - let httpServer: HttpServer; + let httpServer: HttpController; let service: SnapshotService; let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, HttpClient,SnapshotService], + providers: [HttpController, HttpClient,SnapshotService], }); httpClient = TestBed.get(HttpClient); httpTestingController = TestBed.get(HttpTestingController); - httpServer = TestBed.get(HttpServer); + httpServer = TestBed.get(HttpController); service = TestBed.get(SnapshotService); controller = getTestServer(); }); diff --git a/src/app/services/snapshot.service.ts b/src/app/services/snapshot.service.ts index 7b6f8936..63011bde 100644 --- a/src/app/services/snapshot.service.ts +++ b/src/app/services/snapshot.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import{ Controller } from '../models/controller'; import { Snapshot } from '../models/snapshot'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; @Injectable() export class SnapshotService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpController) {} create(controller:Controller , project_id: string, snapshot: Snapshot) { return this.httpServer.post(controller, `/projects/${project_id}/snapshots`, snapshot); diff --git a/src/app/services/symbol.service.spec.ts b/src/app/services/symbol.service.spec.ts index d7712297..f482a751 100644 --- a/src/app/services/symbol.service.spec.ts +++ b/src/app/services/symbol.service.spec.ts @@ -6,25 +6,25 @@ import { of } from 'rxjs'; import{ Controller } from '../models/controller'; import { Symbol } from '../models/symbol'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; import { SymbolService } from './symbol.service'; import { getTestServer } from './testing'; describe('SymbolService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; - let httpServer: HttpServer; + let httpServer: HttpController; let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, SymbolService], + providers: [HttpController, SymbolService], }); httpClient = TestBed.get(HttpClient); httpTestingController = TestBed.get(HttpTestingController); - httpServer = TestBed.get(HttpServer); + httpServer = TestBed.get(HttpController); controller = getTestServer(); }); diff --git a/src/app/services/symbol.service.ts b/src/app/services/symbol.service.ts index ed08bdc6..a3e4400b 100644 --- a/src/app/services/symbol.service.ts +++ b/src/app/services/symbol.service.ts @@ -5,7 +5,7 @@ import { shareReplay } from 'rxjs/operators'; import { Node } from '../cartography/models/node'; import{ Controller } from '../models/controller'; import { Symbol } from '../models/symbol'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; import { environment } from 'environments/environment'; const CACHE_SIZE = 1; @@ -16,7 +16,7 @@ export class SymbolService { private cache: Observable; private maximumSymbolSize: number = 80; - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpController) {} getMaximumSymbolSize() { return this.maximumSymbolSize; diff --git a/src/app/services/template.service.spec.ts b/src/app/services/template.service.spec.ts index 3f3c7b6f..46232238 100644 --- a/src/app/services/template.service.spec.ts +++ b/src/app/services/template.service.spec.ts @@ -4,7 +4,7 @@ import { TestBed } from '@angular/core/testing'; import { environment } from 'environments/environment'; import{ Controller } from '../models/controller'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; import { TemplateService } from './template.service'; describe('TemplateService', () => { @@ -15,7 +15,7 @@ describe('TemplateService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [TemplateService, HttpServer, HttpClient], + providers: [TemplateService, HttpController, HttpClient], }); httpClient = TestBed.get(HttpClient); diff --git a/src/app/services/template.service.ts b/src/app/services/template.service.ts index 1e5ce83e..823bad9c 100644 --- a/src/app/services/template.service.ts +++ b/src/app/services/template.service.ts @@ -3,13 +3,13 @@ import { Observable, Subject } from 'rxjs'; import 'rxjs/add/operator/map'; import{ Controller } from '../models/controller'; import { Template } from '../models/template'; -import { HttpServer } from './http-server.service'; +import { HttpController } from './http-controller.service'; @Injectable() export class TemplateService { public newTemplateCreated: Subject