From 5b37375d4f4e3764e10b813829881ae7217403f0 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Mon, 23 Jul 2018 10:49:55 -0500 Subject: Fix Test Hello Issue-ID: AAF-381 Change-Id: I038559b22af061ffb3bd23048122d7cf87fbed22 Signed-off-by: Instrumental --- .../test/java/org/onap/aaf/auth/cmd/test/ns/JU_Create.java | 9 ++------- .../test/java/org/onap/aaf/auth/cmd/test/ns/JU_Delete.java | 10 ++-------- .../java/org/onap/aaf/auth/cmd/test/ns/JU_Describe.java | 14 ++------------ .../java/org/onap/aaf/auth/cmd/test/role/JU_Describe.java | 10 ++-------- 4 files changed, 8 insertions(+), 35 deletions(-) (limited to 'auth/auth-cmd/src') diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Create.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Create.java index af84d408..bc590695 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Create.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Create.java @@ -21,11 +21,7 @@ ******************************************************************************/ package org.onap.aaf.auth.cmd.test.ns; -import org.junit.Assert; -import org.junit.Before; - import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -34,21 +30,20 @@ import java.net.HttpURLConnection; import java.net.URI; import java.net.URISyntaxException; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; import org.onap.aaf.auth.cmd.AAFcli; import org.onap.aaf.auth.cmd.ns.Create; import org.onap.aaf.auth.cmd.ns.NS; -import org.onap.aaf.auth.cmd.test.JU_AAFCli; import org.onap.aaf.auth.env.AuthzEnv; import org.onap.aaf.cadi.CadiException; import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.Locator.Item; import org.onap.aaf.cadi.LocatorException; import org.onap.aaf.cadi.PropAccess; import org.onap.aaf.cadi.SecuritySetter; -import org.onap.aaf.cadi.Locator.Item; import org.onap.aaf.cadi.http.HMangr; import org.onap.aaf.cadi.http.HRcli; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Delete.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Delete.java index 332c45c5..ee877a4b 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Delete.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Delete.java @@ -21,11 +21,7 @@ ******************************************************************************/ package org.onap.aaf.auth.cmd.test.ns; -import org.junit.Assert; -import org.junit.Before; - import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -36,21 +32,19 @@ import java.net.URI; import java.net.URISyntaxException; import java.security.GeneralSecurityException; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; import org.onap.aaf.auth.cmd.AAFcli; import org.onap.aaf.auth.cmd.ns.Delete; import org.onap.aaf.auth.cmd.ns.NS; -import org.onap.aaf.auth.cmd.test.JU_AAFCli; import org.onap.aaf.auth.env.AuthzEnv; import org.onap.aaf.cadi.CadiException; import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.Locator.Item; import org.onap.aaf.cadi.LocatorException; import org.onap.aaf.cadi.PropAccess; import org.onap.aaf.cadi.SecuritySetter; -import org.onap.aaf.cadi.Locator.Item; import org.onap.aaf.cadi.http.HMangr; -import org.onap.aaf.cadi.http.HRcli; import org.onap.aaf.misc.env.APIException; public class JU_Delete { diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Describe.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Describe.java index d7b00220..c0efec00 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Describe.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Describe.java @@ -21,39 +21,29 @@ ******************************************************************************/ package org.onap.aaf.auth.cmd.test.ns; -import org.junit.Assert; -import org.junit.Before; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.io.Writer; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.net.HttpURLConnection; import java.net.URI; import java.net.URISyntaxException; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; import org.onap.aaf.auth.cmd.AAFcli; import org.onap.aaf.auth.cmd.ns.Describe; import org.onap.aaf.auth.cmd.ns.NS; -import org.onap.aaf.auth.cmd.test.JU_AAFCli; import org.onap.aaf.auth.env.AuthzEnv; import org.onap.aaf.cadi.CadiException; import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.Locator.Item; import org.onap.aaf.cadi.LocatorException; import org.onap.aaf.cadi.PropAccess; import org.onap.aaf.cadi.SecuritySetter; -import org.onap.aaf.cadi.Locator.Item; import org.onap.aaf.cadi.http.HMangr; -import org.onap.aaf.cadi.http.HRcli; import org.onap.aaf.misc.env.APIException; @RunWith(MockitoJUnitRunner.class) diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/role/JU_Describe.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/role/JU_Describe.java index ef50f92b..61236eee 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/role/JU_Describe.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/role/JU_Describe.java @@ -21,11 +21,7 @@ ******************************************************************************/ package org.onap.aaf.auth.cmd.test.role; -import org.junit.Assert; -import org.junit.Before; - import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -34,23 +30,21 @@ import java.net.HttpURLConnection; import java.net.URI; import java.net.URISyntaxException; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; import org.onap.aaf.auth.cmd.AAFcli; import org.onap.aaf.auth.cmd.role.Describe; import org.onap.aaf.auth.cmd.role.Role; -import org.onap.aaf.auth.cmd.test.JU_AAFCli; import org.onap.aaf.auth.env.AuthzEnv; import org.onap.aaf.cadi.CadiException; import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.Locator.Item; import org.onap.aaf.cadi.LocatorException; import org.onap.aaf.cadi.PropAccess; import org.onap.aaf.cadi.SecuritySetter; -import org.onap.aaf.cadi.Locator.Item; import org.onap.aaf.cadi.http.HMangr; -import org.onap.aaf.cadi.http.HRcli; import org.onap.aaf.misc.env.APIException; @RunWith(MockitoJUnitRunner.class) -- cgit 1.2.3-korg