1 files changed, 36 insertions, 47 deletions

diff --git a/openecomp-ui/test/softwareProduct/components/network/SoftwareProductComponentsNICEditor.test.js b/openecomp-ui/test/softwareProduct/components/network/SoftwareProductComponentsNICEditor.test.js
index c9760f7799..094b95a091 100644
--- a/openecomp-ui/test/softwareProduct/components/network/SoftwareProductComponentsNICEditor.test.js
+++ b/openecomp-ui/test/softwareProduct/components/network/SoftwareProductComponentsNICEditor.test.js
@@ -1,55 +1,42 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
+/*!
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-import expect from 'expect';
 import React from 'react';
 import TestUtils from 'react-addons-test-utils';
 import {mapStateToProps}  from 'sdc-app/onboarding/softwareProduct/components/network/SoftwareProductComponentsNICEditor.js';
 import SoftwareProductComponentsNICEditorView from 'sdc-app/onboarding/softwareProduct/components/network/SoftwareProductComponentsNICEditorView.jsx';
 
-
+import {VSPEditorFactory} from 'test-utils/factories/softwareProduct/SoftwareProductEditorFactories.js';
+import {SoftwareProductFactory} from 'test-utils/factories/softwareProduct/SoftwareProductFactory.js';
+import {VSPComponentsNicFactory, VSPComponentsNetworkQDataFactory, VSPComponentsNicFactoryQGenericFieldInfo,
+	VSPComponentsNicFactoryGenericFieldInfo, VSPComponentsNetworkDataMapFactory} from 'test-utils/factories/softwareProduct/SoftwareProductComponentsNetworkFactories.js';
 
 describe('Software Product Component Network NIC Editor and View Classes', () => {
 	it('mapStateToProps mapper exists', () => {
-		expect(mapStateToProps).toExist();
+		expect(mapStateToProps).toBeTruthy();
 	});
 
 
 	it('mapStateToProps data test', () => {
 
-		const currentSoftwareProduct = {
-			name: 'VSp',
-			description: 'dfdf',
-			vendorName: 'V1',
-			vendorId: '97B3E2525E0640ACACF87CE6B3753E80',
-			category: 'resourceNewCategory.application l4+',
-			subCategory: 'resourceNewCategory.application l4+.database',
-			id: 'D4774719D085414E9D5642D1ACD59D20',
-			version: '0.10',
-			viewableVersions: ['0.1', '0.2'],
-			lockingUser: 'cs0008'
-		};
+		const currentSoftwareProduct = VSPEditorFactory.build();
 
 
 		var obj = {
-			softwareProduct: {
+			softwareProduct: SoftwareProductFactory.build({
 				softwareProductEditor: {
 					data: currentSoftwareProduct
 				},
@@ -58,40 +45,42 @@ describe('Software Product Component Network NIC Editor and View Classes', () =>
 						nicEditor: {
 							data: {},
 							qdata: {},
-							qschema: {}
+							dataMap: {},
+							qgenericFieldInfo: {},
+							genericFieldInfo: {}
 						}
 					}
 				}
-			}
+			})
 		};
 
 		var results = mapStateToProps(obj);
-		expect(results.currentSoftwareProduct).toExist();
-		expect(results.qdata).toExist();
-		expect(results.qschema).toExist();
-		expect(results.data).toExist();
+		expect(results.currentSoftwareProduct).toBeTruthy();
+		expect(results.qdata).toBeTruthy();
+		expect(results.dataMap).toBeTruthy();
+		expect(results.genericFieldInfo).toBeTruthy();
+		expect(results.qgenericFieldInfo).toBeTruthy();
+		expect(results.data).toBeTruthy();
 	});
 
 
 	it('Software Product Component Network NIC Editor View Test', () => {
 
-		const data = {
-			name: '',
-			description: '',
-			networkName: ''
+		const props = {
+			data: VSPComponentsNicFactory.build(),
+			qdata: VSPComponentsNetworkQDataFactory.build(),
+			dataMap: VSPComponentsNetworkDataMapFactory.build(),
+			genericFieldInfo: VSPComponentsNicFactoryGenericFieldInfo.build(),
+			qgenericFieldInfo: VSPComponentsNicFactoryQGenericFieldInfo.build(),
+			isFormValid: true,
+			formReady: false,
+			protocols: []
 		};
 
-		const qdata = {};
-		const qschema = {};
-
 		var renderer = TestUtils.createRenderer();
-		renderer.render(
-			<SoftwareProductComponentsNICEditorView
-				data={data}
-				qdata={qdata}
-				qschema={qschema}/>);
+		renderer.render(<SoftwareProductComponentsNICEditorView {...props}/>);
 		var renderedOutput = renderer.getRenderOutput();
-		expect(renderedOutput).toExist();
+		expect(renderedOutput).toBeTruthy();
 
 	});
 });