You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2019/01/15 08:32:39 UTC
svn commit: r1851326 -
/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/
Author: gk
Date: Tue Jan 15 08:32:39 2019
New Revision: 1851326
URL: http://svn.apache.org/viewvc?rev=1851326&view=rev
Log:
- cleanup override, teardown
- format classes in package turbine
Modified:
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/AbstractTurbineUserManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerLazyTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerTest.java
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/AbstractTurbineUserManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/AbstractTurbineUserManagerTest.java?rev=1851326&r1=1851325&r2=1851326&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/AbstractTurbineUserManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/AbstractTurbineUserManagerTest.java Tue Jan 15 08:32:39 2019
@@ -46,319 +46,352 @@ import org.junit.jupiter.api.Test;
/**
* @author Eric Pugh
- * @author Georg Kallidis
- *
- * Same as {@link AbstractUserManagerTest} in Fulcrum API module, but with user-group-role-sets added and checked
- *
+ * @author Georg Kallidis Same as {@link AbstractUserManagerTest} in Fulcrum API module, but with user-group-role-sets
+ * added and checked
*/
-public abstract class AbstractTurbineUserManagerTest extends BaseUnit5Test
+public abstract class AbstractTurbineUserManagerTest
+ extends BaseUnit5Test
{
protected User user;
+
protected UserManager userManager;
+
protected SecurityService securityService;
protected static final String TEST_GROUP = "TEST_GROUP";
+
protected static final String TEST_ROLE = "TEST_Role";
+
protected Group group;
+
protected Role role;
// requires default user in setup
@Test
- public void testCheckExists() throws Exception
+ public void testCheckExists()
+ throws Exception
{
- user = userManager.getUserInstance("Philip");
- userManager.addUser(user, "bobo");
- addDefaultGrantUserGroupRole(user) ;
-
- assertTrue(userManager.checkExists("philip"));
- assertTrue(userManager.checkExists(user));
- assertFalse(userManager.checkExists("ImaginaryFriend"));
- user = userManager.getUserInstance("ImaginaryFriend");
- assertFalse(userManager.checkExists(user));
- }
- @Test
- public void testCheckExistsWithString() throws Exception
- {
- user = userManager.getUserInstance("Philip2");
- userManager.addUser(user, "bobo");
- addDefaultGrantUserGroupRole(user) ;
-
- assertTrue(userManager.checkExists("philip2"));
- assertTrue(userManager.checkExists(user.getName()));
- assertFalse(userManager.checkExists("ImaginaryFriend2"));
- user = userManager.getUserInstance("ImaginaryFriend2");
- assertFalse(userManager.checkExists(user.getName()));
+ user = userManager.getUserInstance( "Philip" );
+ userManager.addUser( user, "bobo" );
+ addDefaultGrantUserGroupRole( user );
+
+ assertTrue( userManager.checkExists( "philip" ) );
+ assertTrue( userManager.checkExists( user ) );
+ assertFalse( userManager.checkExists( "ImaginaryFriend" ) );
+ user = userManager.getUserInstance( "ImaginaryFriend" );
+ assertFalse( userManager.checkExists( user ) );
+ }
+
+ @Test
+ public void testCheckExistsWithString()
+ throws Exception
+ {
+ user = userManager.getUserInstance( "Philip2" );
+ userManager.addUser( user, "bobo" );
+ addDefaultGrantUserGroupRole( user );
+
+ assertTrue( userManager.checkExists( "philip2" ) );
+ assertTrue( userManager.checkExists( user.getName() ) );
+ assertFalse( userManager.checkExists( "ImaginaryFriend2" ) );
+ user = userManager.getUserInstance( "ImaginaryFriend2" );
+ assertFalse( userManager.checkExists( user.getName() ) );
}
/*
* Class to test for User retrieve(String)
*/
@Test
- public void testGetUserString() throws Exception
+ public void testGetUserString()
+ throws Exception
{
- user = userManager.getUserInstance("QuietMike");
- userManager.addUser(user, "bobo");
- addDefaultGrantUserGroupRole(user) ;
-
- user = userManager.getUser("QuietMike");
- assertNotNull(user);
- }
- @Test
- public void testGetUserById() throws Exception
- {
- user = userManager.getUserInstance("QuietMike2");
- userManager.addUser(user, "bobo");
- User user2 = userManager.getUserById(user.getId());
- assertEquals(user.getName(), user2.getName());
- assertEquals(user.getId(), user2.getId());
+ user = userManager.getUserInstance( "QuietMike" );
+ userManager.addUser( user, "bobo" );
+ addDefaultGrantUserGroupRole( user );
+
+ user = userManager.getUser( "QuietMike" );
+ assertNotNull( user );
+ }
+
+ @Test
+ public void testGetUserById()
+ throws Exception
+ {
+ user = userManager.getUserInstance( "QuietMike2" );
+ userManager.addUser( user, "bobo" );
+ User user2 = userManager.getUserById( user.getId() );
+ assertEquals( user.getName(), user2.getName() );
+ assertEquals( user.getId(), user2.getId() );
}
/*
* Class to test for User retrieve(String, String)
*/
@Test
- public void testGetUserStringString() throws Exception
+ public void testGetUserStringString()
+ throws Exception
{
- user = userManager.getUserInstance("Richard");
- userManager.addUser(user, "va");
-
- addDefaultGrantUserGroupRole(user) ;
-
- user = userManager.getUser("Richard", "va");
- assertNotNull(user);
- user = userManager.getUser("richard", "va");
- assertNotNull(user);
+ user = userManager.getUserInstance( "Richard" );
+ userManager.addUser( user, "va" );
+
+ addDefaultGrantUserGroupRole( user );
+
+ user = userManager.getUser( "Richard", "va" );
+ assertNotNull( user );
+ user = userManager.getUser( "richard", "va" );
+ assertNotNull( user );
try
{
- user = userManager.getUser("richard", "VA");
- fail("should have thrown PasswordMismatchException");
+ user = userManager.getUser( "richard", "VA" );
+ fail( "should have thrown PasswordMismatchException" );
}
- catch (PasswordMismatchException pme)
+ catch ( PasswordMismatchException pme )
{
// good
}
}
+
@Test
- public void testGetAllUsers() throws Exception
+ public void testGetAllUsers()
+ throws Exception
{
int size = userManager.getAllUsers().size();
- user = userManager.getUserInstance("Bob");
- userManager.addUser(user, "");
- addDefaultGrantUserGroupRole(user) ;
-
+ user = userManager.getUserInstance( "Bob" );
+ userManager.addUser( user, "" );
+ addDefaultGrantUserGroupRole( user );
+
UserSet<User> userSet = userManager.getAllUsers();
- assertEquals(size + 1, userSet.size());
+ assertEquals( size + 1, userSet.size() );
}
+
@Test
- public void testAuthenticate() throws Exception
+ public void testAuthenticate()
+ throws Exception
{
- user = userManager.getUserInstance("Kay");
- userManager.addUser(user, "jc");
- addDefaultGrantUserGroupRole(user) ;
- userManager.authenticate(user, "jc");
+ user = userManager.getUserInstance( "Kay" );
+ userManager.addUser( user, "jc" );
+ addDefaultGrantUserGroupRole( user );
+ userManager.authenticate( user, "jc" );
try
{
- userManager.authenticate(user, "JC");
- fail("should have thrown PasswordMismatchException");
+ userManager.authenticate( user, "JC" );
+ fail( "should have thrown PasswordMismatchException" );
}
- catch (PasswordMismatchException pme)
+ catch ( PasswordMismatchException pme )
{
// good
}
}
+
@Test
- public void testChangePassword() throws Exception
+ public void testChangePassword()
+ throws Exception
{
- user = userManager.getUserInstance("Jonathan");
- userManager.addUser(user, "jc");
- addDefaultGrantUserGroupRole(user) ;
+ user = userManager.getUserInstance( "Jonathan" );
+ userManager.addUser( user, "jc" );
+ addDefaultGrantUserGroupRole( user );
try
{
- userManager.changePassword(user, "WrongPWD", "JC");
- fail("should have thrown PasswordMismatchException");
+ userManager.changePassword( user, "WrongPWD", "JC" );
+ fail( "should have thrown PasswordMismatchException" );
}
- catch (PasswordMismatchException pme)
+ catch ( PasswordMismatchException pme )
{
// good
}
- userManager.changePassword(user, "jc", "JC");
- userManager.authenticate(user, "JC");
+ userManager.changePassword( user, "jc", "JC" );
+ userManager.authenticate( user, "JC" );
}
+
@Test
- public void testForcePassword() throws Exception
+ public void testForcePassword()
+ throws Exception
{
- user = userManager.getUserInstance("Connor");
- userManager.addUser(user, "jc_subset");
- addDefaultGrantUserGroupRole(user) ;
-
- userManager.forcePassword(user, "JC_SUBSET");
- userManager.authenticate(user, "JC_SUBSET");
+ user = userManager.getUserInstance( "Connor" );
+ userManager.addUser( user, "jc_subset" );
+ addDefaultGrantUserGroupRole( user );
+
+ userManager.forcePassword( user, "JC_SUBSET" );
+ userManager.authenticate( user, "JC_SUBSET" );
}
/*
* Class to test for User getUserInstance()
*/
@Test
- public void testGetUserInstance() throws Exception
+ public void testGetUserInstance()
+ throws Exception
{
user = userManager.getUserInstance();
- assertNotNull(user);
- assertTrue(user.getName() == null);
+ assertNotNull( user );
+ assertTrue( user.getName() == null );
}
/*
* Class to test for User getUserInstance(String)
*/
@Test
- public void testGetUserInstanceString() throws Exception
+ public void testGetUserInstanceString()
+ throws Exception
{
- user = userManager.getUserInstance("Philip");
- assertEquals("philip", user.getName());
+ user = userManager.getUserInstance( "Philip" );
+ assertEquals( "philip", user.getName() );
}
/**
- * Need to figure out if save is something we want.. right now it just bloes
- * up if you actually change anything.
+ * Need to figure out if save is something we want.. right now it just bloes up if you actually change anything.
*
* @todo figur out what to do here...
* @throws Exception
*/
@Test
- public void testSaveUser() throws Exception
+ public void testSaveUser()
+ throws Exception
{
- user = userManager.getUserInstance("Kate");
- userManager.addUser(user, "katiedid");
-
- addDefaultGrantUserGroupRole(user) ;
-
- user = userManager.getUser(user.getName());
+ user = userManager.getUserInstance( "Kate" );
+ userManager.addUser( user, "katiedid" );
+
+ addDefaultGrantUserGroupRole( user );
+
+ user = userManager.getUser( user.getName() );
// user.setName("Katherine");
- userManager.saveUser(user);
- assertEquals("kate", userManager.getUser(user.getName()).getName());
+ userManager.saveUser( user );
+ assertEquals( "kate", userManager.getUser( user.getName() ).getName() );
}
+
@Test
- public void testGetACL() throws Exception
+ public void testGetACL()
+ throws Exception
{
- user = userManager.getUserInstance("Tony");
- userManager.addUser(user, "california");
- addDefaultGrantUserGroupRole(user) ;
-
- AccessControlList acl = userManager.getACL(user);
-
- assertNotNull(acl);
-
- Role testRole = securityService.getRoleManager().getRoleByName(TEST_ROLE );
- Group testGroup = securityService.getGroupManager().getGroupByName(TEST_GROUP );
- assertTrue(((TurbineAccessControlList)acl).hasRole( testRole, testGroup ));
-
- Group globalGroup = securityService.<TurbineModelManager>getModelManager().getGlobalGroup();
- securityService.<TurbineModelManager>getModelManager().grant( user, globalGroup, testRole );
+ user = userManager.getUserInstance( "Tony" );
+ userManager.addUser( user, "california" );
+ addDefaultGrantUserGroupRole( user );
+
+ AccessControlList acl = userManager.getACL( user );
+
+ assertNotNull( acl );
+
+ Role testRole = securityService.getRoleManager().getRoleByName( TEST_ROLE );
+ Group testGroup = securityService.getGroupManager().getGroupByName( TEST_GROUP );
+ assertTrue( ( (TurbineAccessControlList) acl ).hasRole( testRole, testGroup ) );
+
+ Group globalGroup = securityService.<TurbineModelManager> getModelManager().getGlobalGroup();
+ securityService.<TurbineModelManager> getModelManager().grant( user, globalGroup, testRole );
// immutable
- acl = userManager.getACL(user);
-
- assertTrue(((TurbineAccessControlList)acl).hasRole( testRole ));
+ acl = userManager.getACL( user );
+
+ assertTrue( ( (TurbineAccessControlList) acl ).hasRole( testRole ) );
}
+
@Test
- public void testRemoveUser() throws Exception
+ public void testRemoveUser()
+ throws Exception
{
- user = userManager.getUserInstance("Rick");
- userManager.addUser(user, "nb");
- addDefaultGrantUserGroupRole(user) ;
+ user = userManager.getUserInstance( "Rick" );
+ userManager.addUser( user, "nb" );
+ addDefaultGrantUserGroupRole( user );
// required
revokeDefaultGrantUserGroupRole( user );
- userManager.removeUser(user);
+ userManager.removeUser( user );
try
{
- User user2 = userManager.getUser(user.getName());
- fail("Should have thrown UEE");
+ User user2 = userManager.getUser( user.getName() );
+ fail( "Should have thrown UEE" );
}
- catch (UnknownEntityException uee)
+ catch ( UnknownEntityException uee )
{
// good
}
}
+
@Test
- public void testAddUser() throws Exception
+ public void testAddUser()
+ throws Exception
{
- user = userManager.getUserInstance("Joe1");
- assertNull(user.getId());
- userManager.addUser(user, "mc");
- addDefaultGrantUserGroupRole(user) ;
- user = userManager.getUserInstance("Joe2");
- assertNull(user.getId());
- userManager.addUser(user, "mc");
- assertNotNull(user.getId());
- assertNotNull(userManager.getUser(user.getName()));
+ user = userManager.getUserInstance( "Joe1" );
+ assertNull( user.getId() );
+ userManager.addUser( user, "mc" );
+ addDefaultGrantUserGroupRole( user );
+ user = userManager.getUserInstance( "Joe2" );
+ assertNull( user.getId() );
+ userManager.addUser( user, "mc" );
+ assertNotNull( user.getId() );
+ assertNotNull( userManager.getUser( user.getName() ) );
}
/*
* Class to test for boolean checkExists(string)
*/
- public void testAddUserTwiceFails() throws Exception
+ public void testAddUserTwiceFails()
+ throws Exception
{
- user = userManager.getUserInstance("EATLUNCH");
- userManager.addUser(user, "bob");
- addDefaultGrantUserGroupRole(user) ;
- assertTrue(userManager.checkExists(user.getName()));
- User user2 = userManager.getUserInstance("EATLUNCH");
+ user = userManager.getUserInstance( "EATLUNCH" );
+ userManager.addUser( user, "bob" );
+ addDefaultGrantUserGroupRole( user );
+ assertTrue( userManager.checkExists( user.getName() ) );
+ User user2 = userManager.getUserInstance( "EATLUNCH" );
try
{
- userManager.addUser(user2, "bob");
+ userManager.addUser( user2, "bob" );
}
- catch (EntityExistsException uee)
+ catch ( EntityExistsException uee )
{
// good
}
try
{
- userManager.addUser(user2, "differentpassword");
+ userManager.addUser( user2, "differentpassword" );
}
- catch (EntityExistsException uee)
+ catch ( EntityExistsException uee )
{
// good
}
}
+
@Test
- public void testCheckUserCaseSensitiveExists() throws Exception
+ public void testCheckUserCaseSensitiveExists()
+ throws Exception
{
- user = userManager.getUserInstance("borrisJohnson");
- userManager.addUser(user, "bob");
+ user = userManager.getUserInstance( "borrisJohnson" );
+ userManager.addUser( user, "bob" );
- assertTrue(userManager.checkExists("borrisJohnson"));
+ assertTrue( userManager.checkExists( "borrisJohnson" ) );
}
-
- private void addDefaultGrantUserGroupRole(User user) throws Exception
+
+ private void addDefaultGrantUserGroupRole( User user )
+ throws Exception
{
- securityService.<TurbineModelManager>getModelManager().grant(user, group, role);
+ securityService.<TurbineModelManager> getModelManager().grant( user, group, role );
boolean ugrFound = false;
TurbineUserGroupRole ugrTest = null;
- for (TurbineUserGroupRole ugr : ((TurbineUser) user).getUserGroupRoleSet())
+ for ( TurbineUserGroupRole ugr : ( (TurbineUser) user ).getUserGroupRoleSet() )
{
- if (ugr.getUser().equals(user) && ugr.getGroup().equals(group) && ugr.getRole().equals(role))
+ if ( ugr.getUser().equals( user ) && ugr.getGroup().equals( group ) && ugr.getRole().equals( role ) )
{
ugrFound = true;
ugrTest = ugr;
break;
}
}
- assertTrue(ugrFound);
- assertTrue(ugrTest.getGroup().equals(group));
- assertTrue(ugrTest.getUser().equals(user));
+ assertTrue( ugrFound );
+ assertTrue( ugrTest.getGroup().equals( group ) );
+ assertTrue( ugrTest.getUser().equals( user ) );
}
-
- private void revokeDefaultGrantUserGroupRole(User user) throws Exception
+
+ private void revokeDefaultGrantUserGroupRole( User user )
+ throws Exception
{
- securityService.<TurbineModelManager>getModelManager().revoke(user, group, role);
+ securityService.<TurbineModelManager> getModelManager().revoke( user, group, role );
boolean ugrFound = false;
- for (TurbineUserGroupRole ugr : ((TurbineUser) user).getUserGroupRoleSet())
+ for ( TurbineUserGroupRole ugr : ( (TurbineUser) user ).getUserGroupRoleSet() )
{
- if (ugr.getUser().equals(user) && ugr.getGroup().equals(group) && ugr.getRole().equals(role))
+ if ( ugr.getUser().equals( user ) && ugr.getGroup().equals( group ) && ugr.getRole().equals( role ) )
{
ugrFound = true;
break;
}
- };
- assertFalse(ugrFound);
+ }
+ ;
+ assertFalse( ugrFound );
}
}
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java?rev=1851326&r1=1851325&r2=1851326&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java Tue Jan 15 08:32:39 2019
@@ -57,106 +57,115 @@ public class TorquePeerTurbineModelManag
extends AbstractTurbineModelManagerTest
{
protected static HsqlDB hsqlDB = null;
-
+
public static boolean customPeers = false;
- @Override
@BeforeEach
- public void setUp() throws Exception
+ public void setUp()
+ throws Exception
{
try
{
- hsqlDB = new HsqlDB("src/test/fulcrum-turbine-schema.sql");
- hsqlDB.addSQL("src/test/id-table-schema.sql");
- hsqlDB.addSQL("src/test/fulcrum-turbine-schema-idtable-init.sql");
-
- this.setRoleFileName("src/test/TurbineTorqueRoleConfig.xml");
-
- if (customPeers)
- this.setConfigurationFileName("src/test/TurbineTorqueWithPeersComponentConfig.xml");
+ hsqlDB = new HsqlDB( "src/test/fulcrum-turbine-schema.sql" );
+ hsqlDB.addSQL( "src/test/id-table-schema.sql" );
+ hsqlDB.addSQL( "src/test/fulcrum-turbine-schema-idtable-init.sql" );
+
+ this.setRoleFileName( "src/test/TurbineTorqueRoleConfig.xml" );
+
+ if ( customPeers )
+ this.setConfigurationFileName( "src/test/TurbineTorqueWithPeersComponentConfig.xml" );
else
- this.setConfigurationFileName("src/test/TurbineTorqueComponentConfig.xml");
-
- // The successful Test requires that the PeerImpl classes (in configuration file) implement the interface TorqueTurbinePeer,
+ this.setConfigurationFileName( "src/test/TurbineTorqueComponentConfig.xml" );
+
+ // The successful Test requires that the PeerImpl classes (in configuration file) implement the interface
+ // TorqueTurbinePeer,
// cft. ClassCastException messages.
// (interfaces could not yet automatically generated into Peers with Torque, cft JIRA Issue TORQUE-309).
-
- securityService = (SecurityService) lookup(SecurityService.ROLE);
+
+ securityService = (SecurityService) lookup( SecurityService.ROLE );
super.setUp();
}
- catch (Exception e)
+ catch ( Exception e )
{
- fail(e.toString());
+ fail( e.toString() );
}
}
-
+
@Test
- public void testCustomPeerSet() {
- if (roleManager instanceof TorqueAbstractRoleManager) {
- assertTrue( ((PeerRoleManager)roleManager).getCustomPeer() == customPeers,
- "If a custom Peer for RoleManager should be tested, a peerClassName element should be set in the configuration file for roleManager.");
- }
- if (roleManager instanceof PeerManagable) {
- assertNotNull(((PeerManagable)roleManager).getPeerManager());
- }
- if (userManager instanceof TorqueAbstractUserManager) {
- assertTrue( ((PeerUserManager)userManager).getCustomPeer() == customPeers,
- "If a custom Peer for UserManager should be tested, a peerClassName element should be set in the configuration file for userManager.");
- }
- if (userManager instanceof PeerManagable) {
- assertNotNull(((PeerManagable)userManager).getPeerManager());
- }
- if (groupManager instanceof TorqueAbstractGroupManager) {
- assertTrue( ((PeerGroupManager)groupManager).getCustomPeer() == customPeers,
- "If a custom Peer for GroupManager should be tested, a peerClassName element should be set in the configuration file for groupManager.");
- }
- if (groupManager instanceof PeerManagable) {
- assertNotNull(((PeerManagable)groupManager).getPeerManager());
- }
- if (permissionManager instanceof TorqueAbstractPermissionManager) {
- assertTrue( ((PeerPermissionManager)permissionManager).getCustomPeer() == customPeers,
- "If a custom Peer for PermissionManager should be tested, a peerClassName element should be set in the configuration file for permissionManager.");
+ public void testCustomPeerSet()
+ {
+ if ( roleManager instanceof TorqueAbstractRoleManager )
+ {
+ assertTrue( ( (PeerRoleManager) roleManager ).getCustomPeer() == customPeers,
+ "If a custom Peer for RoleManager should be tested, a peerClassName element should be set in the configuration file for roleManager." );
}
- if (permissionManager instanceof PeerManagable) {
- assertNotNull(((PeerManagable)permissionManager).getPeerManager());
+ if ( roleManager instanceof PeerManagable )
+ {
+ assertNotNull( ( (PeerManagable) roleManager ).getPeerManager() );
+ }
+ if ( userManager instanceof TorqueAbstractUserManager )
+ {
+ assertTrue( ( (PeerUserManager) userManager ).getCustomPeer() == customPeers,
+ "If a custom Peer for UserManager should be tested, a peerClassName element should be set in the configuration file for userManager." );
+ }
+ if ( userManager instanceof PeerManagable )
+ {
+ assertNotNull( ( (PeerManagable) userManager ).getPeerManager() );
+ }
+ if ( groupManager instanceof TorqueAbstractGroupManager )
+ {
+ assertTrue( ( (PeerGroupManager) groupManager ).getCustomPeer() == customPeers,
+ "If a custom Peer for GroupManager should be tested, a peerClassName element should be set in the configuration file for groupManager." );
+ }
+ if ( groupManager instanceof PeerManagable )
+ {
+ assertNotNull( ( (PeerManagable) groupManager ).getPeerManager() );
+ }
+ if ( permissionManager instanceof TorqueAbstractPermissionManager )
+ {
+ assertTrue( ( (PeerPermissionManager) permissionManager ).getCustomPeer() == customPeers,
+ "If a custom Peer for PermissionManager should be tested, a peerClassName element should be set in the configuration file for permissionManager." );
+ }
+ if ( permissionManager instanceof PeerManagable )
+ {
+ assertNotNull( ( (PeerManagable) permissionManager ).getPeerManager() );
}
}
- @Override
@AfterEach
- public void tearDown()
+ public void tearDown()
{
// cleanup tables
try
{
Criteria criteria = new Criteria();
- criteria.where(TorqueTurbineUserGroupRolePeer.USER_ID, -1, Criteria.GREATER_THAN);
- TorqueTurbineUserGroupRolePeer.doDelete(criteria);
+ criteria.where( TorqueTurbineUserGroupRolePeer.USER_ID, -1, Criteria.GREATER_THAN );
+ TorqueTurbineUserGroupRolePeer.doDelete( criteria );
criteria = new Criteria();
- criteria.where(TorqueTurbineRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbineRolePermissionPeer.doDelete(criteria);
+ criteria.where( TorqueTurbineRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN );
+ TorqueTurbineRolePermissionPeer.doDelete( criteria );
criteria = new Criteria();
- criteria.where(TorqueTurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbineUserPeer.doDelete(criteria);
+ criteria.where( TorqueTurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN );
+ TorqueTurbineUserPeer.doDelete( criteria );
criteria = new Criteria();
- criteria.where(TorqueTurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbineGroupPeer.doDelete(criteria);
+ criteria.where( TorqueTurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN );
+ TorqueTurbineGroupPeer.doDelete( criteria );
criteria = new Criteria();
- criteria.where(TorqueTurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbineRolePeer.doDelete(criteria);
+ criteria.where( TorqueTurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN );
+ TorqueTurbineRolePeer.doDelete( criteria );
criteria = new Criteria();
- criteria.where(TorqueTurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbinePermissionPeer.doDelete(criteria);
+ criteria.where( TorqueTurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN );
+ TorqueTurbinePermissionPeer.doDelete( criteria );
}
- catch (TorqueException e)
+ catch ( TorqueException e )
{
- fail(e.toString());
+ fail( e.toString() );
}
modelManager = null;
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java?rev=1851326&r1=1851325&r2=1851326&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java Tue Jan 15 08:32:39 2019
@@ -45,7 +45,6 @@ public class TorqueTurbineModelManagerTe
{
protected static HsqlDB hsqlDB = null;
- @Override
@BeforeEach
public void setUp() throws Exception
{
@@ -66,8 +65,7 @@ public class TorqueTurbineModelManagerTe
}
}
-
- @Override
+
@AfterEach
public void tearDown()
{
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerLazyTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerLazyTest.java?rev=1851326&r1=1851325&r2=1851326&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerLazyTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerLazyTest.java Tue Jan 15 08:32:39 2019
@@ -48,79 +48,80 @@ public class TurbineDefaultModelManagerL
{
protected static HsqlDB hsqlDB = null;
- @Override
- @BeforeEach
- public void setUp() throws Exception
+ @BeforeEach
+ public void setUp()
+ throws Exception
{
try
{
- hsqlDB = new HsqlDB("src/test/fulcrum-turbine-default-schema.sql");
+ hsqlDB = new HsqlDB( "src/test/fulcrum-turbine-default-schema.sql" );
// we do not need id-broker,set native in schema and added identity in hsql
// same for both flavors
- this.setRoleFileName("src/test/TurbineTorqueRoleConfig.xml");
- // we have to use declared peers
- this.setConfigurationFileName("src/test/TurbineDefaultLazyWithPeersComponentConfig.xml");
- securityService = (SecurityService) lookup(SecurityService.ROLE);
+ this.setRoleFileName( "src/test/TurbineTorqueRoleConfig.xml" );
+ // we have to use declared peers
+ this.setConfigurationFileName( "src/test/TurbineDefaultLazyWithPeersComponentConfig.xml" );
+ securityService = (SecurityService) lookup( SecurityService.ROLE );
super.setUp();
}
- catch (Exception e)
+ catch ( Exception e )
{
- fail(e.toString());
+ fail( e.toString() );
}
}
-
-
- @Override
@AfterEach
- public void tearDown()
+ public void tearDown()
{
// cleanup tables
- Connection con = null;
+ Connection con = null;
try
{
- con = Transaction.begin();// "default"
+ con = Transaction.begin();// "default"
+
+ Criteria criteria = new Criteria();
+ criteria.where( TurbineUserGroupRolePeer.USER_ID, -1, Criteria.GREATER_THAN );
- Criteria criteria = new Criteria();
- criteria.where(TurbineUserGroupRolePeer.USER_ID, -1, Criteria.GREATER_THAN);
-
- TurbineUserGroupRolePeer.doDelete(criteria,con);
+ TurbineUserGroupRolePeer.doDelete( criteria, con );
criteria = new Criteria();
- criteria.where(TurbineRolePermissionPeer.ROLE_ID, -1, Criteria.GREATER_THAN);
- TurbineRolePermissionPeer.doDelete(criteria,con);
+ criteria.where( TurbineRolePermissionPeer.ROLE_ID, -1, Criteria.GREATER_THAN );
+ TurbineRolePermissionPeer.doDelete( criteria, con );
criteria = new Criteria();
- criteria.where(TurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
- TurbineUserPeer.doDelete(criteria,con);
-
+ criteria.where( TurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN );
+ TurbineUserPeer.doDelete( criteria, con );
+
criteria = new Criteria();
- criteria.where(TurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
- TurbineGroupPeer.doDelete(criteria,con);
+ criteria.where( TurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN );
+ TurbineGroupPeer.doDelete( criteria, con );
criteria = new Criteria();
- criteria.where(TurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TurbineRolePeer.doDelete(criteria,con);
+ criteria.where( TurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN );
+ TurbineRolePeer.doDelete( criteria, con );
criteria = new Criteria();
- criteria.where(TurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
- TurbinePermissionPeer.doDelete(criteria,con);
-
+ criteria.where( TurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN );
+ TurbinePermissionPeer.doDelete( criteria, con );
+
con.commit();
con = null;
+
+ super.tearDown();
+ }
+ catch ( TorqueException e )
+ {
+ fail( e.toString() );
}
- catch (TorqueException e)
+ catch ( SQLException e )
{
- fail(e.toString());
- } catch (SQLException e) {
- if (con != null)
- {
- Transaction.safeRollback(con);
- }
- fail(e.toString());
- }
+ if ( con != null )
+ {
+ Transaction.safeRollback( con );
+ }
+ fail( e.toString() );
+ }
modelManager = null;
securityService = null;
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java?rev=1851326&r1=1851325&r2=1851326&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java Tue Jan 15 08:32:39 2019
@@ -49,78 +49,81 @@ public class TurbineDefaultModelManagerT
protected static HsqlDB hsqlDB = null;
@Override
- @BeforeEach
- public void setUp() throws Exception
+ @BeforeEach
+ public void setUp()
+ throws Exception
{
-
try
{
- hsqlDB = new HsqlDB("src/test/fulcrum-turbine-default-schema.sql");
+ hsqlDB = new HsqlDB( "src/test/fulcrum-turbine-default-schema.sql" );
// we do not need id-broker,set native in schema and added identity in hsql
// same for both flavors
- this.setRoleFileName("src/test/TurbineTorqueRoleConfig.xml");
- // we have to use declared peers
- this.setConfigurationFileName("src/test/TurbineDefaultWithPeersComponentConfig.xml");
- securityService = (SecurityService) lookup(SecurityService.ROLE);
+ this.setRoleFileName( "src/test/TurbineTorqueRoleConfig.xml" );
+ // we have to use declared peers
+ this.setConfigurationFileName( "src/test/TurbineDefaultWithPeersComponentConfig.xml" );
+ securityService = (SecurityService) lookup( SecurityService.ROLE );
super.setUp();
}
- catch (Exception e)
+ catch ( Exception e )
{
- fail(e.toString());
+ fail( e.toString() );
}
}
-
@Override
@AfterEach
- public void tearDown()
+ public void tearDown()
{
// cleanup tables
- Connection con = null;
+ Connection con = null;
try
{
- con = Transaction.begin();// "default"
+ con = Transaction.begin();// "default"
+
+ Criteria criteria = new Criteria();
+ criteria.where( TurbineUserGroupRolePeer.USER_ID, -1, Criteria.GREATER_THAN );
- Criteria criteria = new Criteria();
- criteria.where(TurbineUserGroupRolePeer.USER_ID, -1, Criteria.GREATER_THAN);
-
- TurbineUserGroupRolePeer.doDelete(criteria,con);
+ TurbineUserGroupRolePeer.doDelete( criteria, con );
criteria = new Criteria();
- criteria.where(TurbineRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TurbineRolePermissionPeer.doDelete(criteria,con);
+ criteria.where( TurbineRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN );
+ TurbineRolePermissionPeer.doDelete( criteria, con );
criteria = new Criteria();
- criteria.where(TurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
- TurbineUserPeer.doDelete(criteria,con);
-
+ criteria.where( TurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN );
+ TurbineUserPeer.doDelete( criteria, con );
+
criteria = new Criteria();
- criteria.where(TurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
- TurbineGroupPeer.doDelete(criteria,con);
+ criteria.where( TurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN );
+ TurbineGroupPeer.doDelete( criteria, con );
criteria = new Criteria();
- criteria.where(TurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TurbineRolePeer.doDelete(criteria,con);
+ criteria.where( TurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN );
+ TurbineRolePeer.doDelete( criteria, con );
criteria = new Criteria();
- criteria.where(TurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
- TurbinePermissionPeer.doDelete(criteria,con);
-
+ criteria.where( TurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN );
+ TurbinePermissionPeer.doDelete( criteria, con );
+
con.commit();
con = null;
+
+ super.tearDown();
}
- catch (TorqueException e)
+ catch ( TorqueException e )
{
e.printStackTrace();
- fail(e.getMessage());
- } catch (SQLException e) {
- if (con != null)
- {
- Transaction.safeRollback(con);
- }
- fail(e.toString());
- }
+ fail( e.getMessage() );
+ }
+ catch ( SQLException e )
+ {
+ if ( con != null )
+ {
+ Transaction.safeRollback( con );
+ }
+ fail( e.toString() );
+ }
modelManager = null;
securityService = null;
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java?rev=1851326&r1=1851325&r2=1851326&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java Tue Jan 15 08:32:39 2019
@@ -18,8 +18,6 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
-
-
import static org.junit.jupiter.api.Assertions.fail;
import java.sql.Connection;
@@ -41,15 +39,14 @@ import org.apache.torque.util.Transactio
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-
/**
* Test user with attached object (user-role-goup relationship)
*
* @author <a href="mailto:gk@apache.org">Georg Kallidis</a>
- *
* @version $Id$
*/
-public class TurbineUserManagerDefaultPeerLazyTest extends AbstractTurbineUserManagerTest
+public class TurbineUserManagerDefaultPeerLazyTest
+ extends AbstractTurbineUserManagerTest
{
protected static HsqlDB hsqlDB = null;
@@ -58,35 +55,33 @@ public class TurbineUserManagerDefaultPe
{
try
{
- hsqlDB = new HsqlDB("src/test/fulcrum-turbine-default-schema.sql");
-
- this.setRoleFileName("src/test/TurbineTorqueRoleConfig.xml");
- // we have to use declared peers
- this.setConfigurationFileName("src/test/TurbineDefaultLazyWithPeersComponentConfig.xml");
- securityService = (SecurityService) lookup(SecurityService.ROLE);
+ hsqlDB = new HsqlDB( "src/test/fulcrum-turbine-default-schema.sql" );
+
+ this.setRoleFileName( "src/test/TurbineTorqueRoleConfig.xml" );
+ // we have to use declared peers
+ this.setConfigurationFileName( "src/test/TurbineDefaultLazyWithPeersComponentConfig.xml" );
+ securityService = (SecurityService) lookup( SecurityService.ROLE );
userManager = securityService.getUserManager();
-
+
group = securityService.getGroupManager().getGroupInstance();
- group.setName("TEST_GROUP");
- securityService.getGroupManager().addGroup(group);
+ group.setName( "TEST_GROUP" );
+ securityService.getGroupManager().addGroup( group );
role = securityService.getRoleManager().getRoleInstance();
- role.setName("TEST_Role");
- securityService.getRoleManager().addRole(role);
-
+ role.setName( "TEST_Role" );
+ securityService.getRoleManager().addRole( role );
+
}
- catch (Exception e)
+ catch ( Exception e )
{
- fail(e.toString());
+ fail( e.toString() );
}
}
-
-
@Override
@AfterEach
- public void tearDown()
+ public void tearDown()
{
-
+
// cleanup tables
Connection con = null;
try
@@ -94,13 +89,14 @@ public class TurbineUserManagerDefaultPe
con = Transaction.begin();// "default"
Criteria criteria = new Criteria();
-// criteria.where(TurbineUserGroupRolePeer.USER_ID, -1, Criteria.GREATER_THAN);
-// int deletedRows = TurbineUserGroupRolePeer.doDelete(criteria,con);
-
- if (user != null) {
+ // criteria.where(TurbineUserGroupRolePeer.USER_ID, -1, Criteria.GREATER_THAN);
+ // int deletedRows = TurbineUserGroupRolePeer.doDelete(criteria,con);
+
+ if ( user != null )
+ {
try
{
- securityService.<TurbineModelManager>getModelManager().revokeAll( user );
+ securityService.<TurbineModelManager> getModelManager().revokeAll( user );
}
catch ( DataBackendException e )
{
@@ -109,48 +105,49 @@ public class TurbineUserManagerDefaultPe
}
catch ( UnknownEntityException e )
{
- // may be thrown, if user not exists if instance was not added to manager
+ // may be thrown, if user not exists if instance was not added to manager
}
}
criteria = new Criteria();
- criteria.where(TurbineRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TurbineRolePermissionPeer.doDelete(criteria,con);
+ criteria.where( TurbineRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN );
+ TurbineRolePermissionPeer.doDelete( criteria, con );
criteria = new Criteria();
- criteria.where(TurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
- TurbineUserPeer.doDelete(criteria,con);
-
+ criteria.where( TurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN );
+ TurbineUserPeer.doDelete( criteria, con );
+
criteria = new Criteria();
- criteria.where(TurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
- TurbineGroupPeer.doDelete(criteria,con);
+ criteria.where( TurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN );
+ TurbineGroupPeer.doDelete( criteria, con );
criteria = new Criteria();
- criteria.where(TurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TurbineRolePeer.doDelete(criteria,con);
+ criteria.where( TurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN );
+ TurbineRolePeer.doDelete( criteria, con );
criteria = new Criteria();
- criteria.where(TurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
- TurbinePermissionPeer.doDelete(criteria,con);
-
+ criteria.where( TurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN );
+ TurbinePermissionPeer.doDelete( criteria, con );
+
con.commit();
con = null;
}
- catch (TorqueException e)
+ catch ( TorqueException e )
{
- fail(e.toString());
- } catch (SQLException e) {
- if (con != null)
- {
- Transaction.safeRollback(con);
- }
- fail(e.toString());
+ fail( e.toString() );
}
-
+ catch ( SQLException e )
+ {
+ if ( con != null )
+ {
+ Transaction.safeRollback( con );
+ }
+ fail( e.toString() );
+ }
+
user = null;
userManager = null;
securityService = null;
}
-
}
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerTest.java?rev=1851326&r1=1851325&r2=1851326&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerTest.java Tue Jan 15 08:32:39 2019
@@ -18,8 +18,6 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
-
-
import static org.junit.jupiter.api.Assertions.fail;
import java.sql.Connection;
@@ -39,15 +37,14 @@ import org.apache.torque.util.Transactio
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-
/**
* Test user with attached object (user-role-goup relationship)
*
* @author <a href="mailto:gk@apache.org">Georg Kallidis</a>
- *
* @version $Id$
*/
-public class TurbineUserManagerTest extends AbstractTurbineUserManagerTest
+public class TurbineUserManagerTest
+ extends AbstractTurbineUserManagerTest
{
protected static HsqlDB hsqlDB = null;
@@ -56,36 +53,34 @@ public class TurbineUserManagerTest exte
{
try
{
- hsqlDB = new HsqlDB("src/test/fulcrum-turbine-schema.sql");
- hsqlDB.addSQL("src/test/id-table-schema.sql");
- hsqlDB.addSQL("src/test/fulcrum-turbine-schema-idtable-init.sql");
-
- this.setRoleFileName("src/test/TurbineTorqueRoleConfig.xml");
- // we have to use declared peers
- this.setConfigurationFileName("src/test/TurbineTorqueComponentConfig.xml");
- securityService = (SecurityService) lookup(SecurityService.ROLE);
+ hsqlDB = new HsqlDB( "src/test/fulcrum-turbine-schema.sql" );
+ hsqlDB.addSQL( "src/test/id-table-schema.sql" );
+ hsqlDB.addSQL( "src/test/fulcrum-turbine-schema-idtable-init.sql" );
+
+ this.setRoleFileName( "src/test/TurbineTorqueRoleConfig.xml" );
+ // we have to use declared peers
+ this.setConfigurationFileName( "src/test/TurbineTorqueComponentConfig.xml" );
+ securityService = (SecurityService) lookup( SecurityService.ROLE );
userManager = securityService.getUserManager();
-
+
group = securityService.getGroupManager().getGroupInstance();
- group.setName(TEST_GROUP);
- securityService.getGroupManager().addGroup(group);
+ group.setName( TEST_GROUP );
+ securityService.getGroupManager().addGroup( group );
role = securityService.getRoleManager().getRoleInstance();
- role.setName(TEST_ROLE);
- securityService.getRoleManager().addRole(role);
-
+ role.setName( TEST_ROLE );
+ securityService.getRoleManager().addRole( role );
+
}
- catch (Exception e)
+ catch ( Exception e )
{
- fail(e.toString());
+ fail( e.toString() );
}
- }
-
+ }
- @Override
@AfterEach
- public void tearDown()
+ public void tearDown()
{
-
+
// cleanup tables
Connection con = null;
try
@@ -93,48 +88,49 @@ public class TurbineUserManagerTest exte
con = Transaction.begin();// "default"
Criteria criteria = new Criteria();
- criteria.where(TorqueTurbineUserGroupRolePeer.USER_ID, -1, Criteria.GREATER_THAN);
-
- TorqueTurbineUserGroupRolePeer.doDelete(criteria,con);
+ criteria.where( TorqueTurbineUserGroupRolePeer.USER_ID, -1, Criteria.GREATER_THAN );
+
+ TorqueTurbineUserGroupRolePeer.doDelete( criteria, con );
criteria = new Criteria();
- criteria.where(TorqueTurbineRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbineRolePermissionPeer.doDelete(criteria,con);
+ criteria.where( TorqueTurbineRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN );
+ TorqueTurbineRolePermissionPeer.doDelete( criteria, con );
criteria = new Criteria();
- criteria.where(TorqueTurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbineUserPeer.doDelete(criteria,con);
-
+ criteria.where( TorqueTurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN );
+ TorqueTurbineUserPeer.doDelete( criteria, con );
+
criteria = new Criteria();
- criteria.where(TorqueTurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbineGroupPeer.doDelete(criteria,con);
+ criteria.where( TorqueTurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN );
+ TorqueTurbineGroupPeer.doDelete( criteria, con );
criteria = new Criteria();
- criteria.where(TorqueTurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbineRolePeer.doDelete(criteria,con);
+ criteria.where( TorqueTurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN );
+ TorqueTurbineRolePeer.doDelete( criteria, con );
criteria = new Criteria();
- criteria.where(TorqueTurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbinePermissionPeer.doDelete(criteria,con);
-
+ criteria.where( TorqueTurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN );
+ TorqueTurbinePermissionPeer.doDelete( criteria, con );
+
con.commit();
con = null;
}
- catch (TorqueException e)
+ catch ( TorqueException e )
{
- fail(e.toString());
- } catch (SQLException e) {
- if (con != null)
- {
- Transaction.safeRollback(con);
- }
- fail(e.toString());
+ fail( e.toString() );
}
-
+ catch ( SQLException e )
+ {
+ if ( con != null )
+ {
+ Transaction.safeRollback( con );
+ }
+ fail( e.toString() );
+ }
+
user = null;
userManager = null;
securityService = null;
}
-
}