From 0e5efc61b657dba874aacc95ee21c76b95fb2028 Mon Sep 17 00:00:00 2001 From: sg481n Date: Fri, 25 Aug 2017 00:57:25 -0400 Subject: Update aaf client module Remove aaf submodules and update aaf client module. Issue-id: AAF-21 Change-Id: I750ec9e26596652a142b014db94aabd082880130 Signed-off-by: sg481n --- .../java/com/osaaf/defOrd/test/JU_Identities.java | 112 --------------------- .../test/java/com/osaaf/defOrg/JU_DefaultOrg.java | 102 ------------------- .../com/osaaf/defOrg/JU_DefaultOrgIdentity.java | 71 ------------- .../com/osaaf/defOrg/JU_DefaultOrgWarnings.java | 83 --------------- .../test/java/com/osaaf/defOrg/JU_Identities.java | 112 --------------------- 5 files changed, 480 deletions(-) delete mode 100644 authz-defOrg/src/test/java/com/osaaf/defOrd/test/JU_Identities.java delete mode 100644 authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrg.java delete mode 100644 authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgIdentity.java delete mode 100644 authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgWarnings.java delete mode 100644 authz-defOrg/src/test/java/com/osaaf/defOrg/JU_Identities.java (limited to 'authz-defOrg/src/test/java/com/osaaf') diff --git a/authz-defOrg/src/test/java/com/osaaf/defOrd/test/JU_Identities.java b/authz-defOrg/src/test/java/com/osaaf/defOrd/test/JU_Identities.java deleted file mode 100644 index 68fc15f7..00000000 --- a/authz-defOrg/src/test/java/com/osaaf/defOrd/test/JU_Identities.java +++ /dev/null @@ -1,112 +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 com.osaaf.defOrd.test; - -import java.io.File; -import java.io.IOException; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import com.att.authz.env.AuthzEnv; -import com.att.authz.env.AuthzTrans; -import com.att.authz.local.AbsData.Reuse; -import com.osaaf.defOrg.Identities; -import com.osaaf.defOrg.Identities.Data; - -/** - * - */ -public class JU_Identities { - - private static final String DATA_IDENTITIES = "../opt/app/aaf/data/identities.dat"; - private static File fids; - private static Identities ids; - private static AuthzEnv env; - - /** - * @throws java.lang.Exception - */ - @BeforeClass - public static void setUpBeforeClass() throws Exception { - env = new AuthzEnv(); - AuthzTrans trans = env.newTransNoAvg(); - // Note: utilize TimeTaken, from trans.start if you want to time. - fids = new File(DATA_IDENTITIES); - if(fids.exists()) { - ids = new Identities(fids); - ids.open(trans, 5000); - } else { - - throw new Exception("Data File for Tests, \"" + DATA_IDENTITIES - + "\" must exist before test can run. (Current dir is " + System.getProperty("user.dir") + ")"); - } - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - public static void tearDownAfterClass() throws Exception { - AuthzTrans trans = env.newTransNoAvg(); - if(ids!=null) { - ids.close(trans); - } - } - - /** - * @throws java.lang.Exception - */ - @Before - public void setUp() throws Exception { - } - - /** - * @throws java.lang.Exception - */ - @After - public void tearDown() throws Exception { - } - - @Test - public void test() throws IOException { - Reuse reuse = ids.reuse(); // this object can be reused within the same thread. - Data id = ids.find("osaaf",reuse); - Assert.assertNotNull(id); - System.out.println(id); - - id = ids.find("mmanager",reuse); - Assert.assertNotNull(id); - System.out.println(id); - - //TODO Fill out JUnit with Tests of all Methods in "Data id" - } - -} diff --git a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrg.java b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrg.java deleted file mode 100644 index 2ffa1f70..00000000 --- a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrg.java +++ /dev/null @@ -1,102 +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 com.osaaf.defOrg; - -import static org.junit.Assert.*; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; - -import javax.mail.Address; -import javax.mail.internet.InternetAddress; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Matchers; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.modules.junit4.PowerMockRunner; - -import com.att.authz.env.AuthzEnv; -import com.att.authz.env.AuthzTrans; -import com.att.authz.org.Executor; -import com.att.authz.org.OrganizationException; -import com.att.authz.org.Organization.Identity; -import com.att.authz.org.Organization.Policy; -import com.osaaf.defOrg.Identities.Data; - -@RunWith(PowerMockRunner.class) -public class JU_DefaultOrg { - -DefaultOrg defaultOrg; -//private DefaultOrg defaultOrgMock; -@Mock -AuthzEnv authzEnvMock; - -private static final String PROPERTY_IS_REQUIRED = " property is Required"; -private static final String DOMAIN = "osaaf.com"; -private static final String REALM = "com.osaaf"; -private static final String NAME = "Default Organization"; -private static final String NO_PASS = NAME + " does not support Passwords. Use AAF"; -String mailHost,mailFromUserId,supportAddress; -private String SUFFIX; -String s; -String defFile; -@Mock -File fIdentitiesMock; - -@Before -public void setUp() throws OrganizationException{ - MockitoAnnotations.initMocks(this); - PowerMockito.when(authzEnvMock.getProperty(s=(REALM + ".mailHost"), null)).thenReturn("hello"); - PowerMockito.when(authzEnvMock.getProperty(s=(REALM + ".supportEmail"), null)).thenReturn("notnull"); - PowerMockito.when(authzEnvMock.getProperty(Matchers.anyString())).thenReturn("C:/Users/sv8675/Desktop/AAF-Code-Sai/AAF-master/authz/authz-defOrg/src/main/java/test.txt"); - PowerMockito.when(fIdentitiesMock.exists()).thenReturn(true); - //PowerMockito.when((fIdentitiesMock!=null && fIdentitiesMock.exists())).thenReturn(true); - defaultOrg = new DefaultOrg(authzEnvMock); -} - -@Test //(expected=OrganizationException.class) -public void test() throws OrganizationException{ - //PowerMockito.when(authzEnvMock.getProperty(Matchers.anyString())).thenReturn(" "); - //defaultOrg = new DefaultOrg(authzEnvMock); - assertTrue(true); -} - -@Test -public void testIsValidID(){ - String Result = defaultOrg.isValidID(Matchers.anyString()); - System.out.println("value of res " +Result); - assertNotNull(Result); -} - -@Mock -AuthzTrans authzTransMock; - - -} diff --git a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgIdentity.java b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgIdentity.java deleted file mode 100644 index 3a51b6fe..00000000 --- a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgIdentity.java +++ /dev/null @@ -1,71 +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 com.osaaf.defOrg; - -import static org.junit.Assert.*; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.modules.junit4.PowerMockRunner; - -import com.att.authz.env.AuthzTrans; -import com.att.authz.org.OrganizationException; -import com.att.authz.org.Organization.Identity; -import com.osaaf.defOrg.Identities.Data; - -@RunWith(PowerMockRunner.class) -public class JU_DefaultOrgIdentity { - - private DefaultOrgIdentity defaultOrgIdentity; - private DefaultOrgIdentity defaultOrgIdentityMock; - - @Mock - AuthzTrans authzTransMock; - - String key="key"; - - @Mock - private DefaultOrg defaultOrgMock; - @Mock - private Data dataMock; - @Mock - private Identity identityMock; - - @Before - public void setUp() throws OrganizationException{ - MockitoAnnotations.initMocks(this); - defaultOrgIdentityMock = PowerMockito.mock(DefaultOrgIdentity.class); - } - - @Test - public void testEquals(){ - Object b = null; - Boolean res = defaultOrgIdentityMock.equals(b); - System.out.println("value of res " +res); - } - -} diff --git a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgWarnings.java b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgWarnings.java deleted file mode 100644 index 164566d3..00000000 --- a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgWarnings.java +++ /dev/null @@ -1,83 +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 com.osaaf.defOrg; - -import static org.junit.Assert.*; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.MockitoAnnotations; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.modules.junit4.PowerMockRunner; - -@RunWith(PowerMockRunner.class) -public class JU_DefaultOrgWarnings { - - private DefaultOrgWarnings defaultOrgWarningsMock; - private DefaultOrgWarnings defaultOrgWarnings; - - - @Before - public void setUp(){ - MockitoAnnotations.initMocks(this); - - defaultOrgWarningsMock = PowerMockito.mock(DefaultOrgWarnings.class); - - defaultOrgWarnings = new DefaultOrgWarnings(); - } - - - @Test - public void testApprEmailInterval() { - - assertEquals(259200000, defaultOrgWarnings.apprEmailInterval() ); - } - - @Test - public void testCredEmailInterval() { - assertEquals(604800000, defaultOrgWarnings.credEmailInterval()); - - } - - @Test - public void testCredExpirationWarning() { - assertEquals(2592000000L, defaultOrgWarnings.credExpirationWarning()); - } - - @Test - public void testEmailUrgentWarning() { - assertEquals(1209600000L, defaultOrgWarnings.emailUrgentWarning()); - } - - @Test - public void testRoleEmailInterval() { - assertEquals(604800000L, defaultOrgWarnings.roleEmailInterval()); - } - - @Test - public void testRoleExpirationWarning() { - assertEquals(2592000000L, defaultOrgWarnings.roleExpirationWarning()); - } - -} diff --git a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_Identities.java b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_Identities.java deleted file mode 100644 index 2bda77f5..00000000 --- a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_Identities.java +++ /dev/null @@ -1,112 +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 com.osaaf.defOrg; - -import java.io.File; -import java.io.IOException; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import com.att.authz.env.AuthzEnv; -import com.att.authz.env.AuthzTrans; -import com.att.authz.local.AbsData.Reuse; -import com.osaaf.defOrg.Identities; -import com.osaaf.defOrg.Identities.Data; - -/** - * - */ -public class JU_Identities { - - private static final String DATA_IDENTITIES = "../opt/app/aaf/data/identities.dat"; - private static File fids; - private static Identities ids; - private static AuthzEnv env; - - /** - * @throws java.lang.Exception - */ - @BeforeClass - public static void setUpBeforeClass() throws Exception { - env = new AuthzEnv(); - AuthzTrans trans = env.newTransNoAvg(); - // Note: utilize TimeTaken, from trans.start if you want to time. - fids = new File(DATA_IDENTITIES); - if(fids.exists()) { - ids = new Identities(fids); - ids.open(trans, 5000); - } else { - - throw new Exception("Data File for Tests, \"" + DATA_IDENTITIES - + "\" must exist before test can run. (Current dir is " + System.getProperty("user.dir") + ")"); - } - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - public static void tearDownAfterClass() throws Exception { - AuthzTrans trans = env.newTransNoAvg(); - if(ids!=null) { - ids.close(trans); - } - } - - /** - * @throws java.lang.Exception - */ - @Before - public void setUp() throws Exception { - } - - /** - * @throws java.lang.Exception - */ - @After - public void tearDown() throws Exception { - } - - @Test - public void test() throws IOException { - Reuse reuse = ids.reuse(); // this object can be reused within the same thread. - Data id = ids.find("osaaf",reuse); - Assert.assertNotNull(id); - System.out.println(id); - - id = ids.find("mmanager",reuse); - Assert.assertNotNull(id); - System.out.println(id); - - //TODO Fill out JUnit with Tests of all Methods in "Data id" - } - -} -- cgit 1.2.3-korg