updated test cases to fit new modelservice

Author: janniclas

client/src/app/dashboard/add-dialog/add-dialog.component.spec.ts

@@ -40,12 +40,6 @@ describe('AddDialogComponent', () => {
     fixture.detectChanges();
   });
 
-
-  it(`should create Add dialog Component`, async(inject([HttpTestingController, ApiService],
-    (httpClient: HttpTestingController, apiService: ApiService) => {
-      expect(apiService).toBeTruthy();
-    })));
-
     it('should check for confirm button inside the Add dialog', () => {
       component.onConfirmAddInstance();
       expect(mockDialogRef.close).toHaveBeenCalled();

client/src/app/dashboard/crawler/crawler.component.spec.ts

@@ -27,11 +27,10 @@ import { MatIconModule} from '@angular/material/icon';
 import { MatDialogModule} from '@angular/material/dialog';
 import { TableAllComponent } from '../table-all/table-all.component';
 import { CrawlerComponent } from './crawler.component';
-import { ApiService } from 'src/app/api/api/api.service';
+import { ModelService } from 'src/app/model/model.service';
 
 
 describe('CrawlerComponent', () => {
-  let component: CrawlerComponent;
   let fixture: ComponentFixture<CrawlerComponent>;
 
   beforeEach(async(() => {
@@ -45,12 +44,11 @@ describe('CrawlerComponent', () => {
 
   beforeEach(() => {
     fixture = TestBed.createComponent(CrawlerComponent);
-    component = fixture.componentInstance;
     fixture.detectChanges();
   });
 
-  it(`should create`, async(inject([HttpTestingController, ApiService],
-    (httpClient: HttpTestingController, apiService: ApiService) => {
-      expect(apiService).toBeTruthy();
+  it(`should create`, async(inject([HttpTestingController, ModelService],
+    (modelService: ModelService) => {
+      expect(modelService).toBeTruthy();
   })));
 });

client/src/app/dashboard/crawler/crawler.component.ts

@@ -17,8 +17,8 @@
  */
 
 import {Component, OnInit} from '@angular/core';
-import { Instance, ComponentType} from '../../model/models/instance';
-import { ModelService, InstanceChange } from 'src/app/model/model.service';
+import { Instance, ComponentType, ComponentTypeEnum} from '../../model/models/instance';
+import { ModelService } from 'src/app/model/model.service';
 
 
 @Component({
@@ -38,7 +38,7 @@ export class CrawlerComponent implements OnInit {
 
   ngOnInit() {
     this.modelService.getObservableForInstances().subscribe(() => {
-      this.tableData = this.modelService.getComponentsByType(this.compType);
+      this.tableData = this.modelService.getComponentsByType(ComponentTypeEnum.Crawler);
     });
   }
 

client/src/app/dashboard/webapi/web-api.component.spec.ts

@@ -22,8 +22,8 @@ import { HttpClientModule } from '@angular/common/http';
 import { BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import { TableAllComponent } from '../table-all/table-all.component';
 import { WebApiComponent } from './web-api.component';
-import { ApiService } from '../../api/api/api.service';
 import { MaterialModule } from 'src/app/material-module/material.module';
+import { ModelService } from 'src/app/model/model.service';
 
 
 describe('WebApiComponent', () => {
@@ -43,8 +43,8 @@ describe('WebApiComponent', () => {
     fixture.detectChanges();
   });
 
-  it(`should create`, async(inject([HttpTestingController, ApiService],
-    (apiService: ApiService) => {
-      expect(apiService).toBeTruthy();
+  it(`should create`, async(inject([HttpTestingController, ModelService],
+    (modelService: ModelService) => {
+      expect(modelService).toBeTruthy();
   })));
 });

client/src/app/dashboard/webapp/webapp.component.spec.ts

@@ -22,8 +22,8 @@ import { HttpClientModule } from '@angular/common/http';
 import { BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import { TableAllComponent } from '../table-all/table-all.component';
 import { WebappComponent } from './webapp.component';
-import { ApiService } from 'src/app/api/api/api.service';
 import { MaterialModule } from 'src/app/material-module/material.module';
+import { ModelService } from 'src/app/model/model.service';
 
 
 describe('WebappComponent', () => {
@@ -43,8 +43,8 @@ describe('WebappComponent', () => {
     fixture.detectChanges();
   });
 
-  it(`should create`, async(inject([HttpTestingController, ApiService],
-    (httpClient: HttpTestingController, apiService: ApiService) => {
-      expect(apiService).toBeTruthy();
+  it(`should create`, async(inject([HttpTestingController, ModelService],
+    (modelService: ModelService) => {
+      expect(modelService).toBeTruthy();
   })));
 });

client/src/app/model/model.service.spec.ts

@@ -1,9 +1,18 @@
 import {TestBed} from '@angular/core/testing';
 
 import {ModelService} from './model.service';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { HttpClientModule } from '@angular/common/http';
 
 describe('ModelService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
+
+  beforeEach(() => {
+  TestBed.configureTestingModule({
+    imports: [HttpClientTestingModule, HttpClientModule],
+    providers: [ModelService],
+  });
+
+});
 
   it('should be created', () => {
     const service: ModelService = TestBed.get(ModelService);