Fixed reference issues in tests

TIER · Jun 18, 2018 · 12a49c8 · 12a49c8
1 parent c6641af
commit 12a49c8
Show file tree

Hide file tree

Showing 27 changed files with 197 additions and 142 deletions.
diff --git a/ui/src/app/app.reducer.ts b/ui/src/app/app.reducer.ts
@@ -1,5 +1,4 @@
-import { ActionReducerMap, MetaReducer, ActionReducer } from '@ngrx/store';
-import { routerReducer, RouterReducerState } from '@ngrx/router-store';
+import { ActionReducerMap, MetaReducer } from '@ngrx/store';
 import * as fromRouter from '@ngrx/router-store';
 
 import { RouterStateUrl } from './shared/util';

diff --git a/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.spec.ts
@@ -3,15 +3,15 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
+import * as fromMetadata from '../../../metadata.reducer';
 import { AdvancedInfoFormComponent } from './advanced-info-form.component';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
-import * as stubs from '../../../../testing/provider.stub';
+import * as stubs from '../../../../../testing/resolver.stub';
 
 describe('Advanced Info Form Component', () => {
     let fixture: ComponentFixture<AdvancedInfoFormComponent>;
     let instance: AdvancedInfoFormComponent;
-    let store: Store<fromCollections.CollectionState>;
+    let store: Store<fromMetadata.MetadataState>;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -24,7 +24,7 @@ describe('Advanced Info Form Component', () => {
                 NoopAnimationsModule,
                 ReactiveFormsModule,
                 StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
+                    'metadata': combineReducers(fromMetadata.reducers),
                 }),
                 NgbPopoverModule
             ],
@@ -45,19 +45,19 @@ describe('Advanced Info Form Component', () => {
     });
 
     describe('ngOnChanges method', () => {
-        it('should set properties on the provider', () => {
-            instance.provider = stubs.provider;
+        it('should set properties on the resolver', () => {
+            instance.resolver = stubs.resolver;
             fixture.detectChanges();
             instance.ngOnChanges();
-            expect(instance.provider.organization).toEqual({});
-            expect(instance.provider.contacts).toEqual([]);
+            expect(instance.resolver.organization).toEqual({});
+            expect(instance.resolver.contacts).toEqual([]);
         });
     });
 
     describe('removeContact method', () => {
         it('should remove the contact at the given index', () => {
-            instance.provider = {
-                ...stubs.provider,
+            instance.resolver = {
+                ...stubs.resolver,
                 contacts: [stubs.contact]
             };
             fixture.detectChanges();
@@ -69,8 +69,8 @@ describe('Advanced Info Form Component', () => {
 
     describe('addContact method', () => {
         it('should remove the contact at the given index', () => {
-            instance.provider = {
-                ...stubs.provider,
+            instance.resolver = {
+                ...stubs.resolver,
                 contacts: [stubs.contact]
             };
             fixture.detectChanges();

diff --git a/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.ts b/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy, EventEmitter } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, FormArray, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, FormArray, Validators } from '@angular/forms';
 import { Observable, Subscription, of } from 'rxjs';
-import { takeUntil, combineLatest, switchMap, map, startWith } from 'rxjs/operators';
+import { takeUntil, switchMap, map, startWith } from 'rxjs/operators';
 
 import { Store } from '@ngrx/store';
 

diff --git a/ui/src/app/metadata/domain/component/forms/assertion-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/assertion-form.component.spec.ts
@@ -3,15 +3,15 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
+import * as fromMetadata from '../../../metadata.reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { AssertionFormComponent } from './assertion-form.component';
-import * as stubs from '../../../../testing/provider.stub';
+import * as stubs from '../../../../../testing/resolver.stub';
 
 describe('Assertion Form Component', () => {
     let fixture: ComponentFixture<AssertionFormComponent>;
     let instance: AssertionFormComponent;
-    let store: Store<fromCollections.CollectionState>;
+    let store: Store<fromMetadata.MetadataState>;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -24,7 +24,7 @@ describe('Assertion Form Component', () => {
                 NoopAnimationsModule,
                 ReactiveFormsModule,
                 StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
+                    'metadata': combineReducers(fromMetadata.reducers),
                 }),
                 NgbPopoverModule
             ],
@@ -46,17 +46,17 @@ describe('Assertion Form Component', () => {
 
     describe('ngOnChanges method', () => {
         it('should set properties on the provider', () => {
-            instance.provider = stubs.provider;
+            instance.resolver = stubs.resolver;
             fixture.detectChanges();
             instance.ngOnChanges();
-            expect(instance.provider.assertionConsumerServices).toEqual([]);
+            expect(instance.resolver.assertionConsumerServices).toEqual([]);
         });
     });
 
     describe('removeEndpoint method', () => {
         it('should remove the endpoint at the given index', () => {
-            instance.provider = {
-                ...stubs.provider,
+            instance.resolver = {
+                ...stubs.resolver,
                 assertionConsumerServices: [stubs.endpoint]
             };
             fixture.detectChanges();
@@ -68,8 +68,8 @@ describe('Assertion Form Component', () => {
 
     describe('addEndpoint method', () => {
         it('should remove the endpoint at the given index', () => {
-            instance.provider = {
-                ...stubs.provider,
+            instance.resolver = {
+                ...stubs.resolver,
                 assertionConsumerServices: [stubs.endpoint]
             };
             fixture.detectChanges();

diff --git a/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.spec.ts
@@ -3,16 +3,16 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
+import * as fromMetadata from '../../../metadata.reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { AttributeReleaseFormComponent } from './attribute-release-form.component';
 import { ListValuesService } from '../../../domain/service/list-values.service';
-import * as stubs from '../../../../testing/provider.stub';
+import * as stubs from '../../../../../testing/resolver.stub';
 
 describe('Attribute Release Form Component', () => {
     let fixture: ComponentFixture<AttributeReleaseFormComponent>;
     let instance: AttributeReleaseFormComponent;
-    let store: Store<fromCollections.CollectionState>;
+    let store: Store<fromMetadata.State>;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -26,7 +26,7 @@ describe('Attribute Release Form Component', () => {
                 NoopAnimationsModule,
                 ReactiveFormsModule,
                 StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
+                    'metadata': combineReducers(fromMetadata.reducers),
                 }),
                 NgbPopoverModule
             ],
@@ -39,8 +39,8 @@ describe('Attribute Release Form Component', () => {
 
         fixture = TestBed.createComponent(AttributeReleaseFormComponent);
         instance = fixture.componentInstance;
-        instance.provider = {
-            ...stubs.provider,
+        instance.resolver = {
+            ...stubs.resolver,
             attributeRelease: []
         };
         fixture.detectChanges();
@@ -54,7 +54,7 @@ describe('Attribute Release Form Component', () => {
         it('should set properties on the provider', () => {
             spyOn(instance, 'setAttributes');
             instance.ngOnChanges();
-            expect(instance.provider.attributeRelease).toEqual([]);
+            expect(instance.resolver.attributeRelease).toEqual([]);
             expect(instance.setAttributes).toHaveBeenCalled();
         });
     });

diff --git a/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.spec.ts
@@ -4,21 +4,21 @@ import { ReactiveFormsModule, FormBuilder, Validators } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
+import * as fromMetadata from '../../../metadata.reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { ListValuesService } from '../../../domain/service/list-values.service';
-import { Resolver } from '../../../domain/entity/provider';
+import { FileBackedHttpMetadataResolver } from '../../../domain/entity';
 import { DescriptorInfoFormComponent } from './descriptor-info-form.component';
 
-import * as stubs from '../../../../testing/provider.stub';
-import { SharedModule } from '../../../shared/shared.module';
+import * as stubs from '../../../../../testing/resolver.stub';
+import { SharedModule } from '../../../../shared/shared.module';
 
 @Component({
-    template: `<descriptor-info-form [provider]="provider"></descriptor-info-form>`
+    template: `<descriptor-info-form [resolver]="resolver"></descriptor-info-form>`
 })
 class TestHostComponent {
-    provider = new Resolver({
-        ...stubs.provider,
+    resolver = new FileBackedHttpMetadataResolver({
+        ...stubs.resolver,
         serviceProviderSsoDescriptor: {
             protocolSupportEnum: 'foo',
             nameIdFormats: []
@@ -29,18 +29,18 @@ class TestHostComponent {
     public formUnderTest: DescriptorInfoFormComponent;
 
     changeProvider(opts: any): void {
-        this.provider = Object.assign({}, this.provider, opts);
+        this.resolver = Object.assign({}, this.resolver, opts);
     }
 
     addFormat(value: string): void {
-        this.provider.serviceProviderSsoDescriptor.nameIdFormats.push(value);
+        this.resolver.serviceProviderSsoDescriptor.nameIdFormats.push(value);
     }
 }
 
 describe('Descriptor Info Form Component', () => {
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
-    let store: Store<fromCollections.CollectionState>;
+    let store: Store<fromMetadata.MetadataState>;
     let form: DescriptorInfoFormComponent;
     let fb: FormBuilder;
 
@@ -56,7 +56,7 @@ describe('Descriptor Info Form Component', () => {
                 NoopAnimationsModule,
                 ReactiveFormsModule,
                 StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
+                    'metadata': combineReducers(fromMetadata.reducers),
                 }),
                 NgbPopoverModule,
                 SharedModule

diff --git a/ui/src/app/metadata/domain/component/forms/finish-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/finish-form.component.spec.ts
@@ -5,38 +5,38 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute, Router } from '@angular/router';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
+import * as fromMetadata from '../../../metadata.reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { ListValuesService } from '../../../domain/service/list-values.service';
 import { FinishFormComponent } from './finish-form.component';
-import { RouterStub, RouterLinkStubDirective } from '../../../../testing/router.stub';
-import { ActivatedRouteStub } from '../../../../testing/activated-route.stub';
+import { RouterStub, RouterLinkStubDirective } from '../../../../../testing/router.stub';
+import { ActivatedRouteStub } from '../../../../../testing/activated-route.stub';
 
-import * as stubs from '../../../../testing/provider.stub';
-import { InputDefaultsDirective } from '../../directive/input-defaults.directive';
+import * as stubs from '../../../../../testing/resolver.stub';
 import { I18nTextComponent } from '../../../domain/component/i18n-text.component';
-import { Resolver } from '../../../domain/entity/provider';
+import { FileBackedHttpMetadataResolver } from '../../entity';
+import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive';
 
 @Component({
-    template: `<finish-form [provider]="provider"></finish-form>`
+    template: `<finish-form [resolver]="resolver"></finish-form>`
 })
 class TestHostComponent {
-    provider = new Resolver({
-        ...stubs.provider
+    resolver = new FileBackedHttpMetadataResolver({
+        ...stubs.resolver
     });
 
     @ViewChild(FinishFormComponent)
     public formUnderTest: FinishFormComponent;
 
     changeProvider(opts: any): void {
-        this.provider = Object.assign({}, this.provider, opts);
+        this.resolver = Object.assign({}, this.resolver, opts);
     }
 }
 
 describe('Finished Form Component', () => {
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
-    let store: Store<fromCollections.CollectionState>;
+    let store: Store<fromMetadata.MetadataState>;
     let form: FinishFormComponent;
 
     beforeEach(() => {
@@ -53,7 +53,7 @@ describe('Finished Form Component', () => {
                 NoopAnimationsModule,
                 ReactiveFormsModule,
                 StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
+                    'metadata': combineReducers(fromMetadata.reducers),
                 }),
                 NgbPopoverModule
             ],
@@ -88,9 +88,9 @@ describe('Finished Form Component', () => {
             expect(form.form.reset).toHaveBeenCalled();
         });
 
-        xit('should reset the form with serviceEnabled = false if no provider', () => {
+        xit('should reset the form with serviceEnabled = false if no resolver', () => {
             spyOn(form.form, 'reset').and.callThrough();
-            delete instance.provider;
+            delete instance.resolver;
             fixture.detectChanges();
             expect(form.form.reset).toHaveBeenCalled();
         });

diff --git a/ui/src/app/metadata/domain/component/forms/key-info-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/key-info-form.component.spec.ts
@@ -4,22 +4,22 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service';
-import * as fromCollections from '../../../domain/reducer';
+import * as fromMetadata from '../../../metadata.reducer';
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module';
 import { ListValuesService } from '../../../domain/service/list-values.service';
 import { KeyInfoFormComponent } from './key-info-form.component';
-import { InputDefaultsDirective } from '../../directive/input-defaults.directive';
 
-import * as stubs from '../../../../testing/provider.stub';
+import * as stubs from '../../../../../testing/resolver.stub';
 import { I18nTextComponent } from '../../../domain/component/i18n-text.component';
-import { Resolver } from '../../../domain/entity/provider';
+import { FileBackedHttpMetadataResolver } from '../../entity';
+import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive';
 
 @Component({
-    template: `<key-info-form [provider]="provider"></key-info-form>`
+    template: `<key-info-form [resolver]="resolver"></key-info-form>`
 })
 class TestHostComponent {
-    provider = new Resolver({
-        ...stubs.provider,
+    resolver = new FileBackedHttpMetadataResolver({
+        ...stubs.resolver,
         securityInfo: {
             ...stubs.secInfo,
             x509Certificates: []
@@ -30,14 +30,14 @@ class TestHostComponent {
     public formUnderTest: KeyInfoFormComponent;
 
     changeProvider(opts: any): void {
-        this.provider = Object.assign({}, this.provider, opts);
+        this.resolver = Object.assign({}, this.resolver, opts);
     }
 }
 
 describe('Security (Key) Info Form Component', () => {
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
-    let store: Store<fromCollections.CollectionState>;
+    let store: Store<fromMetadata.MetadataState>;
     let form: KeyInfoFormComponent;
 
     beforeEach(() => {
@@ -52,7 +52,7 @@ describe('Security (Key) Info Form Component', () => {
                 NoopAnimationsModule,
                 ReactiveFormsModule,
                 StoreModule.forRoot({
-                    'collections': combineReducers(fromCollections.reducers),
+                    'metadata': combineReducers(fromMetadata.reducers),
                 }),
                 NgbPopoverModule
             ],