1 files changed, 25 insertions, 65 deletions

diff --git a/openecomp-ui/test/softwareProduct/components/general/SoftwareProductComponentsGeneral.test.js b/openecomp-ui/test/softwareProduct/components/general/SoftwareProductComponentsGeneral.test.js
index ce2152b29b..4f6512ad15 100644
--- a/openecomp-ui/test/softwareProduct/components/general/SoftwareProductComponentsGeneral.test.js
+++ b/openecomp-ui/test/softwareProduct/components/general/SoftwareProductComponentsGeneral.test.js
@@ -1,113 +1,73 @@
-/*-
- * ============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/general/SoftwareProductComponentsGeneral.js';
 import SoftwareProductComponentsGeneralView from 'sdc-app/onboarding/softwareProduct/components/general/SoftwareProductComponentsGeneralView.jsx';
-import {statusEnum as versionStatusEnum} from 'nfvo-components/panel/versionController/VersionControllerConstants.js';
+//import {statusEnum as versionStatusEnum} from 'nfvo-components/panel/versionController/VersionControllerConstants.js';
+
+import {VSPEditorFactory} from 'test-utils/factories/softwareProduct/SoftwareProductEditorFactories.js';
+import {VSPComponentsVersionControllerFactory} from 'test-utils/factories/softwareProduct/SoftwareProductComponentsNetworkFactories.js';
+import {SoftwareProductFactory} from 'test-utils/factories/softwareProduct/SoftwareProductFactory.js';
+import VSPQSchemaFactory from 'test-utils/factories/softwareProduct/SoftwareProductQSchemaFactory.js';
 
 
 describe('SoftwareProductComponentsGeneral Mapper 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'],
-			status: versionStatusEnum.CHECK_OUT_STATUS,
-			lockingUser: 'cs0008'
-		};
+		const currentSoftwareProduct = VSPEditorFactory.build();
 
 		var obj = {
-			softwareProduct: {
+			softwareProduct: SoftwareProductFactory.build({
 				softwareProductEditor: {
 					data: currentSoftwareProduct
 				},
 				softwareProductComponents: {
 					componentEditor: {
 						data: {},
-						qdata: {},
-						qschema: {}
+						qdata: {}
 					}
 				}
-			}
+			})
 		};
 
 		var results = mapStateToProps(obj);
-		expect(results.componentData).toExist();
-		expect(results.qdata).toExist();
-		expect(results.qschema).toExist();
+		expect(results.componentData).toBeTruthy();
+		expect(results.qdata).toBeTruthy();
 	});
 
 
 	it('VSP Components general view 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'],
-			status: versionStatusEnum.CHECK_OUT_STATUS,
-			lockingUser: 'cs0008'
-		};
+		const currentSoftwareProduct = VSPEditorFactory.build();
 
 		const softwareProductComponents = {
 			componentEditor: {
 				data: {},
 				qdata: {},
-				qschema: {
-					$schema: 'http://json-schema.org/draft-04/schema#',
-					type: 'object',
-					properties: {
-						general: {
-							type: 'object',
-							properties: {}
-						}
-					}
-				}
+				qschema: VSPQSchemaFactory.build()
 			}
 		};
 
-		const versionControllerData = {
-			version: '1',
-			viewableVersions: [],
-			status: 'locked',
-			isCheckedOut: true
-		};
+		const versionControllerData = VSPComponentsVersionControllerFactory.build();
 
 		const componentData = {
 			name: '',
@@ -122,7 +82,7 @@ describe('SoftwareProductComponentsGeneral Mapper and View Classes', () => {
 				versionControllerData={versionControllerData}
 				currentSoftwareProduct={currentSoftwareProduct}/>);
 		var renderedOutput = renderer.getRenderOutput();
-		expect(renderedOutput).toExist();
+		expect(renderedOutput).toBeTruthy();
 
 	});