2 files changed, 38 insertions, 8 deletions

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/new-role-function/new-role-function.component.spec.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/new-role-function/new-role-function.component.spec.ts
index 7ef63baf..32a69848 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/new-role-function/new-role-function.component.spec.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/new-role-function/new-role-function.component.spec.ts
@@ -49,6 +49,8 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { ConfirmationModalComponent } from 'src/app/modals/confirmation-modal/confirmation-modal.component';
 import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
 import { InformationModalComponent } from 'src/app/modals/information-modal/information-modal.component';
+import 'rxjs/add/observable/of';
+
 
 describe('NewRoleFunctionComponent', () => {
   let component: NewRoleFunctionComponent;
@@ -73,7 +75,10 @@ describe('NewRoleFunctionComponent', () => {
     })
     TestBed.overrideModule(BrowserDynamicTestingModule,{
       set:{
-        entryComponents:[ConfirmationModalComponent,InformationModalComponent]
+        entryComponents:[
+          ConfirmationModalComponent,
+          InformationModalComponent
+        ]
       }
     })
     .compileComponents();
@@ -90,6 +95,22 @@ describe('NewRoleFunctionComponent', () => {
   });
 
   it('should test ngOnInit method',()=>{
+    component.editRoleFunction={ 
+      type: "type",
+      code: "code",
+      action: "action",
+      name: "name"
+    }
+    component.ngOnInit();
+  })
+
+  it('should test else part of ngOnInit method',()=>{
+    component.editRoleFunction={ 
+      type: "menu",
+      code: "code",
+      action: "action",
+      name: "name"
+    }
     component.ngOnInit();
   })
 
@@ -98,6 +119,7 @@ describe('NewRoleFunctionComponent', () => {
   })
 
   it('should test openConfirmationModal method',()=>{
-    component.openConfirmationModal("indrijeet","kumar")
+    component.openConfirmationModal("indrijeet","kumar");
   })
+
 });
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/definition/definition.component.spec.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/definition/definition.component.spec.ts
index 93636519..cffd5290 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/definition/definition.component.spec.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/definition/definition.component.spec.ts
@@ -1,4 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
 import { DefinitionComponent } from './definition.component';
 import { CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
@@ -18,7 +19,7 @@ describe('DefinitionComponent', () => {
     "reportId":123,
     "reportName":"reportName",
     "reportDescr":"reportDescr",
-    "reportType":"reportType",
+    "reportType":"Linear",
     "dbInfo":"dbInfo",
     "formHelpText":"formHelpText",
     "repDefType":"repDefType",
@@ -44,7 +45,8 @@ describe('DefinitionComponent', () => {
     "weeklyRec":true,
     "monthlyRec":true,
     "dashboardLayoutJSON":'"data"',
-    "dashboardLayoutHTML":"dashboardLayoutHTML"
+    "dashboardLayoutHTML":"dashboardLayoutHTML",
+    "displayArea":{"selected":true}
   }
 
   beforeEach(async(() => {
@@ -74,19 +76,25 @@ describe('DefinitionComponent', () => {
   });
 
   it('should test ngOnInit method',()=>{
-    var params={
-      "reportId":100
-    };
     component.IncomingReportId=-1;
     component.reportMode="Create";
-    //spyOn(activatedRoute,'params').and.returnValue(Observable.of(params));
     let spy=spyOn(_definitionService,'getDefinitionPageDetails').and.returnValue(Observable.of(response));
     component.ngOnInit();
     expect(spy).toHaveBeenCalled();
+    expect(_definitionService.getDefinitionPageDetails).toHaveBeenCalled();
     expect(component.isEdit).toBe(true);
     expect(component.showDialog).toBe(false);
   });
 
+  it('should test ngOnInit method',()=>{
+    component.IncomingReportId=1;
+    component.reportMode="Edit";
+    let spy=spyOn(_definitionService,'getDefinitionPageDetails').and.returnValue(Observable.of(response));
+    component.ngOnInit();
+    expect(spy).toHaveBeenCalled();
+    expect(_definitionService.getDefinitionPageDetails).toHaveBeenCalled();
+  });
+
   it('should test first if condition in saveDefinitionInfo method',()=>{
     component.IncomingReportId=-1;
     component.reportMode="Create";