Fixed defects in test screen & updated test cases

Fixed few defects raised by ST in test screen and also updated test
cases to improve coverage. Also,changed code to match onap standards,
and rectfied grep code violations.

Issue-ID: APPC-730
Change-Id: I0286c38eb4f76dc8c0253a4ccab721b3ccfeff9d
Signed-off-by: sj108s <sj108s@us.att.com>

5 files changed, 93 insertions, 44 deletions

diff --git a/src/app/about-us/aboutus.component.html b/src/app/about-us/aboutus.component.html
index bfc6f9a..1d8134b 100644
--- a/src/app/about-us/aboutus.component.html
+++ b/src/app/about-us/aboutus.component.html
@@ -28,7 +28,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                 <div class="card-header" style="font-size: 20px">CONTACT DETAILS</div>
                 <div class="mdl-card__title">
                     <div class="text-center">
-                        Contact us @: <a href="mailto:DL-APPCDEVELOPMENTTEAM@att.com?Subject=1710CDTContactus">APPC
+                        Contact us @: <a href="#">APPC
                         DEVELOPMENT TEAM </a>
                     </div>
                 </div>
diff --git a/src/app/about-us/aboutus.component.spec.ts b/src/app/about-us/aboutus.component.spec.ts
index e5541eb..175f8d1 100644
--- a/src/app/about-us/aboutus.component.spec.ts
+++ b/src/app/about-us/aboutus.component.spec.ts
@@ -20,19 +20,42 @@ limitations under the License.
 ECOMP is a trademark and service mark of AT&T Intellectual Property.
 ============LICENSE_END============================================
 */
