1 files changed, 83 insertions, 72 deletions
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/OperationalEnvServiceModelStatusDbTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/OperationalEnvServiceModelStatusDbTest.java
index 77776c2fe1..fb2a5a44d2 100644
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/OperationalEnvServiceModelStatusDbTest.java
+++ b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/OperationalEnvServiceModelStatusDbTest.java
@@ -22,88 +22,99 @@ package org.openecomp.mso.requestsdb;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Arrays;
 
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
-import org.mockito.Mockito;
+import org.junit.rules.ExpectedException;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.openecomp.mso.db.AbstractSessionFactoryManager;
 
 public class OperationalEnvServiceModelStatusDbTest {
 
-		
-		private static final String operationalEnvId = "12abad84e7ff";
-		private static final String serviceModelVersionId = "ff305d54-75b4-431b-adb2-eb6b9e5ff001";
-		private static final String requestId = "431b-adb2-eb6b9e5ff001";
-		private static final String status = "SENT";
-		private static final int retryCount = 1;
-		private static final String recoveryAction = "Retry";
-		private static final String workloadContext = "VNF_D2D";
-		
-		private OperationalEnvServiceModelStatus operEnvDistStatus;
+	@Mock
+	private AbstractSessionFactoryManager sessionFactoryRequest;
+	@Mock
+	private SessionFactory sessionFactory;
+	@Mock
+	private Session session;
 
-		
-		@Test
-		public void testGetOperationalEnvDistributionStatus() {
-				
-			OperationalEnvServiceModelStatusDb oesms = Mockito.mock(OperationalEnvServiceModelStatusDb.class);
-			Mockito.when(oesms.getOperationalEnvServiceModelStatus("12abad84e7ff", "ff305d54-75b4-431b-adb2-eb6b9e5ff001")).thenReturn(operEnvDistStatus);
-			OperationalEnvServiceModelStatus actual = oesms.getOperationalEnvServiceModelStatus(operationalEnvId, serviceModelVersionId);
-			assertEquals(actual, operEnvDistStatus);
-			verify(oesms, times(1)).getOperationalEnvServiceModelStatus(any(String.class), any(String.class));
-		}
-		
-		@Test
-		public void testGetOperationalEnvIdStatus() {
-			
-			List<OperationalEnvServiceModelStatus> operEnvSvcModelStatus = new ArrayList<>();		
-			OperationalEnvServiceModelStatusDb oesms = Mockito.mock(OperationalEnvServiceModelStatusDb.class);			
-			Mockito.when(oesms.getOperationalEnvIdStatus("12abad84e7ff", "ff305d54-75b4-431b-adb2-eb6b9e5ff001")).thenReturn(operEnvSvcModelStatus);
-			List<OperationalEnvServiceModelStatus> actual = oesms.getOperationalEnvIdStatus(operationalEnvId, requestId);
-			assertEquals(actual, operEnvSvcModelStatus);
-			verify(oesms, times(1)).getOperationalEnvIdStatus(any(String.class), any(String.class));
-			
-		}
-		
-		@Test
-		public void testUpdateOperationalEnvRetryCountStatus() {
-		
-			int val = 1;
-			OperationalEnvServiceModelStatusDb oesms = Mockito.mock(OperationalEnvServiceModelStatusDb.class);
-			Mockito.when(oesms.updateOperationalEnvRetryCountStatus("12abad84e7ff", "ff305d54-75b4-431b-adb2-eb6b9e5ff001", "SENT", 1)).thenReturn(val);
-			int actual = oesms.updateOperationalEnvRetryCountStatus(operationalEnvId, serviceModelVersionId, status, retryCount);
-			assertEquals(actual, val);
-			verify(oesms, times(1)).updateOperationalEnvRetryCountStatus(any(String.class), any(String.class), any(String.class), any(int.class));
-		}
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
 
-		@Test
-		public void testUpdateOperationalEnvRetryCountStatusPerReqId() {
-		
-			int val = 1;
-			OperationalEnvServiceModelStatusDb oesms = Mockito.mock(OperationalEnvServiceModelStatusDb.class);
-			Mockito.when(oesms.updateOperationalEnvRetryCountStatusPerReqId("12abad84e7ff", "ff305d54-75b4-431b-adb2-eb6b9e5ff001", "SENT", 1, "431b-adb2-eb6b9e5ff001")).thenReturn(val);
-			int actual = oesms.updateOperationalEnvRetryCountStatusPerReqId(operationalEnvId, serviceModelVersionId, status, retryCount, requestId);
-			assertEquals(actual, val);
-			verify(oesms, times(1)).updateOperationalEnvRetryCountStatusPerReqId(any(String.class), any(String.class), any(String.class), 
-					any(int.class), any(String.class));
-		}
-	
+	@Before
+	public void setUp() {
+		MockitoAnnotations.initMocks(this);
+		when(sessionFactory.openSession()).thenReturn(session);
+		when(sessionFactoryRequest.getSessionFactory()).thenReturn(sessionFactory);
 
-		@Test
-		public void testInsertOperationalEnvServiceModelStatus() {
-		
-			OperationalEnvServiceModelStatusDb oesms = mock(OperationalEnvServiceModelStatusDb.class);
-			
-			oesms.insertOperationalEnvServiceModelStatus(requestId, operationalEnvId, serviceModelVersionId, status, recoveryAction,  retryCount, workloadContext);		
-			doNothing().when(oesms).insertOperationalEnvServiceModelStatus(any(String.class), any(String.class), any(String.class), 
-					any(String.class), any(String.class), any(int.class), any(String.class));       
-			verify(oesms, times(1)).insertOperationalEnvServiceModelStatus(any(String.class), any(String.class), any(String.class), 
-					any(String.class), any(String.class), any(int.class), any(String.class));
+	}
+
+	@Test
+	public void insertFailure() {
+		OperationalEnvServiceModelStatusDb omsDB = new OperationalEnvServiceModelStatusDb(this.sessionFactoryRequest);
+		Query mockQuery = mock(Query.class);
+		when(session.createQuery(any(String.class))).thenReturn(mockQuery);
+		when(mockQuery.uniqueResult()).thenReturn(null);
+		when(session.isOpen()).thenReturn(true);
+		when(session.getTransaction()).thenThrow(Exception.class);
+		thrown.expect(Exception.class);
+
+		omsDB.insertOperationalEnvServiceModelStatus("myRequestId", "myOperationalEnvId", "myServiceModelVersionId", "myVal", "myRecoveryAction", 1, "myWorkloadContext");
+	}
+
+	@Test
+	public void updateFailureRetryCount() {
+		OperationalEnvServiceModelStatusDb omsDB = new OperationalEnvServiceModelStatusDb(this.sessionFactoryRequest);
+		Query mockQuery = mock(Query.class);
+		when(session.createQuery(any(String.class))).thenReturn(mockQuery);
+		when(session.isOpen()).thenReturn(true);
+		when(session.getTransaction()).thenThrow(Exception.class);
+		thrown.expect(Exception.class);
 		
-		}
+		omsDB.updateOperationalEnvRetryCountStatus("myOperationalEnvId", "myServiceModelVersionId", "status", 1);
+	}
+	
+	@Test
+	public void updateFailureRetryCountPerReqId() {
+		OperationalEnvServiceModelStatusDb omsDB = new OperationalEnvServiceModelStatusDb(this.sessionFactoryRequest);
+		Query mockQuery = mock(Query.class);
+		when(session.createQuery(any(String.class))).thenReturn(mockQuery);
+		when(session.isOpen()).thenReturn(true);
+		when(session.getTransaction()).thenThrow(Exception.class);
+		thrown.expect(Exception.class);
 		
+		omsDB.updateOperationalEnvRetryCountStatusPerReqId("myOperationalEnvId", "myServiceModelVersionId", "status", 1, "myReqId");
+	}
+	
+	
+	@Test
+	public void getOperationalEnvIdStatusTest() {
+		OperationalEnvServiceModelStatusDb omsDB = new OperationalEnvServiceModelStatusDb(this.sessionFactoryRequest);
+		Query mockQuery = mock(Query.class);
+		OperationalEnvServiceModelStatus status = new OperationalEnvServiceModelStatus();
+		when(session.createQuery(any(String.class))).thenReturn(mockQuery);
+		when(mockQuery.list()).thenReturn(Arrays.asList(status));
+		when(session.isOpen()).thenReturn(true);
+		assertEquals(status, omsDB.getOperationalEnvIdStatus("myEnvId", "myReqId").get(0));
+	}
+	
+	@Test
+	public void getOperationalEnvServiceModelStatusTest() {
+		OperationalEnvServiceModelStatusDb omsDB = new OperationalEnvServiceModelStatusDb(this.sessionFactoryRequest);
+		OperationalEnvServiceModelStatus status = new OperationalEnvServiceModelStatus();
+		Query mockQuery = mock(Query.class);
+		when(session.createQuery(any(String.class))).thenReturn(mockQuery);
+		when(mockQuery.uniqueResult()).thenReturn(status);
+		when(session.isOpen()).thenReturn(true);
+		assertEquals(status, omsDB.getOperationalEnvServiceModelStatus("myEnvId", "myModelId"));
+	}
 }