restored the initial branch state

Author: janniclas

app/controllers/SystemInfoController.scala

@@ -21,14 +21,21 @@
  import java.net.InetAddress
 
  import javax.inject.Inject
+ import models.SystemInfo
+ import play.api.libs.json.Json
  import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
  import play.core.PlayVersion
- import play.api.libs.json.Json
+
 
  class SystemInfoController @Inject()(val controllerComponents: ControllerComponents) extends BaseController {
+   implicit val systemInfoWrites = Json.writes[SystemInfo]
+   implicit val systemInfoReads = Json.reads[SystemInfo]
 
   def getInfo: Action[AnyContent] = Action {
-    Ok(Json.obj("hostName" -> getHostName(), "javaVersion" -> getJvmVersion(), "platformName" -> getPlatformName(), "scalaVersion" -> getScalaVersion()))
+
+    val info = SystemInfo(hostName = getHostName(), javaVersion = getJvmVersion(), platformName = getPlatformName(), scalaVersion = getScalaVersion())
+    val infoJson = Json.toJson(info)
+    Ok(infoJson)
   }
 
    private def getJvmVersion(): String = {
@@ -39,21 +46,21 @@
 
 
 
-     private def getHostName(): String = {
+   private def getHostName(): String = {
        InetAddress.getLocalHost().getHostName()
-     }
+   }
 
 
-    private def getPlatformName(): String = {
+   private def getPlatformName(): String = {
        val os = "os.name";
        val version = "os.version";
        val osVersion: String = System.getProperty(os) + " " + System.getProperty(version)
        osVersion
-     }
+   }
 
 
    private def getScalaVersion(): String = {
        PlayVersion.current
-     }
+   }
 
  }

app/models/SystemInfo.scala

@@ -1,5 +1,21 @@
-package models
+/*
+ * Copyright (C) 2018 The Delphi Team.
+ * See the LICENCE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-class SystemInfo {
+package models
 
-}
+case class SystemInfo(hostName: String, javaVersion: String, platformName: String, scalaVersion: String)

client/package.json

@@ -11,8 +11,8 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^6.1.4",
-    "@angular/cdk": "^6.4.6",
+    "@angular/animations": "github:angular/animations-builds",
+    "@angular/cdk": "github:angular/cdk-builds",
     "@angular/common": "^6.1.4",
     "@angular/compiler": "^6.1.4",
     "@angular/core": "^6.1.4",
@@ -27,6 +27,7 @@
     "core-js": "^2.5.4",
     "font-awesome": "^4.7.0",
     "jquery": "^3.3.1",
+    "material-design-icons": "^3.0.1",
     "popper.js": "^1.14.4",
     "rxjs": "^6.2.2",
     "rxjs-compat": "^6.2.2",

client/src/app/api/api/api.service.ts

@@ -23,7 +23,7 @@ import {Configuration} from '../configuration';
 import {BASE_PATH, INSTANCES, NUMBER_OF_INSTANCES, SYS_INFO} from '../variables';
 import {CustomHttpUrlEncodingCodec} from '../encoder';
 import {Instance} from '..';
-import {SysInfo} from "../model/sysInfo";
+import {SysInfo} from '../model/sysInfo';
 
 
 @Injectable({

client/src/app/api/configuration.ts

@@ -50,11 +50,11 @@ export class Configuration {
      * @returns {string} the selected content-type or <code>undefined</code> if no selection could be made.
      */
     public selectHeaderContentType (contentTypes: string[]): string | undefined {
-        if (contentTypes.length == 0) {
+        if (contentTypes.length === 0) {
             return undefined;
         }
 
-        let type = contentTypes.find(x => this.isJsonMime(x));
+        const type = contentTypes.find(x => this.isJsonMime(x));
         if (type === undefined) {
             return contentTypes[0];
         }
@@ -69,11 +69,11 @@ export class Configuration {
      * @returns {string} the selected content-type or <code>undefined</code> if no selection could be made.
      */
     public selectHeaderAccept(accepts: string[]): string | undefined {
-        if (accepts.length == 0) {
+        if (accepts.length === 0) {
             return undefined;
         }
 
-        let type = accepts.find(x => this.isJsonMime(x));
+        const type = accepts.find(x => this.isJsonMime(x));
         if (type === undefined) {
             return accepts[0];
         }

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

@@ -17,29 +17,26 @@
  */
 
 import { TestBed, async } from '@angular/core/testing';
+import { Router, RouterOutlet } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { AppComponent } from './app.component';
+
+class MockRouter { public navigate() {} }
+
 describe('AppComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [
         AppComponent
       ],
+      providers: [{provide: Router, useClass: MockRouter },
+            RouterOutlet],
+      imports: [ RouterTestingModule ]
     }).compileComponents();
   }));
   it('should create the app', async(() => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
     expect(app).toBeTruthy();
   }));