+import { async, ComponentFixture, TestBed, inject, tick, fakeAsync } from '@angular/core/testing';
+import { Http, HttpModule, ConnectionBackend, BaseRequestOptions, Response, ResponseOptions } from '@angular/http';
+import { MockBackend } from '@angular/http/testing';
+import { ModalDismissReasons, NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/from';
+import 'rxjs/add/observable/empty';
+import 'rxjs/add/observable/of';
 
-/* tslint:disable:no-unused-variable */
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import { AboutUsComponent } from './aboutus.component';
 
-import {AboutUsComponent} from './aboutus.component';
+class MockService {
+    doStuff() {
+        return this;
+    }
+}
 
 describe('ContacUsComponent', () => {
     let component: AboutUsComponent;
     let fixture: ComponentFixture<AboutUsComponent>;
-
+   
     beforeEach(async(() => {
+        let http = new MockService();
+
         TestBed.configureTestingModule({
-            declarations: [AboutUsComponent]
+            declarations: [AboutUsComponent],
+            imports: [HttpModule, NgbModule.forRoot()],
+            providers: [NgbModule, {
+                provide: Http, useFactory: (backend: ConnectionBackend, defaultOptions: BaseRequestOptions) => {
+                return new Http(backend, defaultOptions);
+                }, deps: [MockBackend, BaseRequestOptions]
+            },
+            { provide: MockBackend, useClass: MockBackend },
+            { provide: BaseRequestOptions, useClass: BaseRequestOptions },
+            {provide: Http, useValue: http}]
+            
         })
             .compileComponents();
     }));
@@ -46,4 +69,27 @@ describe('ContacUsComponent', () => {
     it('should create', () => {
         expect(component).toBeTruthy();
     });
+
+    it('test', inject([Http], (http: Http) => {
+        let spy = spyOn(http, 'get').and.returnValue(Observable.of('some value'))
+
+        component.versionLogFile();
+
+        expect(http).toBeTruthy();
+        expect(spy).toHaveBeenCalled()
+
+    }));
+    
+    it('should open modal', inject([NgbModule],(ngbModule: NgbModule) => {
+       let content = 'test';
+       component.open(content);
+    }));
+
+    it('should download log file', () => {
+        var blob = new Blob(['test'], {
+            type: 'text/plain;charset=utf-8'
+        });
+
+        component.downloadLogFile();
+    });
 });
diff --git a/src/app/about-us/aboutus.component.ts b/src/app/about-us/aboutus.component.ts
index 360855e..1c237e8 100644
--- a/src/app/about-us/aboutus.component.ts
+++ b/src/app/about-us/aboutus.component.ts
@@ -49,10 +49,8 @@ export class AboutUsComponent implements OnInit {
     }
 
     versionLogFile() {
-        this.http.get('app/shared/components/about-us/versionLog.txt')
+        this.http.get('app/about-us/versionLog.txt')
             .subscribe(res => this.data = res.text());
-        console.log('json data ', this.data);
-
     }
 
     open(content) {
diff --git a/src/app/about-us/appVersion.json b/src/app/about-us/appVersion.json
index d4fc816..5972822 100644
--- a/src/app/about-us/appVersion.json
+++ b/src/app/about-us/appVersion.json
@@ -1,4 +1,4 @@
 {
-    "versionNo": "2.0.6",
+    "versionNo": "2.0.7",
     "releaseName": "1806"
 }
\ No newline at end of file
diff --git a/src/app/about-us/versionLog.txt b/src/app/about-us/versionLog.txt
index fea7248..af9808a 100644
--- a/src/app/about-us/versionLog.txt
+++ b/src/app/about-us/versionLog.txt
@@ -1,94 +1,99 @@
+Version 2.0.7
+===========================================================
+1. Fixed issues raised by ST in test screen. 
+2. Added few test cases to increase code coverage.
+
 Version 2.0.6
 ===========================================================
-1. Fixed issues raised by ST in test screen. (sj108s)
-2. Added test spec file (sj108s)
+1. Fixed issues raised by ST in test screen. 
+2. Added test spec file 
 
 Version 2.0.5
 ===========================================================
-1. Changed the location of Assign new Template Identifier.(Author-ug0221)
-2. Fixed an issue with retaining the selected value in the dropdown for Template Id's.(Author-ug0221)
-3. Added Artifact Name to the Filter box.(Author-ug0221)
-4. Added empty value validations on create new VNF pop up box.(Author-ug0221)
+1. Changed the location of Assign new Template Identifier.
+2. Fixed an issue with retaining the selected value in the dropdown for Template Id's.
+3. Added Artifact Name to the Filter box.
+4. Added empty value validations on create new VNF pop up box.
 
 Version 2.0.4
 ===========================================================
-1. Added test cases to golden configuration spec file(sj108s)
-2. Fixed defect in test screen regarding request id while polling using getTestResponse() method (sj108s)
-3. Added validation to template configuration tab for accepting only xml and json files (sj108s)
-4. Added validation to param values tab to accept only json files (sj108s)
+1. Added test cases to golden configuration spec file
+2. Fixed defect in test screen regarding request id while polling using getTestResponse method 
+3. Added validation to template configuration tab for accepting only xml and json files 
+4. Added validation to param values tab to accept only json files 
 
 Version 2.0.3
 ===========================================================
 1. Fixed E2E defect 430809 in 1802 : Space is not getting ignored in param configure artifact 
-   generated by CDT tool if VNF name / vnfc - type has spaces (sj108s)
+   generated by CDT tool if VNF name / vnfc - type has spaces 
 
 Version 2.0.2
 ===========================================================
-1. Added Licence Info to Reference Data Screen.(ug0221) 
-2. Added Config ScaleOut Action and Template Identifiers to the Reference screen.(ug0221)
-3. resolved a defect where the configscale out file uploaded doesnt populate the template is dropdown.(ug0221)
+1. Added Licence Info to Reference Data Screen. 
+2. Added Config ScaleOut Action and Template Identifiers to the Reference screen.
+3. resolved a defect where the configscale out file uploaded doesnt populate the template is dropdown.
 
 Version 2.0.1
 ===========================================================
-1. Added Licence Info to golden config/ My VNF and other modules for ONAP- Only Reference Page remaining.(sj108s)
-2. Added Test screen to the main menu.(sj108s)
-3. Created HTML for Test Screen and integrated ts code.(sj108s)
+1. Added Licence Info to golden config/ My VNF and other modules for ONAP- Only Reference Page remaining.
+2. Added Test screen to the main menu.
+3. Created HTML for Test Screen and integrated ts code.
 
 Version 2.0.0
 ===========================================================
-1. 18/06 Major release.(ak583p)
+1. 18/06 Major release.
 
 Version 1.1.1
 ===========================================================
-1. Defect 416768 Block Name should not be merged. Do not allow a merge with a value that double quotes around it, possibly a space and a colon at the end.(Author-ma926a)
-2. Populating PD using name/value pairs when Uploading key file.(Author-ma926a)
+1. Defect 416768 Block Name should not be merged. Do not allow a merge with a value that double quotes around it, possibly a space and a colon at the end.
+2. Populating PD using name/value pairs when Uploading key file.
 
 Version 1.1.0
 ===========================================================
-1. Added functionality for entering names in template through modal.(Author-sj108s)
-2. Enabled test screen and added basic test functionality.(Author-sj108s)
+1. Added functionality for entering names in template through modal.
+2. Enabled test screen and added basic test functionality.
 
 Version 1.0.9
 ===========================================================
-1. Allow user to upload of Key Data Files multiple times.(Author-ma926a)
+1. Allow user to upload of Key Data Files multiple times.
 2. Removing INSTAR and its properties using key file.
 
 Version 1.0.8
 ===========================================================
-1. Changed the color code for merge successful/ unsuccessful messages.(Author sj108s)
+1. Changed the color code for merge successful/ unsuccessful messages.
 
 Version 1.0.7
 ===========================================================
-1. Fixed defect in reference screen where previous vm actions where not getting replaced on uploading the new ones.(Author sj108s)
+1. Fixed defect in reference screen where previous vm actions where not getting replaced on uploading the new ones.
 
 Version 1.0.6
 ===========================================================
-1. Fixed defect 396019- Added functionality for syncing template from parameters.(Author sj108s)
+1. Fixed defect 396019- Added functionality for syncing template from parameters.
 
 Version 1.0.5
 ===========================================================
-1. Fixed protocol field while uploading reference artifact file for OpenStack Actions.(Author sj108s)
+1. Fixed protocol field while uploading reference artifact file for OpenStack Actions.
 
 Version 1.0.4
 ===========================================================
-1. Fixed defect: Changed artifact-list to [] and vnfc-type to null in case of reference artifact generated for OpenStack Actions.(Author sj108s)
+1. Fixed defect: Changed artifact-list to [] and vnfc-type to null in case of reference artifact generated for OpenStack Actions.
 
 Version 1.0.3
 ===========================================================
-1. Fix for Defect#399542 Merge from Params should not Merge the commented section of the base template ( CDT Version : 1.2.1). (Author-ma926a)
-2. Fix for Defect#402786 While changing back to Manual from other sources, other fields  is not  return to previous. (Author-ma926a)
-3. With some minor ST issues on PD source, ruletype manipulation. (Author-ma926a)
+1. Fix for Defect#399542 Merge from Params should not Merge the commented section of the base template ( CDT Version : 1.2.1). 
+2. Fix for Defect#402786 While changing back to Manual from other sources, other fields  is not  return to previous. 
+3. With some minor ST issues on PD source, ruletype manipulation. 
 
 Version 1.0.2
 ===========================================================
-1. Added functionality for hiding template and PD tabs on selection of OpenStack Actions in reference screen(Author sj108s)
+1. Added functionality for hiding template and PD tabs on selection of OpenStack Actions in reference screen
 2. Fixed ST defect raised by Ed, wherein the user autoretrieves refrence data with multiple actions from myvnfs, 
    comes to reference screen, and navigates to template and pd pages and comes back to reference page, the data for the 
-   multiple actions are saving and retrieving correctly now.(Author sj108s)
+   multiple actions are saving and retrieving correctly now.
                 
 Version 1.0.1
 ===========================================================
-Story#330094 - Fixed the defects and left over tasks from this story.(Author-ma926a)
+Story#330094 - Fixed the defects and left over tasks from this story.
                 1. Source Manual/INSTAR/A&AI selection handled properly.
                 2. Disabling INSTAR to avoid manual selection of INSTAR.
                 3. "" empty quates in PD file when we select empty value in dropdowns.