summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-aaf/src/test/java/org/onap
diff options
context:
space:
mode:
authorst398c <st398c@research.att.com>2019-03-28 16:30:03 -0400
committerst398c <st398c@research.att.com>2019-03-28 16:30:03 -0400
commitfa5f20d91c416a855f0d6afe157db8250574617c (patch)
tree3dd5dd3f8bccc8c0f30ca41cb2569aa4b0c5cefb /ecomp-sdk/epsdk-aaf/src/test/java/org/onap
parent1ded3bb69c5e91cd879d83e13d2b3295710cdb4f (diff)
Fortify, version, Junit
Issue-ID: PORTAL-543, PORTAL-273, PORTAL-544 Change-Id: Ib864ef78bbd534170cab90d9314f2d8943f78872 Signed-off-by: Thota, Saisree <st398c@research.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-aaf/src/test/java/org/onap')
-rw-r--r--ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessPermsTest.java12
-rw-r--r--ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessRoleDescriptionTest.java74
-rw-r--r--ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessRoleTest.java10
-rw-r--r--ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessUserRoleDetailTest.java10
-rw-r--r--ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/util/EcompExternalAuthUtilsTest.java14
5 files changed, 3 insertions, 117 deletions
diff --git a/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessPermsTest.java b/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessPermsTest.java
index b118811b..b5645242 100644
--- a/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessPermsTest.java
+++ b/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessPermsTest.java
@@ -87,18 +87,6 @@ public class ExternalAccessPermsTest {
}
@Test
- public void testCompareTo()
- {
- ExternalAccessPerms extPermsDetailTest1 = new ExternalAccessPerms("test_type", "test_instance", "*");
- ExternalAccessPerms extPermsDetailTest2 = new ExternalAccessPerms("test_type", "test_instance", "*",
- "test_name");
- extPermsDetailTest1.setInstance("test_instance");
- extPermsDetailTest2.setInstance("test_instance");
- int result= extPermsDetailTest1.compareTo(extPermsDetailTest2);
- assertEquals(0, result);
- }
-
- @Test
public void testHashCode()
{
ExternalAccessPerms extPermsDetailTest = new ExternalAccessPerms();
diff --git a/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessRoleDescriptionTest.java b/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessRoleDescriptionTest.java
deleted file mode 100644
index 9e7970b2..00000000
--- a/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessRoleDescriptionTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * ============LICENSE_START==========================================
- * ONAP Portal SDK
- * ===================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- *
- * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- *
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://creativecommons.org/licenses/by/4.0/
- *
- * Unless required by applicable law or agreed to in writing, documentation
- * 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.portalsdk.external.authorization.domain;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class ExternalAccessRoleDescriptionTest {
-
- public ExternalAccessRoleDescription mockExternalRoleDescriptionTest() {
- ExternalAccessRoleDescription mockExtRoleDesc = new ExternalAccessRoleDescription();
- mockExtRoleDesc.setActive("true");
- mockExtRoleDesc.setAppRoleId("1");
- mockExtRoleDesc.setAppId("1");
- mockExtRoleDesc.setId("1");
- mockExtRoleDesc.setName("test");
- mockExtRoleDesc.setPriority("1");
- return mockExtRoleDesc;
- }
-
- @Test
- public void externalRoleDescriptionTest() {
- ExternalAccessRoleDescription extRoleDesc = new ExternalAccessRoleDescription();
- extRoleDesc.setActive("true");
- extRoleDesc.setAppRoleId("1");
- extRoleDesc.setAppId("1");
- extRoleDesc.setId("1");
- extRoleDesc.setName("test");
- extRoleDesc.setPriority("1");
- assertEquals(extRoleDesc.getActive(), mockExternalRoleDescriptionTest().getActive());
- assertEquals(extRoleDesc.getAppId(), mockExternalRoleDescriptionTest().getAppId());
- assertEquals(extRoleDesc.getAppRoleId(), mockExternalRoleDescriptionTest().getAppRoleId());
- assertEquals(extRoleDesc.getId(), mockExternalRoleDescriptionTest().getId());
- assertEquals(extRoleDesc.getName(), mockExternalRoleDescriptionTest().getName());
- assertEquals(extRoleDesc.getPriority(), mockExternalRoleDescriptionTest().getPriority());
- assertEquals(true, extRoleDesc.equals(mockExternalRoleDescriptionTest()));
- }
-}
diff --git a/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessRoleTest.java b/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessRoleTest.java
index 557f5444..c4595a6d 100644
--- a/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessRoleTest.java
+++ b/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessRoleTest.java
@@ -56,18 +56,15 @@ public class ExternalAccessRoleTest {
public ExternalAccessRole mockExternalAccessRoleTest() {
ExternalAccessRole mockRole = new ExternalAccessRole();
- ExternalAccessRoleDescription roleDesc = new ExternalAccessRoleDescription();
+ String roleDesc = "";
ExternalAccessPerms ecPerm = new ExternalAccessPerms();
List<ExternalAccessPerms> ecPerms = new ArrayList<>();
ecPerm.setAction("test_action");
ecPerm.setType("test_type");
ecPerm.setInstance("test_instance");
ecPerm.setDescription("test_description");
- roleDesc.setActive("true");
- roleDesc.setAppId("1");
mockRole.setName("test_role");
mockRole.setPerms(ecPerms);
- mockRole.setDescription(roleDesc);
return mockRole;
}
@@ -75,8 +72,8 @@ public class ExternalAccessRoleTest {
public void setUp()
{
mockRole = mockExternalAccessRoleTest();
- role = new ExternalAccessRole(mockRole.getName(), mockRole.getPerms(), mockRole.getDescription());
- role1= new ExternalAccessRole(mockRole.getName(), mockRole.getPerms(), mockRole.getDescription());;
+ role = new ExternalAccessRole(mockRole.getName(), mockRole.getPerms());
+ role1= new ExternalAccessRole(mockRole.getName(), mockRole.getPerms());
}
@Test
@@ -84,7 +81,6 @@ public class ExternalAccessRoleTest {
assertEquals(role.getName(), mockExternalAccessRoleTest().getName());
assertEquals(role.getPerms(), mockExternalAccessRoleTest().getPerms());
- assertEquals(role.getDescription(), mockExternalAccessRoleTest().getDescription());
}
@Test
diff --git a/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessUserRoleDetailTest.java b/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessUserRoleDetailTest.java
index f0a0a69e..fd6d5309 100644
--- a/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessUserRoleDetailTest.java
+++ b/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessUserRoleDetailTest.java
@@ -58,16 +58,7 @@ public class ExternalAccessUserRoleDetailTest {
mockExtPermsTest.setType("test_type");
mockExtPermsTest.setInstance("test_instance");
mockPerms.add(mockExtPermsTest);
- ExternalAccessRoleDescription mockRoleDesc = new ExternalAccessRoleDescription();
- mockRoleDesc.setActive("true");
- mockRoleDesc.setAppId("1");
- mockRoleDesc.setAppRoleId("1");
- mockRoleDesc.setId("1");
- mockRoleDesc.setPriority("1");
- mockRoleDesc.setName("test");
- mockRoleDesc.setName("com.test.app.rolename");
role.setPerms(mockPerms);
- role.setDescription(mockRoleDesc);
ExternalAccessUserRoleDetail mockExtUserRoleDetailTest = new ExternalAccessUserRoleDetail(role);
return mockExtUserRoleDetailTest;
}
@@ -78,7 +69,6 @@ public class ExternalAccessUserRoleDetailTest {
ExternalAccessRole role = extUserRoleDetailTest2.getRole();
assertEquals(role.getName(), mockExternalAccessUserRoleDetailTest().getRole().getName());
assertEquals(role.getPerms(), mockExternalAccessUserRoleDetailTest().getRole().getPerms());
- assertEquals(role.getDescription(), mockExternalAccessUserRoleDetailTest().getRole().getDescription());
}
diff --git a/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/util/EcompExternalAuthUtilsTest.java b/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/util/EcompExternalAuthUtilsTest.java
index 98260e20..d2f64725 100644
--- a/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/util/EcompExternalAuthUtilsTest.java
+++ b/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/util/EcompExternalAuthUtilsTest.java
@@ -37,9 +37,7 @@
*/
package org.onap.portalsdk.external.authorization.util;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import javax.xml.bind.DatatypeConverter;
@@ -108,16 +106,4 @@ public class EcompExternalAuthUtilsTest {
public void checkNameSpaceMatchingLengthTest() throws Exception {
EcompExternalAuthUtils.checkNameSpaceMatching("com.test.app2.role", "com.test.app2.role.test");
}
-
- @Test
- public void isJsonValidTest() {
- boolean actual = EcompExternalAuthUtils.isJSONValid("{\"test\":\"test\"}");
- assertTrue(actual);
- }
-
- @Test
- public void isJsonValidFailTest() {
- boolean actual = EcompExternalAuthUtils.isJSONValid("{\"test\":\"test\"");
- assertFalse(actual);
- }
}