-  it(`should have as title 'client'`, async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('client');
-  }));
-  it('should render title in a h1 tag', async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    fixture.detectChanges();
-    const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('h1').textContent).toContain('Welcome to client!');
-  }));
 });

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

@@ -16,17 +16,28 @@
  * limitations under the License.
  */
 
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { async, ComponentFixture, TestBed, inject } from '@angular/core/testing';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { HttpClientModule, HttpClient } from '@angular/common/http';
+import { BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import { MatTableModule, MatInputModule} from '@angular/material';
+import { MatFormFieldModule} from '@angular/material/form-field';
+import { MatCheckboxModule} from '@angular/material/checkbox';
+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 '../../api';
 
 describe('CrawlerComponent', () => {
   let component: CrawlerComponent;
   let fixture: ComponentFixture<CrawlerComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ CrawlerComponent ]
+      declarations: [ CrawlerComponent, TableAllComponent],
+      imports: [HttpClientTestingModule, HttpClientModule, BrowserAnimationsModule,
+         MatTableModule, MatInputModule, MatFormFieldModule, MatCheckboxModule, MatIconModule, MatDialogModule]
     })
     .compileComponents();
   }));
@@ -37,7 +48,8 @@ describe('CrawlerComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+  it(`should create`, async(inject([HttpTestingController, ApiService],
+    (httpClient: HttpTestingController, apiService: ApiService) => {
+      expect(apiService).toBeTruthy();
+  })));
 });

client/src/app/dashboard/dashboard-card/dashboard-card.component.spec.ts

@@ -17,7 +17,8 @@
  */
 
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { Router, RouterOutlet } from "@angular/router";
+import { RouterModule } from '@angular/router';
 import { DashboardCardComponent } from './dashboard-card.component';
 
 describe('DashboardCardComponent', () => {
@@ -26,7 +27,10 @@ describe('DashboardCardComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ DashboardCardComponent ]
+      declarations: [ DashboardCardComponent ],
+       providers: [{provide: Router},
+            RouterOutlet],
+      imports: [RouterModule]
     })
     .compileComponents();
   }));

client/src/app/dashboard/dashboard-overview/dashboard-overview.component.spec.ts

@@ -17,6 +17,11 @@
  */
 
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import {Instance} from "../../api";
+import { HttpClientModule } from '@angular/common/http';
+import { StatusCardComponent } from '../status-card/status-card.component';
+import { DashboardCardComponent } from '../dashboard-card/dashboard-card.component';
+import { RouterModule } from '@angular/router';
 import { DashboardOverviewComponent } from './dashboard-overview.component';
 
 describe('DashboardOverviewComponent', () => {
@@ -25,7 +30,8 @@ describe('DashboardOverviewComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ DashboardOverviewComponent ]
+      declarations: [ DashboardOverviewComponent, DashboardCardComponent, StatusCardComponent ],
+      imports: [RouterModule, HttpClientModule]
     })
     .compileComponents();
   }));

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

@@ -17,16 +17,23 @@
  */
 
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { Router, RouterOutlet } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { HeaderComponent } from './header/header.component';
 import { DashboardComponent } from './dashboard.component';
 
+class MockRouter { public navigate() {} }
+
 describe('DashboardComponent', () => {
   let component: DashboardComponent;
   let fixture: ComponentFixture<DashboardComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ DashboardComponent ]
+      declarations: [ DashboardComponent, HeaderComponent],
+      providers: [{provide: Router, useClass: MockRouter },
+            RouterOutlet],
+      imports: [ RouterTestingModule ]
     })
     .compileComponents();
   }));