Merge "Junit for mso.requestsdb"

9 files changed, 614 insertions, 259 deletions

diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/InfraRequestsTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/InfraRequestsTest.java
new file mode 100644
index 0000000000..33f1fbbb76
--- /dev/null
+++ b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/InfraRequestsTest.java
@@ -0,0 +1,129 @@
+/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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
+*
+* 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=========================================================
+*/
+package org.openecomp.mso.requestsdb;
+
+import static org.junit.Assert.*;
+
+import java.sql.Timestamp;
+
+import org.junit.Test;
+
+public class InfraRequestsTest {
+    
+    InfraRequests ir=new InfraRequests();
+    InfraRequests ir1=new InfraRequests("requestId", "action");
+	Timestamp time=new Timestamp(123);
+	long progress=111;
+	@Test
+	public void test() {
+		ir.setAaiServiceId("aaiServiceId");
+		ir.setAction("action");
+		ir.setAicCloudRegion("aicCloudRegion");
+		ir.setAicNodeClli("aicNodeClli");
+		ir.setCallBackUrl("callBackUrl");
+		ir.setClientRequestId("clientRequestId");
+		ir.setConfigurationId("configurationId");
+		ir.setConfigurationName("configurationName");
+		ir.setCorrelator("correlator");
+		ir.setEndTime(time);
+		ir.setLastModifiedBy("lastModifiedBy");
+		ir.setModifyTime(time);
+		ir.setNetworkId("networkId");
+		ir.setNetworkName("networkName");
+		ir.setNetworkType("networkType");
+		ir.setOperationalEnvId("operationalEnvId");
+		ir.setOperationalEnvName("operationalEnvName");
+		ir.setProgress(progress);
+		ir.setProvStatus("provStatus");
+		ir.setRequestAction("requestAction");
+		ir.setRequestBody("requestBody");
+		ir.setRequestId("requestId");
+		ir.setRequestorId("requestorId");
+		ir.setRequestScope("requestScope");
+		ir.setRequestStatus("requestStatus");
+		ir.setRequestType("requestType");
+		ir.setResponseBody("responseBody");
+		ir.setServiceInstanceId("serviceInstanceId");
+		ir.setServiceInstanceName("serviceInstanceName");
+		ir.setServiceType("serviceType");
+		ir.setSource("source");
+		ir.setStartTime(time);
+		ir.setStatusMessage("statusMessage");
+		ir.setTenantId("tenantId");
+		ir.setVfModuleId("vfModuleId");
+		ir.setVfModuleModelName("vfModuleModelName");
+		ir.setVfModuleName("vfModuleName");
+		ir.setVnfId("vnfId");
+		ir.setVnfName("vnfName");
+		ir.setVnfOutputs("vnfOutputs");
+		ir.setVnfParams("vnfParams");
+		ir.setVnfType("vnfType");
+		ir.setVolumeGroupId("volumeGroupId");
+		ir.setVolumeGroupName("volumeGroupName");
+		
+		assertEquals(ir.getAaiServiceId(), "aaiServiceId");
+		assertEquals(ir.getAction(),"action");
+		assertEquals(ir.getAicCloudRegion(),"aicCloudRegion");
+		assertEquals(ir.getAicNodeClli(),"aicNodeClli");
+		assertEquals(ir.getCallBackUrl(),"callBackUrl");
+		assertEquals(ir.getClientRequestId(),"clientRequestId");
+		assertEquals(ir.getConfigurationId(),"configurationId");
+		assertEquals(ir.getConfigurationName(),"configurationName");
+		assertEquals(ir.getCorrelator(),"correlator");
+		assertEquals(ir.getEndTime(),time);
+		assertEquals(ir.getLastModifiedBy(),"lastModifiedBy");
+		assertEquals(ir.getModifyTime(),time);
+		assertEquals(ir.getNetworkId(),"networkId");
+		assertEquals(ir.getNetworkName(),"networkName");
+		assertEquals(ir.getNetworkType(),"networkType");
+		assertEquals(ir.getOperationalEnvId(),"operationalEnvId");
+		assertEquals(ir.getOperationalEnvName(),"operationalEnvName");
+	    assert(ir.getProgress().equals(progress));
+		assertEquals(ir.getProvStatus(),"provStatus");
+		assertEquals(ir.getRequestAction(),"requestAction");
+		assertEquals(ir.getRequestBody(),"requestBody");
+		assertEquals(ir.getRequestId(),"requestId");
+		assertEquals(ir.getRequestorId(),"requestorId");
+		assertEquals(ir.getRequestScope(),"requestScope");
+		assertEquals(ir.getRequestStatus(),"requestStatus");
+		assertEquals(ir.getRequestType(),"requestType");
+		assertEquals(ir.getResponseBody(),"responseBody");
+		assertEquals(ir.getServiceInstanceId(),"serviceInstanceId");
+		assertEquals(ir.getServiceInstanceName(),"serviceInstanceName");
+		assertEquals(ir.getServiceType(),"serviceType");
+		assertEquals(ir.getSource(),"source");
+		assertEquals(ir.getStartTime(),time);
+		assertEquals(ir.getStatusMessage(),"statusMessage");
+		assertEquals(ir.getTenantId(),"tenantId");
+		assertEquals(ir.getVfModuleId(),"vfModuleId");
+		assertEquals(ir.getVfModuleModelName(),"vfModuleModelName");
+		assertEquals(ir.getVfModuleName(),"vfModuleName");
+		assertEquals(ir.getVnfId(),"vnfId");
+		assertEquals(ir.getVnfName(),"vnfName");
+		assertEquals(ir.getVnfOutputs(),"vnfOutputs");
+		assertEquals(ir.getVnfParams(),"vnfParams");
+		assertEquals(ir.getVnfType(),"vnfType");
+		assertEquals(ir.getVolumeGroupId(),"volumeGroupId");
+		assertEquals(ir.getVolumeGroupName(),"volumeGroupName");
+		
+	}
+	
+
+}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/OperationStatusTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/OperationStatusTest.java
new file mode 100644
index 0000000000..cf18524ee1
--- /dev/null
+++ b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/OperationStatusTest.java
@@ -0,0 +1,61 @@
+/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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
+*
+* 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=========================================================
+*/
+package org.openecomp.mso.requestsdb;
+
+import static org.junit.Assert.*;
+import java.sql.Timestamp;
+import org.junit.Test;
+
+public class OperationStatusTest {
+	
+	OperationStatus os=new OperationStatus();
+	Timestamp time=new Timestamp(10);
+	Object obj=new Object();
+	@Test
+	public void test() {
+		os.setFinishedAt(time);
+		os.setOperateAt(time);
+		os.setOperation("operation");
+		os.setOperationContent("operationContent");
+		os.setOperationId("operationId");
+		os.setProgress("progress");
+		os.setReason("reason");
+		os.setResult("result");
+		os.setServiceId("serviceId");
+		os.setServiceName("serviceName");
+		os.setUserId("userId");
+		
+		assertEquals(os.getFinishedAt(), time);
+		assertEquals(os.getOperateAt(), time);
+		assertEquals(os.getOperation(), "operation");
+		assertEquals(os.getOperationContent(), "operationContent");
+		assertEquals(os.getOperationId(), "operationId");
+		assertEquals(os.getProgress(), "progress");
+		assertEquals(os.getReason(), "reason");
+		assertEquals(os.getResult(), "result");
+		assertEquals(os.getServiceId(), "serviceId");
+		assertEquals(os.getServiceName(), "serviceName");
+		assertEquals(os.getUserId(), "userId");
+		
+		os.equals(obj);
+		os.hashCode();
+	}
+
+}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/OperationalEnvDistributionStatusTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/OperationalEnvDistributionStatusTest.java
index b0c1c02e7f..6381ec63b9 100644
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/OperationalEnvDistributionStatusTest.java
+++ b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/OperationalEnvDistributionStatusTest.java
@@ -1,40 +1,56 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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
- *
- * 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=========================================================
- */
-
+/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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
+*
+* 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=========================================================
+*/
 package org.openecomp.mso.requestsdb;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 import java.sql.Timestamp;
 
 public class OperationalEnvDistributionStatusTest {
 
-	OperationalEnvDistributionStatus _operationalEnvDistributionStatus;
+	OperationalEnvDistributionStatus oeds=new OperationalEnvDistributionStatus();
+    Timestamp time=new Timestamp(10);
+	@Test
+	public void test(){
+	    oeds.setCreateTime(time);
+	    oeds.setDistributionId("distributionId");
+	    oeds.setDistributionIdErrorReason("distributionIdErrorReason");
+	    oeds.setDistributionIdStatus("distributionIdStatus");
+	    oeds.setModifyTime(time);
+	    oeds.setOperationalEnvId("operationalEnvId");
+	    oeds.setRequestId("requestId");
+	    oeds.setServiceModelVersionId("serviceModelVersionId");
+	    
+	    assertEquals(oeds.getCreateTime(), time);
+	    assertEquals(oeds.getDistributionId(), "distributionId");
+	    assertEquals(oeds.getDistributionIdErrorReason(), "distributionIdErrorReason");
+	    assertEquals(oeds.getDistributionIdStatus(), "distributionIdStatus");
+	    assertEquals(oeds.getModifyTime(),time);
+	    assertEquals(oeds.getOperationalEnvId(), "operationalEnvId");
+	    assertEquals(oeds.getRequestId(), "requestId");
+	    assertEquals(oeds.getServiceModelVersionId(), "serviceModelVersionId");
+	}
+}
 	
