diff options
4 files changed, 185 insertions, 16 deletions
diff --git a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java index c769ded26..e3d4addb7 100644 --- a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java +++ b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java @@ -2,7 +2,7 @@ * ================================================================================ * ONAP Portal SDK * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property + * Copyright (C) 2017-2018 AT&T Intellectual Property * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,19 +45,23 @@ public class AdminAuthExtension implements IAdminAuthExtension { @Autowired CommonClassDao commonClassDao; + public void setCommonClassDao(CommonClassDao dao){ + commonClassDao = dao; + } + /* * (non-Javadoc) - * @see org.openecomp.portalapp.service.IAdminAuthExtension#saveUserExtension(org.openecomp.portalsdk.core.domain.User) + * @see org.onap.portalapp.service.IAdminAuthExtension#saveUserExtension(org.onap.portalsdk.core.domain.User) */ public void saveUserExtension(User user) { logger.debug("saveUserExtension"); - savePolicyRole(null, user); + savePolicyRole(user); } /* * (non-Javadoc) - * @see org.openecomp.portalapp.service.IAdminAuthExtension#editUserExtension(org.openecomp.portalsdk.core.domain.User) + * @see org.onap.portalapp.service.IAdminAuthExtension#editUserExtension(org.onap.portalsdk.core.domain.User) */ public void editUserExtension(User user) { logger.debug("editUserExtension"); @@ -65,15 +69,15 @@ public class AdminAuthExtension implements IAdminAuthExtension { /* * (non-Javadoc) - * @see org.openecomp.portalapp.service.IAdminAuthExtension#saveUserRoleExtension(java.util.Set, org.openecomp.portalsdk.core.domain.User) + * @see org.onap.portalapp.service.IAdminAuthExtension#saveUserRoleExtension(java.util.Set, org.onap.portalsdk.core.domain.User) */ public void saveUserRoleExtension(Set<Role> roles, User user) { logger.debug("saveUserRoleExtension"); - savePolicyRole(roles, user); + savePolicyRole(user); } - private void savePolicyRole(Set<Role> roles, User user){ - System.out.println("User Object Recieved"); + private void savePolicyRole(User user){ + logger.info("User Object Recieved"); try{ Roles roles1 = new Roles(); roles1.setName(user.getFullName()); @@ -82,18 +86,18 @@ public class AdminAuthExtension implements IAdminAuthExtension { String query = "delete from Roles where loginid='"+user.getLoginId()+"'"; commonClassDao.updateQuery(query); for(Role role : user.getRoles()){ - System.out.println("User Role"+role); - if(role.getName().trim().equalsIgnoreCase("Policy Super Admin") || role.getName().trim().equalsIgnoreCase("System Administrator") || role.getName().trim().equalsIgnoreCase("Standard User") ){ + logger.info("User Role"+role); + if("Policy Super Admin".equalsIgnoreCase(role.getName().trim()) || "System Administrator".equalsIgnoreCase(role.getName().trim()) || "Standard User".equalsIgnoreCase(role.getName().trim()) ){ roles1.setRole("super-admin"); - }else if(role.getName().trim().equalsIgnoreCase("Policy Super Editor")){ + }else if("Policy Super Editor".equalsIgnoreCase(role.getName().trim())){ roles1.setRole("super-editor"); - }else if(role.getName().trim().equalsIgnoreCase("Policy Super Guest")){ + }else if("Policy Super Guest".equalsIgnoreCase(role.getName().trim())){ roles1.setRole("super-guest"); - }else if(role.getName().trim().equalsIgnoreCase("Policy Admin")){ + }else if("Policy Admin".equalsIgnoreCase(role.getName().trim())){ roles1.setRole("admin"); - }else if(role.getName().trim().equalsIgnoreCase("Policy Editor")){ + }else if("Policy Editor".equalsIgnoreCase(role.getName().trim())){ roles1.setRole("editor"); - }else if(role.getName().trim().equalsIgnoreCase("Policy Guest")){ + }else if("Policy Guest".equalsIgnoreCase(role.getName().trim())){ roles1.setRole("guest"); } commonClassDao.save(roles1); @@ -104,7 +108,7 @@ public class AdminAuthExtension implements IAdminAuthExtension { userInfo.setUserLoginId(user.getLoginId()); userInfo.setUserName(user.getFullName()); commonClassDao.save(userInfo); - System.out.println("User Object Updated Successfully"); + logger.info("User Object Updated Successfully"); } catch(Exception e){ logger.error("Exception caused while Setting role to Policy DB"+e); diff --git a/ONAP-SDK-APP/src/test/java/org/onap/portalapp/conf/ExternalAppInitializerTest.java b/ONAP-SDK-APP/src/test/java/org/onap/portalapp/conf/ExternalAppInitializerTest.java new file mode 100644 index 000000000..81bf7e95a --- /dev/null +++ b/ONAP-SDK-APP/src/test/java/org/onap/portalapp/conf/ExternalAppInitializerTest.java @@ -0,0 +1,45 @@ +/*- + * ================================================================================ + * ONAP Portal SDK + * ================================================================================ + * Copyright (C) 2018 AT&T Intellectual Property + * ================================================================================ + * 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. + * ================================================================================ + */ +package org.onap.portalapp.conf; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class ExternalAppInitializerTest { + + @Test + public void testExternalAppInitializer(){ + ExternalAppInitializer initializer = new ExternalAppInitializer(); + assertTrue(initializer.getRootConfigClasses()!=null); + assertTrue(initializer.getServletConfigClasses()!=null); + assertTrue(initializer.getServletMappings()!=null); + } + + @Test + public void testExternalAppConfig(){ + ExternalAppConfig appConfig = new ExternalAppConfig(); + assertTrue(appConfig.dataAccessService()!=null); + assertTrue(appConfig.addTileDefinitions()!=null); + assertTrue(appConfig.cacheManager()!=null); + assertTrue(appConfig.loginStrategy()!=null); + assertTrue(appConfig.viewResolver()!=null); + } +} diff --git a/ONAP-SDK-APP/src/test/java/org/onap/portalapp/conf/HibernateMappingLocationsTest.java b/ONAP-SDK-APP/src/test/java/org/onap/portalapp/conf/HibernateMappingLocationsTest.java new file mode 100644 index 000000000..6762e4aee --- /dev/null +++ b/ONAP-SDK-APP/src/test/java/org/onap/portalapp/conf/HibernateMappingLocationsTest.java @@ -0,0 +1,34 @@ +/*- + * ================================================================================ + * ONAP Portal SDK + * ================================================================================ + * Copyright (C) 2018 AT&T Intellectual Property + * ================================================================================ + * 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. + * ================================================================================ + */ +package org.onap.portalapp.conf; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class HibernateMappingLocationsTest { + + @Test + public void testHibernateMappingLocations(){ + HibernateMappingLocations locations = new HibernateMappingLocations(); + assertTrue(locations.getMappingLocations()!=null); + assertTrue(locations.getPackagesToScan()!=null); + } +} diff --git a/ONAP-SDK-APP/src/test/java/org/onap/portalapp/service/AdminAuthExtensionTest.java b/ONAP-SDK-APP/src/test/java/org/onap/portalapp/service/AdminAuthExtensionTest.java new file mode 100644 index 000000000..30a38d4ba --- /dev/null +++ b/ONAP-SDK-APP/src/test/java/org/onap/portalapp/service/AdminAuthExtensionTest.java @@ -0,0 +1,86 @@ +/*- + * ================================================================================ + * ONAP Portal SDK + * ================================================================================ + * Copyright (C) 2018 AT&T Intellectual Property + * ================================================================================ + * 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. + * ================================================================================ + */ +package org.onap.portalapp.service; + +import static org.junit.Assert.*; + +import java.util.SortedSet; +import java.util.TreeSet; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mockito; +import org.onap.policy.rest.dao.CommonClassDao; +import org.onap.portalsdk.core.domain.Role; +import org.onap.portalsdk.core.domain.User; + +public class AdminAuthExtensionTest { + + private CommonClassDao commonClassDao; + private AdminAuthExtension extension; + private User user; + + + @Before + public void setUp(){ + extension = new AdminAuthExtension(); + commonClassDao = Mockito.mock(CommonClassDao.class); + Mockito.doNothing().when(commonClassDao).updateQuery(""); + Mockito.doNothing().when(commonClassDao).save(new Object()); + extension.setCommonClassDao(commonClassDao); + user = new User(); + user.setFirstName("Test"); + user.setLoginId("Test"); + } + + @Test + public void testAdminAuthExtension(){ + try{ + callSaveUserFunction("Policy Super Admin"); + callSaveUserFunction("Policy Super Editor"); + callSaveUserFunction("Policy Super Guest"); + callSaveUserFunction("Policy Admin"); + callSaveUserFunction("Policy Editor"); + callSaveUserFunction("Policy Guest"); + extension.editUserExtension(user); + extension.saveUserRoleExtension(null, user); + }catch(Exception e){ + fail("Not Expecting any exception."); + } + } + + @Test + public void expectException(){ + try{ + extension.saveUserExtension(null); + }catch(Exception e){ + assertEquals(NullPointerException.class, e.getClass()); + } + } + + public void callSaveUserFunction(String roleName){ + SortedSet<Role> roles = new TreeSet<>(); + Role role = new Role(); + role.setName(roleName); + roles.add(role); + user.setRoles(roles); + extension.saveUserExtension(user); + } +} |