diff options
author | 2018-11-30 14:21:02 -0600 | |
---|---|---|
committer | 2018-11-30 14:21:04 -0600 | |
commit | 71340cf50ea2c0fc9cfd0670052c4b4fcabe3db6 (patch) | |
tree | 422fad3ecba6077ae969a065a877787e48619d6f /auth/auth-batch/src/test/java/org | |
parent | c2445ee11b66efebdd5efe92fddf9526926c736e (diff) |
Change Batch Packaging
Issue-ID: AAF-654
Change-Id: Iaa1eab5d43717e7ffe51933511c9b232a5a1d770
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/auth-batch/src/test/java/org')
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_ActionDAO.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_ActionDAO.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_CredPrintTest.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_CredPrintTest.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Email.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Email.java) | 6 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_EmailPrint.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_EmailPrint.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_FuturePrintTest.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_FuturePrintTest.java) | 6 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Message.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Message.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URFuturePrintTest.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URFuturePrintTest.java) | 6 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URPrintTest.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URPrintTest.java) | 6 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/creators/RowCreator.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/creators/RowCreator.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approval.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approval.java) | 6 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approver.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approver.java) | 6 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_CacheChange.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_CacheChange.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Creator.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Creator.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Cred.java) | 8 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java | 71 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Future.java) | 8 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_History.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_History.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_InputIterator.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_InputIterator.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MiscID.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MiscID.java) | 6 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MonthData.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MonthData.java) | 6 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NS.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NS.java) | 10 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NsAttrib.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NsAttrib.java) | 6 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Perm.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Perm.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Role.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Role.java) | 6 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_UserRole.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_UserRole.java) | 10 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_Batch.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_Batch.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchException.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchException.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchPrincipal.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchPrincipal.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_CassBatch.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_CassBatch.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_NotificationTest.java (renamed from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/JU_NotificationTest.java) | 10 |
30 files changed, 152 insertions, 79 deletions
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_ActionDAO.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_ActionDAO.java index 254a6adf..9376da4b 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_ActionDAO.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_ActionDAO.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.actions.ActionDAO; +import org.onap.aaf.auth.batch.actions.ActionDAO; import org.onap.aaf.auth.env.AuthzTrans; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_CredPrintTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_CredPrintTest.java index 2e6ad09c..ebb307c2 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_CredPrintTest.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_CredPrintTest.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; @@ -28,7 +28,7 @@ import static org.mockito.MockitoAnnotations.initMocks; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.onap.aaf.auth.actions.CredPrint; +import org.onap.aaf.auth.batch.actions.CredPrint; import org.onap.aaf.auth.dao.cass.CredDAO; import org.onap.aaf.auth.dao.cass.CredDAO.Data; import org.onap.aaf.auth.env.AuthzTrans; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Email.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Email.java index d3d4719e..3a170679 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Email.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Email.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.*; import org.junit.After; @@ -28,8 +28,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.actions.Email; -import org.onap.aaf.auth.actions.Message; +import org.onap.aaf.auth.batch.actions.Email; +import org.onap.aaf.auth.batch.actions.Message; import org.onap.aaf.auth.env.AuthzTrans; import org.onap.aaf.auth.org.Organization.Identity; import org.onap.aaf.auth.org.Organization; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_EmailPrint.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_EmailPrint.java index fe87219b..64d02ee3 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_EmailPrint.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_EmailPrint.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.actions.EmailPrint; +import org.onap.aaf.auth.batch.actions.EmailPrint; import org.onap.aaf.auth.env.AuthzTrans; import org.onap.aaf.auth.org.Organization; import org.onap.aaf.cadi.client.Future; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_FuturePrintTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_FuturePrintTest.java index 121bf48f..00542a2f 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_FuturePrintTest.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_FuturePrintTest.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; @@ -31,9 +31,9 @@ import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.onap.aaf.auth.actions.FuturePrint; +import org.onap.aaf.auth.batch.actions.FuturePrint; +import org.onap.aaf.auth.batch.helpers.Future; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Future; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.LogTarget; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Message.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Message.java index ada1dbae..86bab83e 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Message.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Message.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.actions.Message; +import org.onap.aaf.auth.batch.actions.Message; import static org.mockito.Mockito.*; import org.junit.Test; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URFuturePrintTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URFuturePrintTest.java index 95406425..9f569d65 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URFuturePrintTest.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URFuturePrintTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END==================================================== * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; @@ -29,9 +29,9 @@ import java.util.Calendar; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.onap.aaf.auth.actions.URFuturePrint; +import org.onap.aaf.auth.batch.actions.URFuturePrint; +import org.onap.aaf.auth.batch.helpers.UserRole; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.UserRole; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.LogTarget; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URPrintTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URPrintTest.java index 1e99ec66..8a037ece 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URPrintTest.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URPrintTest.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; @@ -30,9 +30,9 @@ import java.util.Calendar; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.onap.aaf.auth.actions.URPrint; +import org.onap.aaf.auth.batch.actions.URPrint; +import org.onap.aaf.auth.batch.helpers.UserRole; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.UserRole; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.LogTarget; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/creators/RowCreator.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/creators/RowCreator.java index 078c383b..661105d3 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/creators/RowCreator.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/creators/RowCreator.java @@ -18,7 +18,7 @@ * ============LICENSE_END==================================================== * */ -package org.onap.aaf.auth.helpers.creators; +package org.onap.aaf.auth.batch.helpers.creators; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approval.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approval.java index 6020dcc0..44c72763 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approval.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approval.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -33,10 +33,10 @@ import java.util.UUID; import org.junit.Before; import org.junit.Test; +import org.onap.aaf.auth.batch.helpers.Approval; +import org.onap.aaf.auth.batch.helpers.creators.RowCreator; import org.onap.aaf.auth.dao.cass.ApprovalDAO; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Approval; -import org.onap.aaf.auth.helpers.creators.RowCreator; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.LogTarget; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approver.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approver.java index b4ae1213..bd498f58 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approver.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approver.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,8 +27,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.actions.Message; -import org.onap.aaf.auth.helpers.Approver; +import org.onap.aaf.auth.batch.actions.Message; +import org.onap.aaf.auth.batch.helpers.Approver; import org.onap.aaf.auth.org.Organization; import static org.mockito.Mockito.*; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_CacheChange.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_CacheChange.java index fc934e6c..27d2d3cc 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_CacheChange.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_CacheChange.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.helpers.CacheChange; +import org.onap.aaf.auth.batch.helpers.CacheChange; import junit.framework.Assert; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Creator.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Creator.java index ad4d2022..2a266f54 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Creator.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Creator.java @@ -20,7 +20,7 @@ */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -28,7 +28,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.helpers.Creator; +import org.onap.aaf.auth.batch.helpers.Creator; import com.datastax.driver.core.Row; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Cred.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java index 35a63059..20831c66 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Cred.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java @@ -20,7 +20,7 @@ */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -28,10 +28,10 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; +import org.onap.aaf.auth.batch.helpers.Cred; +import org.onap.aaf.auth.batch.helpers.Cred.CredCount; +import org.onap.aaf.auth.batch.helpers.Cred.Instance; import org.onap.aaf.auth.common.Define; -import org.onap.aaf.auth.helpers.Cred; -import org.onap.aaf.auth.helpers.Cred.CredCount; -import org.onap.aaf.auth.helpers.Cred.Instance; import org.onap.aaf.cadi.CadiException; import org.onap.aaf.cadi.PropAccess; import org.onap.aaf.cadi.config.Config; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java new file mode 100644 index 00000000..4ed167e9 --- /dev/null +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java @@ -0,0 +1,71 @@ +/** + * ============LICENSE_START==================================================== + * org.onap.aaf + * =========================================================================== + * Copyright (c) 2018 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==================================================== + */ + +package org.onap.aaf.auth.batch.helpers.test; + +import static org.junit.Assert.*; + +import java.util.GregorianCalendar; +import java.util.Set; + +import org.junit.Test; +import org.onap.aaf.auth.batch.helpers.ExpireRange; +import org.onap.aaf.cadi.PropAccess; + +public class JU_ExpireRange { + @Test + public void test() { + ExpireRange expRange = new ExpireRange(new PropAccess()); + + Set<String> names=expRange.names(); + assertTrue(names.contains("OneMonth")); + assertTrue(names.contains("CredOneWeek")); + assertTrue(names.contains("Delete")); + assertFalse(names.contains(null)); + assertFalse(names.contains("bogus")); + + ExpireRange.Range r; + GregorianCalendar gc = new GregorianCalendar(); + String[] all = new String[] {"ur","cred"}; + + // Test 3 weeks prior + gc.setTime(expRange.now); + gc.add(GregorianCalendar.WEEK_OF_MONTH,-3); + for(String rs : all) { + r = expRange.getRange(rs, gc.getTime()); + assertNotNull(r); + assertEquals("Delete",r.name()); + assertFalse(r.shouldContact(null)); + } + + // Test 1 week prior + gc.setTime(expRange.now); + gc.add(GregorianCalendar.WEEK_OF_MONTH,-1); + for(String rs : all) { + r = expRange.getRange(rs, gc.getTime()); + assertNull(r); + } + + // Test Today + r = expRange.getRange("cred", expRange.now); + assertNotNull(r); + } + +} diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Future.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java index fe3d5d95..91950c66 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Future.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -34,11 +34,11 @@ import java.util.UUID; import org.junit.Assert; 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.helpers.Creator; -import org.onap.aaf.auth.helpers.Future; -import org.onap.aaf.auth.helpers.creators.RowCreator; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.Env; import org.onap.aaf.misc.env.LogTarget; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_History.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_History.java index 3346f229..beaaad31 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_History.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_History.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.helpers.History; +import org.onap.aaf.auth.batch.helpers.History; import junit.framework.Assert; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_InputIterator.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_InputIterator.java index 07fd65f0..f30ad3cc 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_InputIterator.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_InputIterator.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.helpers.InputIterator; +import org.onap.aaf.auth.batch.helpers.InputIterator; import static org.mockito.Mockito.*; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MiscID.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MiscID.java index 6f44b391..d8a2682c 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MiscID.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MiscID.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,8 +27,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.BatchException; -import org.onap.aaf.auth.helpers.MiscID; +import org.onap.aaf.auth.batch.BatchException; +import org.onap.aaf.auth.batch.helpers.MiscID; import com.datastax.driver.core.Row; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MonthData.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MonthData.java index 97b6c56b..d9d9d018 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MonthData.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MonthData.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,8 +27,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.helpers.MonthData; -import org.onap.aaf.auth.helpers.MonthData.Row; +import org.onap.aaf.auth.batch.helpers.MonthData; +import org.onap.aaf.auth.batch.helpers.MonthData.Row; import junit.framework.Assert; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NS.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NS.java index b69f8873..1208ba92 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NS.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NS.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -30,10 +30,10 @@ import java.util.ArrayList; import org.junit.Before; import org.junit.Test; -import org.onap.aaf.auth.helpers.Creator; -import org.onap.aaf.auth.helpers.NS; -import org.onap.aaf.auth.helpers.NS.NSSplit; -import org.onap.aaf.auth.helpers.creators.RowCreator; +import org.onap.aaf.auth.batch.helpers.Creator; +import org.onap.aaf.auth.batch.helpers.NS; +import org.onap.aaf.auth.batch.helpers.NS.NSSplit; +import org.onap.aaf.auth.batch.helpers.creators.RowCreator; import org.onap.aaf.misc.env.Env; import org.onap.aaf.misc.env.LogTarget; import org.onap.aaf.misc.env.TimeTaken; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NsAttrib.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NsAttrib.java index acf9b478..6df877fe 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NsAttrib.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NsAttrib.java @@ -19,12 +19,12 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import org.junit.Before; import org.junit.Test; -import org.onap.aaf.auth.helpers.NsAttrib; -import org.onap.aaf.auth.helpers.creators.RowCreator; +import org.onap.aaf.auth.batch.helpers.NsAttrib; +import org.onap.aaf.auth.batch.helpers.creators.RowCreator; import junit.framework.Assert; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Perm.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Perm.java index 0ccc77a2..10cbd359 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Perm.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Perm.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.helpers.Perm; +import org.onap.aaf.auth.batch.helpers.Perm; import junit.framework.Assert; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Role.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Role.java index 3fd9f870..250c7a10 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Role.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Role.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,8 +27,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.helpers.Perm; -import org.onap.aaf.auth.helpers.Role; +import org.onap.aaf.auth.batch.helpers.Perm; +import org.onap.aaf.auth.batch.helpers.Role; import junit.framework.Assert; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_UserRole.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_UserRole.java index b20f9ded..6b7011c6 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_UserRole.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_UserRole.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -33,12 +33,12 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.onap.aaf.auth.actions.URDelete; +import org.onap.aaf.auth.batch.actions.URDelete; +import org.onap.aaf.auth.batch.helpers.Creator; +import org.onap.aaf.auth.batch.helpers.UserRole; +import org.onap.aaf.auth.batch.helpers.creators.RowCreator; import org.onap.aaf.auth.dao.cass.UserRoleDAO; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Creator; -import org.onap.aaf.auth.helpers.UserRole; -import org.onap.aaf.auth.helpers.creators.RowCreator; import org.onap.aaf.misc.env.Env; import org.onap.aaf.misc.env.LogTarget; import org.onap.aaf.misc.env.TimeTaken; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_Batch.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_Batch.java index 5394c323..1ef6f3b8 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_Batch.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_Batch.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.test; +package org.onap.aaf.auth.batch.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.Batch; +import org.onap.aaf.auth.batch.Batch; import org.onap.aaf.auth.env.AuthzEnv; import org.onap.aaf.auth.env.AuthzTrans; import org.onap.aaf.auth.org.Organization; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchException.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchException.java index c56a76c8..47a7c278 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchException.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchException.java @@ -20,7 +20,7 @@ */ -package org.onap.aaf.auth.test; +package org.onap.aaf.auth.batch.test; import static org.junit.Assert.*; import org.junit.After; @@ -28,7 +28,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.BatchException; +import org.onap.aaf.auth.batch.BatchException; import static org.mockito.Mockito.*; import org.junit.Test; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchPrincipal.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchPrincipal.java index 6186df95..4e5ad675 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchPrincipal.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchPrincipal.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.test; +package org.onap.aaf.auth.batch.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.BatchPrincipal; +import org.onap.aaf.auth.batch.BatchPrincipal; import junit.framework.Assert; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_CassBatch.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_CassBatch.java index d1934a42..dfb30819 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_CassBatch.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_CassBatch.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.test; +package org.onap.aaf.auth.batch.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.CassBatch; +import org.onap.aaf.auth.batch.CassBatch; import org.onap.aaf.auth.env.AuthzTrans; import org.onap.aaf.auth.org.OrganizationException; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/JU_NotificationTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_NotificationTest.java index d3a1258d..79e4168e 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/JU_NotificationTest.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_NotificationTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END==================================================== * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -29,10 +29,12 @@ import static org.mockito.MockitoAnnotations.initMocks; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.onap.aaf.auth.actions.Message; +import org.onap.aaf.auth.batch.actions.Message; +import org.onap.aaf.auth.batch.helpers.Creator; +import org.onap.aaf.auth.batch.helpers.Notification; +import org.onap.aaf.auth.batch.helpers.Notification.TYPE; +import org.onap.aaf.auth.batch.helpers.creators.RowCreator; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Notification.TYPE; -import org.onap.aaf.auth.helpers.creators.RowCreator; import org.onap.aaf.misc.env.Env; import org.onap.aaf.misc.env.LogTarget; import org.onap.aaf.misc.env.TimeTaken; |