-	protected String _distributionId;
+	/*protected String _distributionId;
 	protected String _operationalEnvId;
 	protected String _serviceModelVersionId;
 	protected String _requestId;
@@ -74,9 +90,9 @@ public class OperationalEnvDistributionStatusTest {
 		_operationalEnvDistributionStatus = null;
 	}
 	
-	/**
+	*//**
 	 * Test of getDistributionId method
-	 */
+	 *//*
 	@Test
 	public void testGetDistributionId() {
 		_operationalEnvDistributionStatus.setDistributionId(_distributionId);
@@ -84,18 +100,18 @@ public class OperationalEnvDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setDistributionId  method
-	 */
+	 *//*
 	@Test
 	public void testSetDistributionId() {
 		_operationalEnvDistributionStatus.setDistributionId(_distributionId);
 		verify(_operationalEnvDistributionStatus).setDistributionId(_distributionId);
 	}
 	
-	/**
+	*//**
 	 * Test of getOperationalEnvId method
-	 */
+	 *//*
 	@Test
 	public void testGetOperationalEnvId() {
 		_operationalEnvDistributionStatus.setOperationalEnvId(_operationalEnvId);
@@ -103,18 +119,18 @@ public class OperationalEnvDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setOperationalEnvId method
-	 */
+	 *//*
 	@Test
 	public void testSetOperationalEnvId() {
 		_operationalEnvDistributionStatus.setOperationalEnvId(_operationalEnvId);
 		verify(_operationalEnvDistributionStatus).setOperationalEnvId(_operationalEnvId);
 	}
 	
-	/**
+	*//**
 	 * Test of getServiceModelVersionId method
-	 */
+	 *//*
 	@Test
 	public void testGetServiceModelVersionId() {
 		_operationalEnvDistributionStatus.setServiceModelVersionId(_serviceModelVersionId);
@@ -122,18 +138,18 @@ public class OperationalEnvDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setServiceModelVersionId method
-	 */
+	 *//*
 	@Test
 	public void testSetServiceModelVersionId() {
 		_operationalEnvDistributionStatus.setServiceModelVersionId(_serviceModelVersionId);
 		verify(_operationalEnvDistributionStatus).setServiceModelVersionId(_serviceModelVersionId);
 	}
 	
-	/**
+	*//**
 	 * Test of getRequestId method
-	 */
+	 *//*
 	@Test
 	public void testGetRequestId() {
 		_operationalEnvDistributionStatus.setRequestId(_requestId);
@@ -141,18 +157,18 @@ public class OperationalEnvDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setRequestId method
-	 */
+	 *//*
 	@Test
 	public void testSetRequestId() {
 		_operationalEnvDistributionStatus.setRequestId(_requestId);
 		verify(_operationalEnvDistributionStatus).setRequestId(_requestId);
 	}
 	
-	/**
+	*//**
 	 * Test of getDistributionIdStatus method
-	 */
+	 *//*
 	@Test
 	public void testGetDistributionIdStatus() {
 		_operationalEnvDistributionStatus.setDistributionIdStatus(_distributionIdStatus);
@@ -160,18 +176,18 @@ public class OperationalEnvDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setDistributionIdStatus method
-	 */
+	 *//*
 	@Test
 	public void testSetDistributionIdStatus() {
 		_operationalEnvDistributionStatus.setDistributionIdStatus(_distributionIdStatus);
 		verify(_operationalEnvDistributionStatus).setDistributionIdStatus(_distributionIdStatus);
 	}
 	
-	/**
+	*//**
 	 * Test of getDistributionIdErrorReason method
-	 */
+	 *//*
 	@Test
 	public void testGetDistributionIdErrorReason() {
 		_operationalEnvDistributionStatus.setDistributionIdErrorReason(_distributionIdErrorReason);
@@ -179,18 +195,18 @@ public class OperationalEnvDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setDistributionIdErrorReason method
-	 */
+	 *//*
 	@Test
 	public void testSetDistributionIdErrorReason() {
 		_operationalEnvDistributionStatus.setDistributionIdErrorReason(_distributionIdErrorReason);
 		verify(_operationalEnvDistributionStatus).setDistributionIdErrorReason(_distributionIdErrorReason);
 	}
 	
-	/**
+	*//**
 	 * Test of getCreateTime method
-	 */
+	 *//*
 	@Test
 	public void testGetCreateTime() {
 		_operationalEnvDistributionStatus.setCreateTime(_createTime);
@@ -199,18 +215,18 @@ public class OperationalEnvDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setCreateTime method
-	 */
+	 *//*
 	@Test
 	public void testSetCreateTime() {
 		_operationalEnvDistributionStatus.setCreateTime(_createTime);
 		verify(_operationalEnvDistributionStatus).setCreateTime(_createTime);
 	}
 	
-	/**
+	*//**
 	 * Test of getModifyTime method
-	 */
+	 *//*
 	@Test
 	public void testGetModifyTime() {
 		_operationalEnvDistributionStatus.setModifyTime(_modifyTime);
@@ -219,9 +235,9 @@ public class OperationalEnvDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setModifyTime method
-	 */
+	 *//*
 	@Test
 	public void testSetModifyTime() {
 		_operationalEnvDistributionStatus.setModifyTime(_modifyTime);
@@ -230,3 +246,4 @@ public class OperationalEnvDistributionStatusTest {
 	
 	
 }
+*/
\ No newline at end of file
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/OperationalEnvServiceModelStatusTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/OperationalEnvServiceModelStatusTest.java
index eb6a9f1d82..ecde7b36f6 100644
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/OperationalEnvServiceModelStatusTest.java
+++ b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/OperationalEnvServiceModelStatusTest.java
@@ -1,39 +1,57 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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
- *
- * 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=========================================================
- */
+/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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
+*
+* 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=========================================================
+*/
 
 package org.openecomp.mso.requestsdb;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import java.sql.Timestamp;
-
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 public class OperationalEnvServiceModelStatusTest {
 	
-	OperationalEnvServiceModelStatus _operationalEnvServiceModelStatus;
+	OperationalEnvServiceModelStatus oesms=new OperationalEnvServiceModelStatus();
+	Timestamp time=new Timestamp(10);
+	@Test
+	public void test(){
+		oesms.setCreateTime(time);
+		oesms.setModifyTime(time);
+		oesms.setOperationalEnvId("operationalEnvId");
+		oesms.setRecoveryAction("recoveryAction");
+		oesms.setRequestId("requestId");
+		oesms.setRetryCount(0);
+		oesms.setServiceModelVersionDistrStatus("serviceModelVersionDistrStatus");
+		oesms.setServiceModelVersionId("serviceModelVersionId");
+		oesms.setWorkloadContext("workloadContext");
+		
+		assertEquals(oesms.getCreateTime(), time);
+		assertEquals(oesms.getModifyTime(), time);
+		assertEquals(oesms.getOperationalEnvId(), "operationalEnvId");
+		assertEquals(oesms.getRecoveryAction(), "recoveryAction");
+		assertEquals(oesms.getRequestId(), "requestId");
+		assertEquals(oesms.getRetryCount(), 0);
+		assertEquals(oesms.getServiceModelVersionDistrStatus(), "serviceModelVersionDistrStatus");
+		assertEquals(oesms.getServiceModelVersionId(), "serviceModelVersionId");
+		assertEquals(oesms.getWorkloadContext(), "workloadContext");
+	}
+}
+	/*OperationalEnvServiceModelStatus _operationalEnvServiceModelStatus;
 	
 	protected String _requestId;
 	protected String _operationalEnvId;
@@ -79,9 +97,9 @@ public class OperationalEnvServiceModelStatusTest {
 		_operationalEnvServiceModelStatus = null;
 	}
 	
-	/**
+	*//**
 	 * Test of getRequestId method
-	 */
+	 *//*
 	@Test
 	public void testGetRequestId() {
 		_operationalEnvServiceModelStatus.setRequestId(_requestId);
@@ -89,18 +107,18 @@ public class OperationalEnvServiceModelStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setRequestId  method
-	 */
+	 *//*
 	@Test
 	public void testSetRequestId() {
 		_operationalEnvServiceModelStatus.setRequestId(_requestId);
 		verify(_operationalEnvServiceModelStatus).setRequestId(_requestId);
 	}
 
-	/**
+	*//**
 	 * Test of getOperationalEnvId method
-	 */
+	 *//*
 	@Test
 	public void testGetOperationalEnvId() {
 		_operationalEnvServiceModelStatus.setOperationalEnvId(_operationalEnvId);
@@ -108,18 +126,18 @@ public class OperationalEnvServiceModelStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setOperationalEnvId method
-	 */
+	 *//*
 	@Test
 	public void testSetOperationalEnvId() {
 		_operationalEnvServiceModelStatus.setOperationalEnvId(_operationalEnvId);
 		verify(_operationalEnvServiceModelStatus).setOperationalEnvId(_operationalEnvId);
 	}
 	
-	/**
+	*//**
 	 * Test of getServiceModelVersionId method
-	 */
+	 *//*
 	@Test
 	public void testGetServiceModelVersionId() {
 		_operationalEnvServiceModelStatus.setServiceModelVersionId(_serviceModelVersionId);
@@ -127,18 +145,18 @@ public class OperationalEnvServiceModelStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setServiceModelVersionId method
-	 */
+	 *//*
 	@Test
 	public void testSetServiceModelVersionId() {
 		_operationalEnvServiceModelStatus.setServiceModelVersionId(_serviceModelVersionId);
 		verify(_operationalEnvServiceModelStatus).setServiceModelVersionId(_serviceModelVersionId);
 	}
 	
-	/**
+	*//**
 	 * Test of getServiceModelVersionId method
-	 */
+	 *//*
 	@Test
 	public void testGetServiceModelVersionDistrStatus() {
 		_operationalEnvServiceModelStatus.setServiceModelVersionDistrStatus(_serviceModelVersionDistrStatus);
@@ -146,18 +164,18 @@ public class OperationalEnvServiceModelStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setServiceModelVersionId method
-	 */
+	 *//*
 	@Test
 	public void testSetServiceModelVersionDistrStatus() {
 		_operationalEnvServiceModelStatus.setServiceModelVersionDistrStatus(_serviceModelVersionDistrStatus);
 		verify(_operationalEnvServiceModelStatus).setServiceModelVersionDistrStatus(_serviceModelVersionDistrStatus);
 	}
 	
-	/**
+	*//**
 	 * Test of getOperationalEnvId method
-	 */
+	 *//*
 	@Test
 	public void testGetRecoveryAction() {
 		_operationalEnvServiceModelStatus.setRecoveryAction(_recoveryAction);
@@ -165,18 +183,18 @@ public class OperationalEnvServiceModelStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setOperationalEnvId method
-	 */
+	 *//*
 	@Test
 	public void testSetRecoveryAction() {
 		_operationalEnvServiceModelStatus.setRecoveryAction(_recoveryAction);
 		verify(_operationalEnvServiceModelStatus).setRecoveryAction(_recoveryAction);
 	}
 	
-	/**
+	*//**
 	 * Test of getOperationalEnvId method
-	 */
+	 *//*
 	@Test
 	public void testGetRetryCount() {
 		_operationalEnvServiceModelStatus.setRetryCount(_retryCount);
@@ -184,18 +202,18 @@ public class OperationalEnvServiceModelStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setOperationalEnvId method
-	 */
+	 *//*
 	@Test
 	public void testSetRetryCount() {
 		_operationalEnvServiceModelStatus.setRetryCount(_retryCount);
 		verify(_operationalEnvServiceModelStatus).setRetryCount(_retryCount);
 	}
 	
-	/**
+	*//**
 	 * Test of getOperationalEnvId method
-	 */
+	 *//*
 	@Test
 	public void testGetWorkloadContext() {
 		_operationalEnvServiceModelStatus.setWorkloadContext(_workloadContext);
@@ -203,18 +221,18 @@ public class OperationalEnvServiceModelStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setOperationalEnvId method
-	 */
+	 *//*
 	@Test
 	public void testSetWorkloadContext() {
 		_operationalEnvServiceModelStatus.setWorkloadContext(_workloadContext);
 		verify(_operationalEnvServiceModelStatus).setWorkloadContext(_workloadContext);
 	}
 	
-	/**
+	*//**
 	 * Test of getCreateTime method
-	 */
+	 *//*
 	@Test
 	public void testGetCreateTime() {
 		_operationalEnvServiceModelStatus.setCreateTime(_createTime);
@@ -222,18 +240,18 @@ public class OperationalEnvServiceModelStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setCreateTime method
-	 */
+	 *//*
 	@Test
 	public void testSetCreateTime() {
 		_operationalEnvServiceModelStatus.setCreateTime(_createTime);
 		verify(_operationalEnvServiceModelStatus).setCreateTime(_createTime);
 	}
 	
-	/**
+	*//**
 	 * Test of getModifyTime method
-	 */
+	 *//*
 	@Test
 	public void testGetModifyTime() {
 		_operationalEnvServiceModelStatus.setModifyTime(_modifyTime);
@@ -241,13 +259,13 @@ public class OperationalEnvServiceModelStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setModifyTime method
-	 */
+	 *//*
 	@Test
 	public void testSetModifyTime() {
 		_operationalEnvServiceModelStatus.setModifyTime(_modifyTime);
 		verify(_operationalEnvServiceModelStatus).setModifyTime(_modifyTime);
 	}
-	
-}
+	*/
+
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/ResourceOperationStatusTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/ResourceOperationStatusTest.java
new file mode 100644
index 0000000000..a9773c3bae
--- /dev/null
+++ b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/ResourceOperationStatusTest.java
@@ -0,0 +1,58 @@
+/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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
+*
+* 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=========================================================
+*/
+package org.openecomp.mso.requestsdb;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class ResourceOperationStatusTest {
+
+	ResourceOperationStatus ros=new ResourceOperationStatus();
+	ResourceOperationStatus ros1=new ResourceOperationStatus("serviceId", "operationId", "resourceTemplateUUID");
+	Object obj=new Object();
+	@Test
+	public void test() {
+	ros.setErrorCode("errorCode");
+	ros.setJobId("jobId");
+	ros.setOperationId("operationId");
+	ros.setOperType("operType");
+	ros.setProgress("progress");
+	ros.setResourceInstanceID("resourceInstanceID");
+	ros.setResourceTemplateUUID("resourceTemplateUUId");
+	ros.setServiceId("serviceId");
+	ros.setStatus("101");
+	ros.setStatusDescription("statusDescription");
+	
+	assertEquals(ros.getErrorCode(), "errorCode");
+	assertEquals(ros.getJobId(), "jobId");
+	assertEquals(ros.getOperationId(), "operationId");
+	assertEquals(ros.getOperType(), "operType");
+	assertEquals(ros.getProgress(), "progress");
+	assertEquals(ros.getResourceInstanceID(), "resourceInstanceID");
+	assertEquals(ros.getResourceTemplateUUID(), "resourceTemplateUUId");
+	assertEquals(ros.getServiceId(), "serviceId");
+	assertEquals(ros.getStatus(), "101");
+	assertEquals(ros.getStatusDescription(), "statusDescription");
+	ros.equals(obj);
+	ros.hashCode();
+	}
+
+}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/SiteStatusTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/SiteStatusTest.java
new file mode 100644
index 0000000000..b989dac262
--- /dev/null
+++ b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/SiteStatusTest.java
@@ -0,0 +1,44 @@
+/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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
+*
+* 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=========================================================
+*/
+package org.openecomp.mso.requestsdb;
+
+import static org.junit.Assert.*;
+import java.sql.Timestamp;
+import org.junit.Test;
+
+public class SiteStatusTest {
+
+    SiteStatus ss=new SiteStatus();
+    Timestamp time=new Timestamp(10);
+    @Test
+    public void test() {
+      ss.setCreated(time);
+      ss.setSiteName("siteName");
+      ss.setStatus(true);
+      
+      assertEquals(ss.getCreated(), time);
+      assertEquals(ss.getSiteName(), "siteName");
+      assertEquals(ss.getStatus(), true);
+    }
+    @Test
+    public void testToString(){
+       assert(ss.toString()!=null);
+    }
+}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/WatchdogComponentDistributionStatusTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/WatchdogComponentDistributionStatusTest.java
index b36166942d..0d68c12a0a 100644
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/WatchdogComponentDistributionStatusTest.java
+++ b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/WatchdogComponentDistributionStatusTest.java
@@ -1,39 +1,50 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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
- *
- * 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=========================================================
- */
-
+/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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
+*
+* 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=========================================================
+*/
 package org.openecomp.mso.requestsdb;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import java.sql.Timestamp;
-
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 public class WatchdogComponentDistributionStatusTest {
+    
+  WatchdogComponentDistributionStatus wcds=new WatchdogComponentDistributionStatus();
+  Timestamp time=new Timestamp(10);
+  
+  @Test
+  public void test(){
+      wcds.setComponentDistributionStatus("componentDistributionStatus");
+      wcds.setComponentName("componentName");
+      wcds.setCreateTime(time);
+      wcds.setDistributionId("distributionId");
+      wcds.setModifyTime(time);
+      
+      assertEquals(wcds.getComponentDistributionStatus(), "componentDistributionStatus");
+      assertEquals(wcds.getComponentName(), "componentName");
+      assertEquals(wcds.getCreateTime(), time);
+      assertEquals(wcds.getDistributionId(), "distributionId");
+      assertEquals(wcds.getModifyTime(), time);
+  }
+}
 		
-	WatchdogComponentDistributionStatus _watchdogComponentDistributionStatus;
+	/*WatchdogComponentDistributionStatus _watchdogComponentDistributionStatus;
 	
 	protected String _distributionId;
 	protected String _componentName;
@@ -65,9 +76,9 @@ public class WatchdogComponentDistributionStatusTest {
 		_watchdogComponentDistributionStatus = null;
 	}
 	
-	/**
+	*//**
 	 * Test of getDistributionId method
-	 */
+	 *//*
 	@Test
 	public void testGetDistributionId() {
 		_watchdogComponentDistributionStatus.setDistributionId(_distributionId);
@@ -75,18 +86,18 @@ public class WatchdogComponentDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setDistributionId  method
-	 */
+	 *//*
 	@Test
 	public void testSetDistributionId() {
 		_watchdogComponentDistributionStatus.setDistributionId(_distributionId);
 		verify(_watchdogComponentDistributionStatus).setDistributionId(_distributionId);
 	}
 	
-	/**
+	*//**
 	 * Test of getDistributionId method
-	 */
+	 *//*
 	@Test
 	public void testGetComponentName() {
 		_watchdogComponentDistributionStatus.setComponentName(_componentName);
@@ -94,18 +105,18 @@ public class WatchdogComponentDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setDistributionId  method
-	 */
+	 *//*
 	@Test
 	public void testSetComponentName() {
 		_watchdogComponentDistributionStatus.setComponentName(_componentName);
 		verify(_watchdogComponentDistributionStatus).setComponentName(_componentName);
 	}
 	
-	/**
+	*//**
 	 * Test of getDistributionId method
-	 */
+	 *//*
 	@Test
 	public void testGetComponentDistributionStatus() {
 		_watchdogComponentDistributionStatus.setComponentDistributionStatus(_componentDistributionStatus);
@@ -113,18 +124,18 @@ public class WatchdogComponentDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setDistributionId  method
-	 */
+	 *//*
 	@Test
 	public void testSetComponentDistributionStatus() {
 		_watchdogComponentDistributionStatus.setComponentDistributionStatus(_componentDistributionStatus);
 		verify(_watchdogComponentDistributionStatus).setComponentDistributionStatus(_componentDistributionStatus);
 	}
 	
-	/**
+	*//**
 	 * Test of getCreateTime method
-	 */
+	 *//*
 	@Test
 	public void testGetCreateTime() {
 		_watchdogComponentDistributionStatus.setCreateTime(_createTime);
@@ -133,18 +144,18 @@ public class WatchdogComponentDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setCreateTime method
-	 */
+	 *//*
 	@Test
 	public void testSetCreateTime() {
 		_watchdogComponentDistributionStatus.setCreateTime(_createTime);
 		verify(_watchdogComponentDistributionStatus).setCreateTime(_createTime);
 	}
 	
-	/**
+	*//**
 	 * Test of getModifyTime method
-	 */
+	 *//*
 	@Test
 	public void testGetModifyTime() {
 		_watchdogComponentDistributionStatus.setModifyTime(_modifyTime);
@@ -153,9 +164,9 @@ public class WatchdogComponentDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setModifyTime method
-	 */
+	 *//*
 	@Test
 	public void testSetModifyTime() {
 		_watchdogComponentDistributionStatus.setModifyTime(_modifyTime);
@@ -163,3 +174,4 @@ public class WatchdogComponentDistributionStatusTest {
 	}
 	
 }
+*/
\ No newline at end of file
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/WatchdogDistributionStatusTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/WatchdogDistributionStatusTest.java
index 85ac4bba4a..c10d7ae15b 100644
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/WatchdogDistributionStatusTest.java
+++ b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/WatchdogDistributionStatusTest.java
@@ -1,39 +1,49 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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
- *
- * 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=========================================================
- */
+/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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
+*
+* 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=========================================================
+*/
 
 package org.openecomp.mso.requestsdb;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import java.sql.Timestamp;
-
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 public class WatchdogDistributionStatusTest {
+	
+	WatchdogDistributionStatus wds=new WatchdogDistributionStatus();
+	Timestamp time=new Timestamp(10);
+	@Test
+	public void test() {
+	wds.setCreateTime(time);
+	wds.setDistributionId("distributionId");
+	wds.setDistributionIdStatus("distributionIdStatus");
+	wds.setModifyTime(time);
+	
+	assertEquals(wds.getCreateTime(), time);
+	assertEquals(wds.getDistributionId(), "distributionId");
+	assertEquals(wds.getDistributionIdStatus(), "distributionIdStatus");
+	assertEquals(wds.getModifyTime(), time);
 
-	WatchdogDistributionStatus _watchdogDistributionStatus;
+	}
+
+
+/*	WatchdogDistributionStatus _watchdogDistributionStatus;
 	
 	protected String _distributionId;
 	protected String _distributionIdStatus;
@@ -62,9 +72,9 @@ public class WatchdogDistributionStatusTest {
 		_watchdogDistributionStatus = null;
 	}
 	
-	/**
+	*//**
 	 * Test of getDistributionId method
-	 */
+	 *//*
 	@Test
 	public void testGetDistributionId() {
 		_watchdogDistributionStatus.setDistributionId(_distributionId);
@@ -72,18 +82,18 @@ public class WatchdogDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setDistributionId  method
-	 */
+	 *//*
 	@Test
 	public void testSetDistributionId() {
 		_watchdogDistributionStatus.setDistributionId(_distributionId);
 		verify(_watchdogDistributionStatus).setDistributionId(_distributionId);
 	}
 	
-	/**
+	*//**
 	 * Test of getDistributionIdStatus method
-	 */
+	 *//*
 	@Test
 	public void testGetComponentDistributionStatus() {
 		_watchdogDistributionStatus.setDistributionIdStatus(_distributionIdStatus);
@@ -91,18 +101,18 @@ public class WatchdogDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setDistributionIdStatus  method
-	 */
+	 *//*
 	@Test
 	public void testSetComponentDistributionStatus() {
 		_watchdogDistributionStatus.setDistributionIdStatus(_distributionIdStatus);
 		verify(_watchdogDistributionStatus).setDistributionIdStatus(_distributionIdStatus);
 	}
 	
-	/**
+	*//**
 	 * Test of getCreateTime method
-	 */
+	 *//*
 	@Test
 	public void testGetCreateTime() {
 		_watchdogDistributionStatus.setCreateTime(_createTime);
@@ -110,18 +120,18 @@ public class WatchdogDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setCreateTime method
-	 */
+	 *//*
 	@Test
 	public void testSetCreateTime() {
 		_watchdogDistributionStatus.setCreateTime(_createTime);
 		verify(_watchdogDistributionStatus).setCreateTime(_createTime);
 	}
 	
-	/**
+	*//**
 	 * Test of getModifyTime method
-	 */
+	 *//*
 	@Test
 	public void testGetModifyTime() {
 		_watchdogDistributionStatus.setModifyTime(_modifyTime);
@@ -129,12 +139,12 @@ public class WatchdogDistributionStatusTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setModifyTime method
-	 */
+	 *//*
 	@Test
 	public void testSetModifyTime() {
 		_watchdogDistributionStatus.setModifyTime(_modifyTime);
 		verify(_watchdogDistributionStatus).setModifyTime(_modifyTime);
-	}
+	}*/
 }
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/WatchdogServiceModVerIdLookupTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/WatchdogServiceModVerIdLookupTest.java
index beda191194..d27c1b817e 100644
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/WatchdogServiceModVerIdLookupTest.java
+++ b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/WatchdogServiceModVerIdLookupTest.java
@@ -1,39 +1,45 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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
- *
- * 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=========================================================
- */
+/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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
+*
+* 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=========================================================
+*/
 
 package org.openecomp.mso.requestsdb;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import java.sql.Timestamp;
-
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 public class WatchdogServiceModVerIdLookupTest {
-	
-	WatchdogServiceModVerIdLookup _watchdogServiceModVerIdLookup;
+    
+    WatchdogServiceModVerIdLookup wsmil=new WatchdogServiceModVerIdLookup();
+    Timestamp time=new Timestamp(10);
+    @Test
+    public void test(){
+        wsmil.setCreateTime(time);
+        wsmil.setDistributionId("distributionId");
+        wsmil.setServiceModelVersionId("serviceModelVersionId");
+        
+        assertEquals(wsmil.getCreateTime(),time);
+        assertEquals(wsmil.getDistributionId(), "distributionId");
+        assertEquals(wsmil.getServiceModelVersionId(), "serviceModelVersionId");
+    }
+}
+/*WatchdogServiceModVerIdLookup _watchdogServiceModVerIdLookup;
 	
 	protected String _distributionId;
 	protected String _serviceModelVersionId;
@@ -58,9 +64,9 @@ public class WatchdogServiceModVerIdLookupTest {
 		_watchdogServiceModVerIdLookup = null;
 	}
 	
-	/**
+	*//**
 	 * Test of getDistributionId method
-	 */
+	 *//*
 	@Test
 	public void testGetDistributionId() {
 		_watchdogServiceModVerIdLookup.setDistributionId(_distributionId);
@@ -68,18 +74,18 @@ public class WatchdogServiceModVerIdLookupTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setDistributionId  method
-	 */
+	 *//*
 	@Test
 	public void testSetDistributionId() {
 		_watchdogServiceModVerIdLookup.setDistributionId(_distributionId);
 		verify(_watchdogServiceModVerIdLookup).setDistributionId(_distributionId);
 	}
 	
-	/**
+	*//**
 	 * Test of getServiceModelVersionId method
-	 */
+	 *//*
 	@Test
 	public void testGetServiceModelVersionId() {
 		_watchdogServiceModVerIdLookup.setServiceModelVersionId(_serviceModelVersionId);
@@ -87,18 +93,18 @@ public class WatchdogServiceModVerIdLookupTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setServiceModelVersionId  method
-	 */
+	 *//*
 	@Test
 	public void testSetServiceModelVersionId() {
 		_watchdogServiceModVerIdLookup.setServiceModelVersionId(_serviceModelVersionId);
 		verify(_watchdogServiceModVerIdLookup).setServiceModelVersionId(_serviceModelVersionId);
 	}
 	
-	/**
+	*//**
 	 * Test of getCreateTime method
-	 */
+	 *//*
 	@Test
 	public void testGetCreateTime() {
 		_watchdogServiceModVerIdLookup.setCreateTime(_createTime);
@@ -106,13 +112,13 @@ public class WatchdogServiceModVerIdLookupTest {
 
 	}
 
-	/**
+	*//**
 	 * Test setCreateTime method
-	 */
+	 *//*
 	@Test
 	public void testSetCreateTime() {
 		_watchdogServiceModVerIdLookup.setCreateTime(_createTime);
 		verify(_watchdogServiceModVerIdLookup).setCreateTime(_createTime);
 	}
 	
-}
\ No newline at end of file
+}*/
\ No newline at end of file