adding tests

sonar-project.properties

 sonar.projectKey=xtss-catalogue
 sonar.sources=src
 sonar.sourceEncoding=UTF-8
-sonar.exclusions=**/node_modules/**,**/*.spec.ts
+sonar.exclusions=**/node_modules/**,**/*.spec.ts,src/environments/**,src/karma.conf.js,src/main.ts
 sonar.tests=src
 sonar.test.inclusions=**/*.spec.ts
 sonar.typescript.lcov.reportPaths=coverage/methods/lcov.info

src/app/header/header.component.spec.ts

@@ -2,6 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { HeaderComponent } from './header.component';
 import { HttpClientModule } from '@angular/common/http';
+import { LanguagesService } from '../languages.service';
 
 describe('HeaderComponent', () => {
   let component: HeaderComponent;
@@ -27,4 +28,11 @@ describe('HeaderComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  it('should set language', () => {
+    const languagesService: LanguagesService = TestBed.get(LanguagesService);
+    spyOn(languagesService, 'setLang').and.returnValue(null);
+    component.setLang('xxx');
+    expect(languagesService.setLang).toHaveBeenCalledWith('xxx');
+  });
 });

src/app/languages.service.spec.ts

 import { TestBed } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
 import { LanguagesService } from './languages.service';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
 
 describe('LanguagesService', () => {
   beforeEach(() => TestBed.configureTestingModule({
@@ -13,4 +13,28 @@ describe('LanguagesService', () => {
     const service: LanguagesService = TestBed.get(LanguagesService);
     expect(service).toBeTruthy();
   });
+
+  it('should set default lang with empty localStorage', () => {
+    const translateService: TranslateService = TestBed.get(TranslateService);
+    spyOn(translateService, 'setDefaultLang');
+    spyOn(window.localStorage, 'getItem').and.returnValue(undefined);
+    TestBed.get(LanguagesService);
+    expect(translateService.setDefaultLang).toHaveBeenCalledWith('est');
+  });
+
+  it('should set default lang from localStorage', () => {
+    const translateService: TranslateService = TestBed.get(TranslateService);
+    spyOn(translateService, 'setDefaultLang');
+    spyOn(window.localStorage, 'getItem').and.returnValue('ENG');
+    TestBed.get(LanguagesService);
+    expect(translateService.setDefaultLang).toHaveBeenCalledWith('eng');
+  });
+
+  it('should set language', () => {
+    const translateService: TranslateService = TestBed.get(TranslateService);
+    spyOn(translateService, 'use');
+    const service = TestBed.get(LanguagesService);
+    service.setLang('ENG');
+    expect(translateService.use).toHaveBeenCalledWith('eng');
+  });
 });

src/app/subsystem-list/search/search.component.spec.ts

@@ -3,10 +3,12 @@ import { TranslateModule } from '@ngx-translate/core';
 import { HttpClientModule } from '@angular/common/http';
 import { FormsModule } from '@angular/forms';
 import { SearchComponent } from './search.component';
+import { SubsystemsService } from 'src/app/subsystems.service';
 
 describe('SearchComponent', () => {
   let component: SearchComponent;
   let fixture: ComponentFixture<SearchComponent>;
+  let subsystemsService: SubsystemsService;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -21,6 +23,10 @@ describe('SearchComponent', () => {
   }));
 
   beforeEach(() => {
+    subsystemsService = TestBed.get(SubsystemsService);
+    spyOn(subsystemsService, 'setNonEmpty').and.returnValue(null);
+    spyOn(subsystemsService, 'setLimit').and.returnValue(null);
+    spyOn(subsystemsService, 'setFilter').and.returnValue(null);
     fixture = TestBed.createComponent(SearchComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
@@ -29,4 +35,19 @@ describe('SearchComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  it('setNonEmpty should work', () => {
+    component.setNonEmpty(true);
+    expect(subsystemsService.setNonEmpty).toHaveBeenCalledWith(true);
+  });
+
+  it('setLimit should work', () => {
+    component.setLimit('50');
+    expect(subsystemsService.setLimit).toHaveBeenCalledWith('50');
+  });
+
+  it('setFilter should work', () => {
+    component.setFilter('test');
+    expect(subsystemsService.setFilter).toHaveBeenCalledWith('test');
+  });
 });

src/app/subsystem-list/subsystem-item/subsystem-item.component.spec.ts

@@ -3,10 +3,15 @@ import { TranslateModule } from '@ngx-translate/core';
 import { HttpClientModule } from '@angular/common/http';
 import { SubsystemItemComponent } from './subsystem-item.component';
 import { RouterTestingModule } from '@angular/router/testing';
+import { SubsystemsService } from 'src/app/subsystems.service';
+import { Router } from '@angular/router';
+import { PREVIEW_SIZE } from '../../config';
+import { Method } from 'src/app/method';
 
 describe('SubsystemItemComponent', () => {
   let component: SubsystemItemComponent;
   let fixture: ComponentFixture<SubsystemItemComponent>;
+  let subsystemsService: SubsystemsService;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -17,29 +22,62 @@ describe('SubsystemItemComponent', () => {
         TranslateModule.forRoot(),
         HttpClientModule,
         RouterTestingModule
+      ],
+      providers: [
+        { provide: Router, useValue: {
+            navigateByUrl: jasmine.createSpy('navigateByUrl')
+        }}
       ]
+
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
+    subsystemsService = TestBed.get(SubsystemsService);
+    spyOn(subsystemsService, 'getApiUrlBase').and.returnValue(null);
+
     fixture = TestBed.createComponent(SubsystemItemComponent);
     component = fixture.componentInstance;
-
     component.subsystem = {
-      xRoadInstance: 'XRD',
+      xRoadInstance: 'INST',
       memberClass: 'CLASS',
       memberCode: 'CODE',
       subsystemCode: 'SUB',
       subsystemStatus: 'OK',
-      fullSubsystemName: 'XRD/CLASS/CODE/SUB',
+      fullSubsystemName: 'INST/CLASS/CODE/SUB',
       methods: []
     };
-
     fixture.detectChanges();
   });
 
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  it('getApiUrlBase should work', () => {
+    component.getApiUrlBase();
+    expect(subsystemsService.getApiUrlBase).toHaveBeenCalled();
+  });
+
+  it('should preview methods', () => {
+    expect(component.getMethodsPreview().length).toBe(0);
+    for (let i = 0; i < PREVIEW_SIZE + 10; i++) {
+      component.subsystem.methods.push(new Method());
+    }
+    expect(component.getMethodsPreview().length).toBe(PREVIEW_SIZE);
+  });
+
+  it('should calculate methods not in preview', () => {
+    expect(component.getNotInPreview()).toBe(0);
+    for (let i = 0; i < PREVIEW_SIZE + 10; i++) {
+      component.subsystem.methods.push(new Method());
+    }
+    expect(component.getNotInPreview()).toBe(10);
+  });
+
+  it('should go to detail view', () => {
+    component.showDetail();
+    expect(TestBed.get(Router).navigateByUrl).toHaveBeenCalledWith('/INST/CLASS/CODE/SUB');
+  });
 });

src/app/subsystem-list/subsystem-list.component.spec.ts

@@ -5,8 +5,10 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { SubsystemListComponent } from './subsystem-list.component';
 import { Component, Input } from '@angular/core';
 import { Subsystem } from '../subsystem';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router, Scroll } from '@angular/router';
 import { of } from 'rxjs';
+import { SubsystemsService } from '../subsystems.service';
+import { ViewportScroller } from '@angular/common';
 
 @Component({selector: 'app-header', template: ''})
 class HeaderStubComponent {}
@@ -20,6 +22,9 @@ class SubsystemItemStubComponent {
 describe('SubsystemListComponent', () => {
   let component: SubsystemListComponent;
   let fixture: ComponentFixture<SubsystemListComponent>;
+  let getInstanceSpy;
+  let getInstancesSpy;
+  let subsystemsService: SubsystemsService;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -31,24 +36,85 @@ describe('SubsystemListComponent', () => {
       ],
       imports: [
         TranslateModule.forRoot(),
-        HttpClientModule,
-        RouterTestingModule
+        HttpClientModule
+      ],
+      providers: [
+        { provide: ActivatedRoute, useValue: {
+          params: of({
+            instance: 'INST'
+          })
+        }},
+        { provide: Router, useValue: {
+            events: of(new Scroll(null, [11, 12], null)),
+            navigateByUrl: jasmine.createSpy('navigateByUrl')
+        }}
       ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    // Mocks and spies
-    TestBed.get(ActivatedRoute).params = of({
-      instance: 'EE'
-    });
+    subsystemsService = TestBed.get(SubsystemsService);
+    getInstanceSpy = spyOn(subsystemsService, 'getInstance').and.returnValue('INST');
+    getInstancesSpy = spyOn(subsystemsService, 'getInstances').and.returnValue(['INST']);
+    spyOn(TestBed.get(ViewportScroller), 'scrollToPosition');
+    spyOn(subsystemsService, 'setInstance').and.returnValue(null);
+    spyOn(subsystemsService, 'getDefaultInstance').and.returnValue('DEFINST');
+    spyOn(TestBed.get(SubsystemsService), 'getApiUrlBase').and.returnValue('base');
+  });
+
+  it('should create', () => {
     fixture = TestBed.createComponent(SubsystemListComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
+    expect(component).toBeTruthy();
   });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
+  it('should redirect on incorrect instance', () => {
+    getInstancesSpy.and.returnValue(['XXX']);
+    fixture = TestBed.createComponent(SubsystemListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    expect(TestBed.get(Router).navigateByUrl).toHaveBeenCalledWith('/DEFINST');
+  });
+
+  it('should detect when instance is not selected', () => {
+    getInstanceSpy.and.returnValue('');
+    fixture = TestBed.createComponent(SubsystemListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    expect(subsystemsService.setInstance).toHaveBeenCalledWith('INST');
+  });
+
+  it('should detect change instance', () => {
+    getInstanceSpy.and.returnValue('INST2');
+    getInstancesSpy.and.returnValue(['INST', 'INST2']);
+    fixture = TestBed.createComponent(SubsystemListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    expect(subsystemsService.setInstance).toHaveBeenCalledWith('INST');
+  });
+
+  it('should scroll to position', () => {
+    fixture = TestBed.createComponent(SubsystemListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    expect(TestBed.get(ViewportScroller).scrollToPosition).toHaveBeenCalledWith([11, 12]);
+  });
+
+  it('switchInstance should work', () => {
+    fixture = TestBed.createComponent(SubsystemListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    component.switchInstance('NEWINST');
+    expect(TestBed.get(Router).navigateByUrl).toHaveBeenCalledWith('/NEWINST');
+  });
+
+  it('should receive service warnings', () => {
+    fixture = TestBed.createComponent(SubsystemListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    subsystemsService.warnings.emit('WARN');
+    expect(component.message).toBe('WARN');
   });
 });

src/app/subsystem-list/subsystem-list.component.ts

@@ -73,7 +73,7 @@ export class SubsystemListComponent implements OnInit, AfterViewInit, OnDestroy
       }
       // Only reload on switching of instance or when no instance is selected yet on service side
       if (this.getInstance() === '' || this.getInstance() !== params.instance) {
-        this.subsystemsService.setInstance(params.instance ? params.instance : this.subsystemsService.getDefaultInstance());
+        this.subsystemsService.setInstance(params.instance);
       }
     });
   }

src/app/subsystem/subsystem.component.spec.ts

 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { Component } from '@angular/core';
+import { Component, EventEmitter } from '@angular/core';
 import { SubsystemComponent } from './subsystem.component';
-import { RouterTestingModule } from '@angular/router/testing';
 import { HttpClientModule } from '@angular/common/http';
-// import { ViewportScroller } from '@angular/common';
-// import { SubsystemsService } from '../methods.service';
-import { ActivatedRoute } from '@angular/router';
-import { of } from 'rxjs';
+import { Router, ActivatedRoute, Scroll } from '@angular/router';
+import { of, BehaviorSubject } from 'rxjs';
+import { SubsystemsService } from '../subsystems.service';
+import { ViewportScroller } from '@angular/common';
 
 @Component({selector: 'app-header', template: ''})
 class HeaderStubComponent {}
@@ -15,6 +14,9 @@ class HeaderStubComponent {}
 describe('SubsystemComponent', () => {
   let component: SubsystemComponent;
   let fixture: ComponentFixture<SubsystemComponent>;
+  let getInstanceSpy;
+  let getInstancesSpy;
+  let subsystemsService: SubsystemsService;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -24,40 +26,114 @@ describe('SubsystemComponent', () => {
       ],
       imports: [
         TranslateModule.forRoot(),
-        HttpClientModule,
-        RouterTestingModule
-      ]/*,
+        HttpClientModule
+      ],
       providers: [
-        SubsystemsService
-      ]*/
+        { provide: ActivatedRoute, useValue: {
+          params: of({
+            instance: 'INST',
+            class: 'CLASS',
+            member: 'MEMBER',
+            subsystem: 'SYSTEM'
+          })
+        }},
+        { provide: Router, useValue: {
+            events: of(new Scroll(null, [11, 12], null)),
+            navigateByUrl: jasmine.createSpy('navigateByUrl')
+        }}
+      ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    // Mocks and spies
-    TestBed.get(ActivatedRoute).params = of({
-      instance: 'EE',
-      class: 'CLASS',
-      member: 'MEMBER',
-      subsystem: 'SYSTEM'
-    });
-    // spyOn(TestBed.get(ViewportScroller), "scrollToPosition").and.callFake(() => {});
+    subsystemsService = TestBed.get(SubsystemsService);
+    getInstanceSpy = spyOn(subsystemsService, 'getInstance').and.returnValue('INST');
+    getInstancesSpy = spyOn(subsystemsService, 'getInstances').and.returnValue(['INST']);
+    spyOn(TestBed.get(ViewportScroller), 'scrollToPosition');
+    spyOn(subsystemsService, 'setInstance').and.returnValue(null);
+    spyOn(TestBed.get(SubsystemsService), 'getApiUrlBase').and.returnValue('base');
+    subsystemsService.subsystemsSubject = new BehaviorSubject([
+      {
+        memberClass: '',
+        subsystemCode: '',
+        xRoadInstance: '',
+        subsystemStatus: '',
+        memberCode: '',
+        fullSubsystemName: 'INST/CLASS/MEMBER/SYSTEM',
+        methods: []
+      }
+    ]);
+  });
 
+  it('should create', () => {
     fixture = TestBed.createComponent(SubsystemComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
+    expect(component).toBeTruthy();
   });
 
-  /*afterEach(() => {
-    TestBed.resetTestEnvironment()
-  });*/
+  it('should detect incorrect instance', () => {
+    getInstancesSpy.and.returnValue(['XXX']);
+    fixture = TestBed.createComponent(SubsystemComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    expect(component.message).toBe('Incorrect instance!');
+  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
+  it('should detect when instance is not selected', () => {
+    getInstanceSpy.and.returnValue('');
+    fixture = TestBed.createComponent(SubsystemComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    expect(subsystemsService.setInstance).toHaveBeenCalledWith('INST');
+  });
+
+  it('should detect change instance', () => {
+    getInstanceSpy.and.returnValue('INST2');
+    getInstancesSpy.and.returnValue(['INST', 'INST2']);
+    fixture = TestBed.createComponent(SubsystemComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    expect(subsystemsService.setInstance).toHaveBeenCalledWith('INST');
+  });
+
+  it('should detect incorrect subsystem', () => {
+    subsystemsService.subsystemsSubject = new BehaviorSubject([]);
+    fixture = TestBed.createComponent(SubsystemComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    expect(component.message).toBe('Subsystem "INST/CLASS/MEMBER/SYSTEM" cannot be found!');
   });
 
-  /*it('scrollToPosition was called', async(() => {
-    expect(TestBed.get(ViewportScroller).scrollToPosition).toHaveBeenCalledWith([0, 0])
-  }));*/
+  it('should scroll to position', () => {
+    fixture = TestBed.createComponent(SubsystemComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    expect(TestBed.get(ViewportScroller).scrollToPosition).toHaveBeenCalledWith([11, 12]);
+  });
+
+  it('getApiUrlBase should work', () => {
+    fixture = TestBed.createComponent(SubsystemComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    component.getApiUrlBase();
+    expect(subsystemsService.getApiUrlBase).toHaveBeenCalled();
+  });
+
+  it('goToList should work', () => {
+    fixture = TestBed.createComponent(SubsystemComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    component.goToList();
+    expect(TestBed.get(Router).navigateByUrl).toHaveBeenCalledWith('/INST');
+  });
+
+  it('should receive service warnings', () => {
+    fixture = TestBed.createComponent(SubsystemComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    subsystemsService.warnings.emit('WARN');
+    expect(component.message).toBe('WARN');
+  });
 });

src/app/subsystem/subsystem.component.ts

@@ -67,17 +67,20 @@ export class SubsystemComponent implements OnInit, AfterViewInit, OnDestroy {
     this.routeSubscription = this.route.params.subscribe( params => {
       // Checking if instance is correct
       if (!this.subsystemsService.getInstances().includes(params.instance)) {
+        // TODO: translation!
         this.message = 'Incorrect instance!';
         return;
       }
       this.subsystemId = params.instance + '/' + params.class + '/' + params.member + '/' + params.subsystem;
       // Only reload on switching of instance or when no instance is selected yet on service side
       if (this.getInstance() === '' || this.getInstance() !== params.instance) {
-        this.subsystemsService.setInstance(params.instance ? params.instance : this.subsystemsService.getDefaultInstance());
+        // this.subsystemsService.setInstance(params.instance ? params.instance : this.subsystemsService.getDefaultInstance());
+        this.subsystemsService.setInstance(params.instance);
       }
       this.subsystemsSubscription = this.subsystemsService.subsystemsSubject.subscribe(subsystems => {
         const subsystem = this.getSubsystem(subsystems, this.subsystemId);
         if (!subsystem && !this.message) {
+          // TODO: translation!
           this.message = 'Subsystem "' + this.subsystemId + '" cannot be found!';
         } else {
           this.subsystemSubject.next(subsystem);
@@ -96,10 +99,26 @@ export class SubsystemComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngOnDestroy() {
-    this.routerScrollSubscription.unsubscribe();
+    // TODO: optimize this...
+    if (this.routerScrollSubscription) {
+      this.routerScrollSubscription.unsubscribe();
+    }
+    if (this.routeSubscription) {
+      this.routeSubscription.unsubscribe();
+    }
+    if (this.warningsSubscription) {
+      this.warningsSubscription.unsubscribe();
+    }
+    if (this.scrollSubjectSubscription) {
+      this.scrollSubjectSubscription.unsubscribe();
+    }
+    if (this.subsystemsSubscription) {
+      this.subsystemsSubscription.unsubscribe();
+    }
+    /*this.routerScrollSubscription.unsubscribe();
     this.routeSubscription.unsubscribe();
     this.warningsSubscription.unsubscribe();
     this.scrollSubjectSubscription.unsubscribe();
-    this.subsystemsSubscription.unsubscribe();
+    this.subsystemsSubscription.unsubscribe();*/
   }
 }

src/app/subsystems.service.spec.ts

 import { TestBed } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { TranslateModule } from '@ngx-translate/core';
 import { SubsystemsService } from './subsystems.service';
-import { HttpClient, HttpClientModule } from '@angular/common/http';
-import { HttpLoaderFactory } from './app.module';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { HttpClient } from '@angular/common/http';
 
 describe('SubsystemsService', () => {
+  let service: SubsystemsService;
+  let httpClient: HttpClient;
+  let httpTestingController: HttpTestingController;
+
   beforeEach(() => TestBed.configureTestingModule({
     imports: [
-      TranslateModule.forRoot({
-        loader: {
-            provide: TranslateLoader,
-            useFactory: HttpLoaderFactory,
-            deps: [HttpClient]
-          }
-      }),
-      HttpClientModule
+      TranslateModule.forRoot(),
+      HttpClientTestingModule
     ]
   }));
 
+  beforeEach(() => {
+    httpClient = TestBed.get(HttpClient);
+    httpTestingController = TestBed.get(HttpTestingController);
+    service = TestBed.get(SubsystemsService);
+  });
+
   it('should be created', () => {
-    const service: SubsystemsService = TestBed.get(SubsystemsService);
     expect(service).toBeTruthy();
   });
+
+  /*it('should set instance', () => {
+    service.setInstance('EE');
+    // expect(service).toBeTruthy();
+    // httpTestingController.expectOne('https://x-tee.ee/catalogue/EE/wsdls/index.json');
+  });*/
 });

src/app/subsystems.service.ts

@@ -19,7 +19,7 @@ export class SubsystemsService {
   filteredSubsystemsSubject: BehaviorSubject<Subsystem[]> = new BehaviorSubject([]);
   private updateFilter = new Subject<string>();