X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fhelpers%2Ftest%2FJU_Future.java;h=7a94b9f88b7f9dc78364be716e79c97ac88b2a71;hb=3d1706fcbe7f95830ff6fd23cf679ee55c6d0595;hp=91950c66f630fdce4eab7d8713482057b59a0b4b;hpb=dc4923a67f424149e35a77108f5b2ac3418fbaf3;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java
index 91950c66..7a94b9f8 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java
@@ -36,7 +36,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.onap.aaf.auth.batch.helpers.Creator;
 import org.onap.aaf.auth.batch.helpers.Future;
-import org.onap.aaf.auth.batch.helpers.creators.RowCreator;
 import org.onap.aaf.auth.dao.cass.FutureDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
@@ -52,126 +51,84 @@ import com.datastax.driver.core.SimpleStatement;
 
 public class JU_Future {
 
-	Future future;
-	Date start;
-	Date expires;
-	ByteBuffer bBuff;
-
-	@Before
-	public void setUp() {
-		UUID id = new UUID(0, 0);
-		start = new Date();
-		expires = new Date();
-		future = new Future(id, "Re-Validate Ownership for AAF Namespace '\'test\'test", "target", start, expires,
-				bBuff);
-	}
-
-	@Test
-	public void testId() {
-		Assert.assertTrue(future.id() instanceof UUID);
-	}
-
-	@Test
-	public void testMemo() {
-		Assert.assertEquals("Re-Validate Ownership for AAF Namespace '\'test\'test", future.memo());
-	}
-
-	@Test
-	public void testStart() {
-		Assert.assertTrue(future.start() instanceof Date);
-	}
-
-	@Test
-	public void testExpires() {
-		Assert.assertTrue(future.expires() instanceof Date);
-	}
-
-	@Test
-	public void testTarget() {
-		Assert.assertEquals("target", future.target());
-	}
-
-	@Test
-	public void testExpunge() {
-		future.expunge();
-	}
-
-	@Test
-	public void testCompareTo() {
-		future.compareTo(null);
-		future.compareTo(future);
-	}
-
-	@Test
-	public void testResetLocalData() {
-		Future.resetLocalData();
-	}
-
-	@Test
-	public void testSizeForDeletion() {
-		Assert.assertEquals(0, Future.sizeForDeletion());
-	}
-
-	@Test
-	public void testPendingDelete() {
-		Assert.assertEquals(false, Future.pendingDelete(future));
-	}
-
-	@Test
-	public void testLoad() {
-		Session session = mock(Session.class);
-		Trans trans = mock(Trans.class);
-		@SuppressWarnings("unchecked")
-		Creator<Future> creator = (Creator<Future>)mock(Creator.class);
-		LogTarget target = mock(LogTarget.class);
-		TimeTaken tt = mock(TimeTaken.class);
-		ResultSet results = mock(ResultSet.class);
-		ArrayList<Row> rows = new ArrayList<Row>();
-		Row row = RowCreator.getRow();
-		rows.add(row);
-
-		when(results.all()).thenReturn(rows);
-		when(trans.info()).thenReturn(target);
-		when(trans.start("Load Futures", Env.REMOTE)).thenReturn(tt);
-		when(trans.start("Process Futures", Env.SUB)).thenReturn(tt);
-		when(session.execute(any(SimpleStatement.class))).thenReturn(results);
-		when(creator.create(row)).thenReturn(future);
-
-		Future.load(trans, session, creator);
-	}
-
-	@Test
-	public void testV2() {
-		Future.v2_0_17.create(RowCreator.getRow());
-		assertEquals(Future.v2_0_17.select(), "select id,memo,target,start,expires from authz.future");
-	}
-
-	@Test
-	public void testWithConstruct() {
-		Future.withConstruct.create(RowCreator.getRow());
-		assertEquals(Future.withConstruct.select(), "select id,memo,target,start,expires,construct from authz.future");
-	}
-
-	@Test
-	public void testDelayedDeleteWithDryRun() {
-		AuthzTrans trans = mock(AuthzTrans.class);
-		LogTarget target = mock(LogTarget.class);
-
-		when(trans.info()).thenReturn(target);
-
-		assertEquals(Result.ok().status, future.delayedDelete(trans, null, true, "text").status);
-	}
-
-	@Test
-	public void testDelayedDeleteNonDryRun() {
-		AuthzTrans trans = mock(AuthzTrans.class);
-		LogTarget target = mock(LogTarget.class);
-		FutureDAO fd = mock(FutureDAO.class);
-
-		when(trans.info()).thenReturn(target);
-		when(fd.delete(any(AuthzTrans.class), any(FutureDAO.Data.class), any(Boolean.class))).thenReturn(Result.ok());
-
-		assertEquals(Result.ok().status, future.delayedDelete(trans, fd, false, "text").status);
-	}
+    Future future;
+    Date start;
+    Date expires;
+    ByteBuffer bBuff;
+
+    @Before
+    public void setUp() {
+        UUID id = new UUID(0, 0);
+        start = new Date();
+        expires = new Date();
+        future = new Future(id, "Re-Validate Ownership for AAF Namespace '\'test\'test", "target", start, expires,
+                bBuff);
+    }
+
+    @Test
+    public void testId() {
+        Assert.assertTrue(future.id() instanceof UUID);
+    }
+
+    @Test
+    public void testMemo() {
+        Assert.assertEquals("Re-Validate Ownership for AAF Namespace '\'test\'test", future.memo());
+    }
+
+    @Test
+    public void testStart() {
+        Assert.assertTrue(future.start() instanceof Date);
+    }
+
+    @Test
+    public void testExpires() {
+        Assert.assertTrue(future.expires() instanceof Date);
+    }
+
+    @Test
+    public void testTarget() {
+        Assert.assertEquals("target", future.target());
+    }
+
+    @Test
+    public void testExpunge() {
+        future.expunge();
+    }
+
+    @Test
+    public void testCompareTo() {
+        future.compareTo(null);
+        future.compareTo(future);
+    }
+
+    @Test
+    public void testResetLocalData() {
+        Future.resetLocalData();
+        Assert.assertEquals(0, Future.sizeForDeletion());
+        Assert.assertEquals(false, Future.pendingDelete(future));
+    }
+
+
+    @Test
+    public void testDelayedDeleteWithDryRun() {
+        AuthzTrans trans = mock(AuthzTrans.class);
+        LogTarget target = mock(LogTarget.class);
+
+        when(trans.info()).thenReturn(target);
+
+        assertEquals(Result.ok().status, future.delayedDelete(trans, null, true, "text").status);
+    }
+
+    @Test
+    public void testDelayedDeleteNonDryRun() {
+        AuthzTrans trans = mock(AuthzTrans.class);
+        LogTarget target = mock(LogTarget.class);
+        FutureDAO fd = mock(FutureDAO.class);
+
+        when(trans.info()).thenReturn(target);
+        when(fd.delete(any(AuthzTrans.class), any(FutureDAO.Data.class), any(Boolean.class))).thenReturn(Result.ok());
+
+        assertEquals(Result.ok().status, future.delayedDelete(trans, fd, false, "text").status);
+    }
 
 }