This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit a10642bd6c84760bf046b7359a0eb59df04d493b Author: Juan Pablo Santos RodrÃguez <[email protected]> AuthorDate: Mon Jan 11 18:29:40 2021 +0100 make tests use HsqlDb servers started on random, free, ports to allow concurrent builds on executors on same Jenkins' node --- .../wiki/auth/authorize/JDBCGroupDatabaseTest.java | 49 +++++++---------- .../wiki/auth/user/JDBCUserDatabaseTest.java | 61 ++++++++++------------ 2 files changed, 48 insertions(+), 62 deletions(-) diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java index d807190..d8fe98f 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java @@ -17,22 +17,7 @@ under the License. */ package org.apache.wiki.auth.authorize; -import java.io.File; -import java.security.Principal; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Properties; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NameAlreadyBoundException; -import javax.sql.DataSource; - -import org.apache.wiki.HsqlDbUtils; -import org.apache.wiki.TestEngine; -import org.apache.wiki.TestJDBCDataSource; -import org.apache.wiki.TestJNDIContext; -import org.apache.wiki.WikiEngine; +import org.apache.wiki.*; import org.apache.wiki.api.exceptions.WikiException; import org.apache.wiki.auth.NoSuchPrincipalException; import org.apache.wiki.auth.WikiPrincipal; @@ -42,6 +27,16 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NameAlreadyBoundException; +import javax.sql.DataSource; +import java.io.File; +import java.security.Principal; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Properties; + /** */ public class JDBCGroupDatabaseTest @@ -77,7 +72,7 @@ public class JDBCGroupDatabaseTest // ignore } final Context ctx = (Context) initCtx.lookup( "java:comp/env" ); - final DataSource ds = new TestJDBCDataSource( new File( "target/test-classes/jspwiki-custom.properties" ) ); + final DataSource ds = new TestJDBCDataSource( new File( "target/test-classes/jspwiki-custom.properties" ), m_hu.getDriverUrl() ); ctx.bind( JDBCGroupDatabase.DEFAULT_GROUPDB_DATASOURCE, ds ); // Get the JDBC connection and init tables @@ -114,7 +109,7 @@ public class JDBCGroupDatabaseTest final int oldUserCount = m_db.groups().length; // Create a new group with random name - final String name = "TestGroup" + String.valueOf( System.currentTimeMillis() ); + final String name = "TestGroup" + System.currentTimeMillis(); Group group = new Group( name, m_wiki ); final Principal al = new WikiPrincipal( "Al" ); final Principal bob = new WikiPrincipal( "Bob" ); @@ -165,9 +160,9 @@ public class JDBCGroupDatabaseTest // Group Archaeology doesn't exist try { - group = backendGroup( "Archaeology" ); + backendGroup( "Archaeology" ); // We should never get here - Assertions.assertTrue(false); + Assertions.fail(); } catch (final NoSuchPrincipalException e) { @@ -179,7 +174,7 @@ public class JDBCGroupDatabaseTest public void testSave() throws Exception { // Create a new group with random name - final String name = "TestGroup" + String.valueOf( System.currentTimeMillis() ); + final String name = "TestGroup" + System.currentTimeMillis(); Group group = new Group( name, m_wiki ); final Principal al = new WikiPrincipal( "Al" ); final Principal bob = new WikiPrincipal( "Bob" ); @@ -214,7 +209,7 @@ public class JDBCGroupDatabaseTest public void testResave() throws Exception { // Create a new group with random name & 3 members - final String name = "TestGroup" + String.valueOf( System.currentTimeMillis() ); + final String name = "TestGroup" + System.currentTimeMillis(); Group group = new Group( name, m_wiki ); final Principal al = new WikiPrincipal( "Al" ); final Principal bob = new WikiPrincipal( "Bob" ); @@ -259,14 +254,10 @@ public class JDBCGroupDatabaseTest m_db.delete( group ); } - private Group backendGroup(final String name ) throws WikiSecurityException - { + private Group backendGroup( final String name ) throws WikiSecurityException { final Group[] groups = m_db.groups(); - for ( int i = 0; i < groups.length; i++ ) - { - final Group group = groups[i]; - if ( group.getName().equals( name ) ) - { + for( final Group group : groups ) { + if( group.getName().equals( name ) ) { return group; } } diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java index c45ea19..68f47a4 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java @@ -17,21 +17,6 @@ under the License. */ package org.apache.wiki.auth.user; -import java.io.File; -import java.io.Serializable; -import java.security.Principal; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import java.sql.Timestamp; -import java.util.Map; -import java.util.Properties; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NameAlreadyBoundException; -import javax.sql.DataSource; - import org.apache.wiki.HsqlDbUtils; import org.apache.wiki.TestJDBCDataSource; import org.apache.wiki.TestJNDIContext; @@ -43,6 +28,20 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NameAlreadyBoundException; +import javax.sql.DataSource; +import java.io.File; +import java.io.Serializable; +import java.security.Principal; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Timestamp; +import java.util.Map; +import java.util.Properties; + /** */ public class JDBCUserDatabaseTest @@ -97,7 +96,7 @@ public class JDBCUserDatabaseTest // ignore } final Context ctx = (Context) initCtx.lookup( "java:comp/env" ); - final DataSource ds = new TestJDBCDataSource( new File( "target/test-classes/jspwiki-custom.properties" ) ); + final DataSource ds = new TestJDBCDataSource( new File( "target/test-classes/jspwiki-custom.properties" ), m_hu.getDriverUrl() ); ctx.bind( JDBCUserDatabase.DEFAULT_DB_JNDI_NAME, ds ); // Get the JDBC connection and init tables @@ -143,7 +142,7 @@ public class JDBCUserDatabaseTest final int oldUserCount = m_db.getWikiNames().length; // Create a new user with random name - final String loginName = "TestUser" + String.valueOf( System.currentTimeMillis() ); + final String loginName = "TestUser" + System.currentTimeMillis(); UserProfile profile = m_db.newProfile(); profile.setEmail("[email protected]"); profile.setLoginName( loginName ); @@ -212,13 +211,13 @@ public class JDBCUserDatabaseTest } catch( final NoSuchPrincipalException e ) { - Assertions.assertTrue( false ); + Assertions.fail(); } try { m_db.findByEmail( "[email protected]" ); // We should never get here - Assertions.assertTrue( false ); + Assertions.fail(); } catch( final NoSuchPrincipalException e ) { @@ -243,13 +242,13 @@ public class JDBCUserDatabaseTest } catch( final NoSuchPrincipalException e ) { - Assertions.assertTrue( false ); + Assertions.fail(); } try { m_db.findByEmail( "[email protected]" ); // We should never get here - Assertions.assertTrue( false ); + Assertions.fail(); } catch( final NoSuchPrincipalException e ) { @@ -274,13 +273,13 @@ public class JDBCUserDatabaseTest } catch( final NoSuchPrincipalException e ) { - Assertions.assertTrue( false ); + Assertions.fail(); } try { m_db.findByEmail( "[email protected]" ); // We should never get here - Assertions.assertTrue( false ); + Assertions.fail(); } catch( final NoSuchPrincipalException e ) { @@ -305,13 +304,13 @@ public class JDBCUserDatabaseTest } catch( final NoSuchPrincipalException e ) { - Assertions.assertTrue( false ); + Assertions.fail(); } try { m_db.findByEmail( "foo" ); // We should never get here - Assertions.assertTrue( false ); + Assertions.fail(); } catch( final NoSuchPrincipalException e ) { @@ -336,13 +335,13 @@ public class JDBCUserDatabaseTest } catch( final NoSuchPrincipalException e ) { - Assertions.assertTrue( false ); + Assertions.fail(); } try { m_db.findByEmail( "FooBar" ); // We should never get here - Assertions.assertTrue( false ); + Assertions.fail(); } catch( final NoSuchPrincipalException e ) { @@ -398,7 +397,7 @@ public class JDBCUserDatabaseTest // The old user shouldn't be found try { - profile = m_db.findByLoginName( "olduser" ); + m_db.findByLoginName( "olduser" ); Assertions.fail( "Old user was found, but it shouldn't have been." ); } catch ( final NoSuchPrincipalException e ) @@ -461,13 +460,9 @@ public class JDBCUserDatabaseTest Assertions.assertNotNull( m_db.findByUid( uid ) ); } - catch( final NoSuchPrincipalException e ) - { - Assertions.assertTrue( false ); - } catch( final WikiSecurityException e ) { - Assertions.assertTrue( false ); + Assertions.fail(); } }
