Skip to content
Snippets Groups Projects
Commit 722602e1 authored by Xiao Gui's avatar Xiao Gui
Browse files

chore: fixed tests

parent c2375a96
No related branches found
No related tags found
No related merge requests found
......@@ -5,7 +5,8 @@ import { defaultRootState } from "src/services/stateStore.service";
import { AngularMaterialModule } from "src/ui/sharedModules/angularMaterial.module";
import { HttpClientModule } from '@angular/common/http';
import { WidgetModule } from './widgetUnit/widget.module';
import { PluginModule } from './pluginUnit/plugin.module';
import { HttpClientTestingModule, HttpTestingController } from "@angular/common/http/testing";
import { PluginServices } from "./pluginUnit";
describe('atlasViewer.apiService.service.ts', () => {
......@@ -17,15 +18,17 @@ describe('atlasViewer.apiService.service.ts', () => {
afterEach(() => {
cancelTokenSpy.calls.reset()
cancellableDialogSpy.calls.reset()
const ctrl = TestBed.inject(HttpTestingController)
ctrl.verify()
})
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
AngularMaterialModule,
HttpClientModule,
HttpClientTestingModule,
WidgetModule,
PluginModule,
],
providers: [
AtlasViewerAPIServices,
......@@ -33,6 +36,10 @@ describe('atlasViewer.apiService.service.ts', () => {
{
provide: CANCELLABLE_DIALOG,
useValue: cancellableDialogSpy
},
{
provide: PluginServices,
useValue: {}
}
]
}).compileComponents()
......@@ -250,7 +257,6 @@ describe('atlasViewer.apiService.service.ts', () => {
AngularMaterialModule,
HttpClientModule,
WidgetModule,
PluginModule,
],
providers: [
{
......@@ -267,6 +273,10 @@ describe('atlasViewer.apiService.service.ts', () => {
return mockGetMouseOverSegments
}
},
{
provide: PluginServices,
useValue: {}
},
AtlasViewerAPIServices,
provideMockStore({ initialState: defaultRootState }),
]
......
......@@ -3,6 +3,8 @@ import { PluginUnit } from "./pluginUnit.component";
import { PluginServices, registerPluginFactoryDirectiveFactory } from "./atlasViewer.pluginService.service";
import { PluginFactoryDirective, REGISTER_PLUGIN_FACTORY_DIRECTIVE } from "./pluginFactory.directive";
import { LoggingModule } from "src/logging";
import { APPEND_SCRIPT_TOKEN, appendScriptFactory, REMOVE_SCRIPT_TOKEN, removeScriptFactory } from "src/util/constants";
import { DOCUMENT } from "@angular/common";
@NgModule({
imports:[
......@@ -25,7 +27,17 @@ import { LoggingModule } from "src/logging";
provide: REGISTER_PLUGIN_FACTORY_DIRECTIVE,
useFactory: registerPluginFactoryDirectiveFactory,
deps: [ PluginServices ]
}
},
{
provide: APPEND_SCRIPT_TOKEN,
useFactory: appendScriptFactory,
deps: [ DOCUMENT ]
},
{
provide: REMOVE_SCRIPT_TOKEN,
useFactory: removeScriptFactory,
deps: [ DOCUMENT ]
},
]
})
......
......@@ -180,16 +180,6 @@ import { APPEND_SCRIPT_TOKEN, appendScriptFactory, REMOVE_SCRIPT_TOKEN, removeSc
},
deps: [ UIService ]
},
{
provide: APPEND_SCRIPT_TOKEN,
useFactory: appendScriptFactory,
deps: [ DOCUMENT ]
},
{
provide: REMOVE_SCRIPT_TOKEN,
useFactory: removeScriptFactory,
deps: [ DOCUMENT ]
},
/**
......
......@@ -4,6 +4,7 @@ import { NehubaViewerUnit, IMPORT_NEHUBA_INJECT_TOKEN } from "./nehubaViewer.com
import { importNehubaFactory } from "../util"
import { AtlasWorkerService } from "src/atlasViewer/atlasViewer.workerService.service"
import { LoggingModule } from "src/logging"
import { APPEND_SCRIPT_TOKEN, appendScriptFactory } from "src/util/constants"
describe('nehubaViewer.component,ts', () => {
......@@ -21,6 +22,11 @@ describe('nehubaViewer.component,ts', () => {
{
provide: IMPORT_NEHUBA_INJECT_TOKEN,
useFactory: importNehubaFactory,
deps: [ APPEND_SCRIPT_TOKEN ]
},
{
provide: APPEND_SCRIPT_TOKEN,
useFactory: appendScriptFactory,
deps: [ DOCUMENT ]
},
AtlasWorkerService
......
......@@ -88,7 +88,8 @@ import { FabSpeedDialModule } from "src/components/fabSpeedDial";
import { ActionDialog } from "./actionDialog/actionDialog.component";
import { NehubaViewerTouchDirective } from "./nehubaContainer/nehubaViewerInterface/nehubaViewerTouch.directive";
import { importNehubaFactory } from "./nehubaContainer/util";
import { APPEND_SCRIPT_TOKEN } from "src/util/constants";
import { APPEND_SCRIPT_TOKEN, appendScriptFactory } from "src/util/constants";
import { DOCUMENT } from "@angular/common";
@NgModule({
......@@ -190,6 +191,11 @@ import { APPEND_SCRIPT_TOKEN } from "src/util/constants";
provide: IMPORT_NEHUBA_INJECT_TOKEN,
useFactory: importNehubaFactory,
deps: [ APPEND_SCRIPT_TOKEN ]
},
{
provide: APPEND_SCRIPT_TOKEN,
useFactory: appendScriptFactory,
deps: [ DOCUMENT ]
}
],
entryComponents : [
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment