From 6d469611d86642bc0b74ce51af72cc36d2af962d Mon Sep 17 00:00:00 2001 From: Instrumental Date: Mon, 26 Mar 2018 12:04:27 -0700 Subject: Remove Code from cadi, it is now in authz Issue-ID: AAF-193 Change-Id: Ib7abdb15ba8a7445a3875cf8c6bb48b7d563f424 Signed-off-by: Instrumental --- .../onap/aaf/cass/JU_AAFAuthenticatedUserTest.java | 90 ----- .../org/onap/aaf/cass/JU_AAFAuthorizerTest.java | 378 ------------------- .../java/org/onap/aaf/cass/JU_AAFBaseTest.java | 399 --------------------- cass/src/test/java/org/onap/aaf/cass/JU_CASS.java | 106 ------ 4 files changed, 973 deletions(-) delete mode 100644 cass/src/test/java/org/onap/aaf/cass/JU_AAFAuthenticatedUserTest.java delete mode 100644 cass/src/test/java/org/onap/aaf/cass/JU_AAFAuthorizerTest.java delete mode 100644 cass/src/test/java/org/onap/aaf/cass/JU_AAFBaseTest.java delete mode 100644 cass/src/test/java/org/onap/aaf/cass/JU_CASS.java (limited to 'cass/src/test/java/org/onap/aaf/cass') diff --git a/cass/src/test/java/org/onap/aaf/cass/JU_AAFAuthenticatedUserTest.java b/cass/src/test/java/org/onap/aaf/cass/JU_AAFAuthenticatedUserTest.java deleted file mode 100644 index 03d38c7..0000000 --- a/cass/src/test/java/org/onap/aaf/cass/JU_AAFAuthenticatedUserTest.java +++ /dev/null @@ -1,90 +0,0 @@ -/******************************************************************************* - * ============LICENSE_START==================================================== - * * org.onap.aaf - * * =========================================================================== - * * Copyright © 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==================================================== - * * - * * ECOMP is a trademark and service mark of AT&T Intellectual Property. - * * - ******************************************************************************/ -package org.onap.aaf.cass; - -import static org.junit.Assert.*; - -import org.apache.cassandra.auth.AuthenticatedUser; -import org.junit.Before; -import org.junit.Test; -import org.onap.aaf.cadi.aaf.cass.AAFAuthenticatedUser; - -public class JU_AAFAuthenticatedUserTest { - - @Before - public void setUp() throws Exception { - } - - @Test - public void test() { - AAFAuthenticatedUser user = new AAFAuthenticatedUser(null, "User1@aaf"); - assertEquals(user.getFullName(),"User1@aaf"); - assertEquals(user.getName(),"User1@aaf"); - assertFalse(user.isAnonymous()); - assertFalse(user.isSuper()); - assertFalse(user.isLocal()); - - - - } - - @Test - public void testone() { - AAFAuthenticatedUser user = new AAFAuthenticatedUser(null, "User2@aaf"); - assertEquals(user.getFullName(),"User2@aaf"); - assertEquals(user.getName(),"User2@aaf"); - assertFalse(user.isAnonymous()); - assertFalse(user.isSuper()); - assertFalse(user.isLocal()); - - - - } - - @Test - public void testtwo() { - AAFAuthenticatedUser user = new AAFAuthenticatedUser(null, "onap@aaf"); - assertEquals(user.getFullName(),"onap@aaf"); - assertEquals(user.getName(),"onap@aaf"); - assertFalse(user.isAnonymous()); - assertFalse(user.isSuper()); - assertFalse(user.isLocal()); - - - - } - - @Test - public void testthree() { - AAFAuthenticatedUser user = new AAFAuthenticatedUser(null, "openecomp@aaf"); - assertEquals(user.getFullName(),"openecomp@aaf"); - assertEquals(user.getName(),"openecomp@aaf"); - assertFalse(user.isAnonymous()); - assertFalse(user.isSuper()); - assertFalse(user.isLocal()); - - - - } - -} diff --git a/cass/src/test/java/org/onap/aaf/cass/JU_AAFAuthorizerTest.java b/cass/src/test/java/org/onap/aaf/cass/JU_AAFAuthorizerTest.java deleted file mode 100644 index 4e2f0a3..0000000 --- a/cass/src/test/java/org/onap/aaf/cass/JU_AAFAuthorizerTest.java +++ /dev/null @@ -1,378 +0,0 @@ -/******************************************************************************* - * ============LICENSE_START==================================================== - * * org.onap.aaf - * * =========================================================================== - * * Copyright © 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==================================================== - * * - * * ECOMP is a trademark and service mark of AT&T Intellectual Property. - * * - ******************************************************************************/ -package org.onap.aaf.cass; - -import static org.junit.Assert.*; - -import org.junit.Test; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; - -public class JU_AAFAuthorizerTest -{ - - - @Before - public void setUp() - { - - } - - @After - public void tearDown() - { - - } - - /* - * Testing Conditon(s): if: (user instanceof AAFAuthenticatedUser), if: (aafUser.isLocal()) - */ - @Test - public void test_method_authorize_0_branch_0() - { - System.out.println("Now Testing Method:authorize Branch:0"); - - - - } - - /* - * Testing Conditon(s): if: (user instanceof AAFAuthenticatedUser), else: Not (aafUser.isLocal()) - */ - @Test - public void test_method_authorize_0_branch_1() - { - System.out.println("Now Testing Method:authorize Branch:1"); - - - } - - /* - * Testing Conditon(s): else: Not (user instanceof AAFAuthenticatedUser) - */ - @Test - public void test_method_authorize_0_branch_2() - { - System.out.println("Now Testing Method:authorize Branch:2"); - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_PermHolder_1_branch_0() - { - System.out.println("Now Testing Method:PermHolder Branch:0"); - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_PermHolder_2_branch_0() - { - System.out.println("Now Testing Method:PermHolder Branch:0"); - - - - } - - /* - * Testing Conditon(s): if: (permissions==Permission.NONE) - */ - @Test - public void test_method_mutable_3_branch_0() - { - System.out.println("Now Testing Method:mutable Branch:0"); - - - - } - - /* - * Testing Conditon(s): else: Not (permissions==Permission.NONE) - */ - @Test - public void test_method_mutable_3_branch_1() - { - System.out.println("Now Testing Method:mutable Branch:1"); - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_mutable_4_branch_0() - { - System.out.println("Now Testing Method:mutable Branch:0"); - - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_mutable_5_branch_0() - { - System.out.println("Now Testing Method:mutable Branch:0"); - - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_getName_6_branch_0() - { - System.out.println("Now Testing Method:getName Branch:0"); - - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_exec_7_branch_0() - { - System.out.println("Now Testing Method:exec Branch:0"); - - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_getName_8_branch_0() - { - System.out.println("Now Testing Method:getName Branch:0"); - - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_exec_9_branch_0() - { - System.out.println("Now Testing Method:exec Branch:0"); - - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_getName_10_branch_0() - { - System.out.println("Now Testing Method:getName Branch:0"); - - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_exec_11_branch_0() - { - System.out.println("Now Testing Method:exec Branch:0"); - - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_getName_12_branch_0() - { - System.out.println("Now Testing Method:getName Branch:0"); - - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_exec_13_branch_0() - { - System.out.println("Now Testing Method:exec Branch:0"); - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_getName_14_branch_0() - { - System.out.println("Now Testing Method:getName Branch:0"); - - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_exec_15_branch_0() - { - System.out.println("Now Testing Method:exec Branch:0"); - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_getName_16_branch_0() - { - System.out.println("Now Testing Method:getName Branch:0"); - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_exec_17_branch_0() - { - System.out.println("Now Testing Method:exec Branch:0"); - - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_getName_18_branch_0() - { - System.out.println("Now Testing Method:getName Branch:0"); - - //Constructor - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_exec_19_branch_0() - { - System.out.println("Now Testing Method:exec Branch:0"); - - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_grant_20_branch_0() - { - System.out.println("Now Testing Method:grant Branch:0"); - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_revoke_21_branch_0() - { - System.out.println("Now Testing Method:revoke Branch:0"); - - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_list_22_branch_0() - { - System.out.println("Now Testing Method:list Branch:0"); - - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_revokeAll_23_branch_0() - { - System.out.println("Now Testing Method:revokeAll Branch:0"); - - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_revokeAll_24_branch_0() - { - System.out.println("Now Testing Method:revokeAll Branch:0"); - - - - } - -} diff --git a/cass/src/test/java/org/onap/aaf/cass/JU_AAFBaseTest.java b/cass/src/test/java/org/onap/aaf/cass/JU_AAFBaseTest.java deleted file mode 100644 index 172a3dc..0000000 --- a/cass/src/test/java/org/onap/aaf/cass/JU_AAFBaseTest.java +++ /dev/null @@ -1,399 +0,0 @@ -/******************************************************************************* - * ============LICENSE_START==================================================== - * * org.onap.aaf - * * =========================================================================== - * * Copyright © 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==================================================== - * * - * * ECOMP is a trademark and service mark of AT&T Intellectual Property. - * * - ******************************************************************************/ -package org.onap.aaf.cass; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.onap.aaf.cadi.aaf.cass.AAFBase; - -import static org.junit.Assert.*; - -public class JU_AAFBaseTest -{ - - - @Before - public void setUp() - { - - } - - @After - public void tearDown() - { - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_setAccess_0_branch_0() - { - System.out.println("Now Testing Method:setAccess Branch:0"); - - //Call Method - AAFBase.setAccess(null); - - } - - /* - * Testing Conditon(s): if: (!props_ok) - */ - @Test - public void test_method_validateConfiguration_1_branch_0() - { - System.out.println("Now Testing Method:validateConfiguration Branch:0"); - - - - } - - /* - * Testing Conditon(s): else: Not (!props_ok) - */ - @Test - public void test_method_validateConfiguration_1_branch_1() - { - System.out.println("Now Testing Method:validateConfiguration Branch:1"); - - - - //Call Method - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), if: (access==null), if: (cadi_props == null), if: (cp.exists()) - */ - @Test - public void test_method_setup_2_branch_0() - { - System.out.println("Now Testing Method:setup Branch:0"); - - - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), if: (access==null), if: (cadi_props == null), else: Not (cp.exists()) - */ - @Test - public void test_method_setup_2_branch_1() - { - System.out.println("Now Testing Method:setup Branch:1"); - - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), if: (access==null), else: Not (cadi_props == null) - */ - @Test - public void test_method_setup_2_branch_2() - { - System.out.println("Now Testing Method:setup Branch:2"); - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), else: Not (access==null) - */ - @Test - public void test_method_setup_2_branch_3() - { - System.out.println("Now Testing Method:setup Branch:3"); - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), if: ((perm_type = Config.logProp(access, "cass_group_name",null))==null) - */ - @Test - public void test_method_setup_2_branch_4() - { - System.out.println("Now Testing Method:setup Branch:4"); - - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), else: Not ((perm_type = Config.logProp(access, "cass_group_name",null))==null) - */ - @Test - public void test_method_setup_2_branch_5() - { - System.out.println("Now Testing Method:setup Branch:5"); - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), if: ((cluster_name = Config.logProp(access,"cass_cluster_name",null))==null), if: ((cluster_name = DatabaseDescriptor.getClusterName())==null) - */ - @Test - public void test_method_setup_2_branch_6() - { - System.out.println("Now Testing Method:setup Branch:6"); - - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), if: ((cluster_name = Config.logProp(access,"cass_cluster_name",null))==null), else: Not ((cluster_name = DatabaseDescriptor.getClusterName())==null) - */ - @Test - public void test_method_setup_2_branch_7() - { - System.out.println("Now Testing Method:setup Branch:7"); - - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), else: Not ((cluster_name = Config.logProp(access,"cass_cluster_name",null))==null) - */ - @Test - public void test_method_setup_2_branch_8() - { - System.out.println("Now Testing Method:setup Branch:8"); - - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), if: ((default_realm = Config.logProp(access, Config.AAF_DEFAULT_REALM, null))==null) - */ - @Test - public void test_method_setup_2_branch_9() - { - System.out.println("Now Testing Method:setup Branch:9"); - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), else: Not ((default_realm = Config.logProp(access, Config.AAF_DEFAULT_REALM, null))==null) - */ - @Test - public void test_method_setup_2_branch_10() - { - System.out.println("Now Testing Method:setup Branch:10"); - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), if: (props_ok==false) - */ - @Test - public void test_method_setup_2_branch_11() - { - System.out.println("Now Testing Method:setup Branch:11"); - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), else: Not (props_ok==false) - */ - @Test - public void test_method_setup_2_branch_12() - { - System.out.println("Now Testing Method:setup Branch:12"); - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), if: (lur instanceof EpiLur), for: (int i=0; (lur = elur.get(i))!=null;++i), if: (lur instanceof AbsAAFLur) - */ - @Test - public void test_method_setup_2_branch_13() - { - System.out.println("Now Testing Method:setup Branch:13"); - - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), if: (lur instanceof EpiLur), for: (int i=0; (lur = elur.get(i))!=null;++i), else: Not (lur instanceof AbsAAFLur), if: (lur instanceof LocalLur) - */ - @Test - public void test_method_setup_2_branch_14() - { - System.out.println("Now Testing Method:setup Branch:14"); - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), if: (lur instanceof EpiLur), for: (int i=0; (lur = elur.get(i))!=null;++i), else: Not (lur instanceof AbsAAFLur), else: Not (lur instanceof LocalLur) - */ - @Test - public void test_method_setup_2_branch_15() - { - System.out.println("Now Testing Method:setup Branch:15"); - - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), if: (lur instanceof EpiLur), for: Not (int i=0; (lur = elur.get(i))!=null;++i) - */ - @Test - public void test_method_setup_2_branch_16() - { - System.out.println("Now Testing Method:setup Branch:16"); - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), else: Not (lur instanceof EpiLur), if: (lur instanceof AbsAAFLur) - */ - @Test - public void test_method_setup_2_branch_17() - { - System.out.println("Now Testing Method:setup Branch:17"); - - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), else: Not (lur instanceof EpiLur), else: Not (lur instanceof AbsAAFLur) - */ - @Test - public void test_method_setup_2_branch_18() - { - System.out.println("Now Testing Method:setup Branch:18"); - - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), if: (aafAuthn==null) - */ - @Test - public void test_method_setup_2_branch_19() - { - System.out.println("Now Testing Method:setup Branch:19"); - - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), else: Not (aafAuthn==null) - */ - @Test - public void test_method_setup_2_branch_20() - { - System.out.println("Now Testing Method:setup Branch:20"); - - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), if: (access!=null) - */ - @Test - public void test_method_setup_2_branch_21() - { - System.out.println("Now Testing Method:setup Branch:21"); - - - - } - - /* - * Testing Conditon(s): if: (aafAuthn == null), else: Not (access!=null) - */ - @Test - public void test_method_setup_2_branch_22() - { - System.out.println("Now Testing Method:setup Branch:22"); - - - } - - /* - * Testing Conditon(s): else: Not (aafAuthn == null) - */ - @Test - public void test_method_setup_2_branch_23() - { - System.out.println("Now Testing Method:setup Branch:23"); - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_protectedResources_3_branch_0() - { - System.out.println("Now Testing Method:protectedResources Branch:0"); - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_supportedOptions_4_branch_0() - { - System.out.println("Now Testing Method:supportedOptions Branch:0"); - - - } - - /* - * Testing Conditon(s): Default - */ - @Test - public void test_method_alterableOptions_5_branch_0() - { - System.out.println("Now Testing Method:alterableOptions Branch:0"); - - - - } - -} diff --git a/cass/src/test/java/org/onap/aaf/cass/JU_CASS.java b/cass/src/test/java/org/onap/aaf/cass/JU_CASS.java deleted file mode 100644 index f5ee310..0000000 --- a/cass/src/test/java/org/onap/aaf/cass/JU_CASS.java +++ /dev/null @@ -1,106 +0,0 @@ -/******************************************************************************* - * ============LICENSE_START==================================================== - * * org.onap.aaf - * * =========================================================================== - * * Copyright © 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==================================================== - * * - * * ECOMP is a trademark and service mark of AT&T Intellectual Property. - * * - ******************************************************************************/ -package org.onap.aaf.cass; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import org.apache.cassandra.auth.AuthenticatedUser; -import org.apache.cassandra.auth.IResource; -import org.apache.cassandra.auth.Permission; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.onap.aaf.cadi.aaf.cass.AAFAuthenticator; -import org.onap.aaf.cadi.aaf.cass.AAFAuthorizer; - -public class JU_CASS { - - private static AAFAuthenticator aa; - private static AAFAuthorizer an; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - System.setProperty("cadi_prop_files", "etc/cadi.properties"); - - aa = new AAFAuthenticator(); - an = new AAFAuthorizer(); - - aa.setup(); - an.setup(); // does nothing after aa. - - aa.validateConfiguration(); - - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - } - - @Test - public void test() throws Exception { - Map creds = new HashMap(); - creds.put("username", "XXX@NS"); - creds.put("password", "enc:???"); - AuthenticatedUser aaf = aa.authenticate(creds); - - // Test out "aaf_default_domain - creds.put("username", "XX"); - aaf = aa.authenticate(creds); - - IResource resource = new IResource() { - public String getName() { - return "data/authz"; - } - - public IResource getParent() { - return null; - } - - public boolean hasParent() { - return false; - } - - public boolean exists() { - return true; - } - - }; - - Set perms = an.authorize(aaf, resource); - - // Test out "AAF" access - creds.put("username", "XXX@NS"); - creds.put("password", "enc:???"); - aaf = aa.authenticate(creds); - perms = an.authorize(aaf, resource); - Assert.assertFalse(perms.isEmpty()); - - perms = an.authorize(aaf, resource); - Assert.assertFalse(perms.isEmpty()); - - } - -} -- cgit 1.2.3-korg