You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/04/01 20:26:27 UTC
[20/30] qpid-broker-j git commit: QPID-8151: [Broker-J] [Unit tests]
Factor out QpidTestCase
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
index 4bef243..767020c 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
@@ -20,28 +20,33 @@
*/
package org.apache.qpid.server.security.auth.database;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
-import org.apache.qpid.server.security.auth.UsernamePrincipal;
-import org.apache.qpid.server.security.auth.manager.AbstractScramAuthenticationManager;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-import javax.security.auth.login.AccountNotFoundException;
import java.io.BufferedReader;
-import java.io.BufferedWriter;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
-import java.io.FileWriter;
import java.io.IOException;
import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
+import javax.security.auth.login.AccountNotFoundException;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
+import org.apache.qpid.server.security.auth.UsernamePrincipal;
+import org.apache.qpid.server.security.auth.manager.AbstractScramAuthenticationManager;
public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFilePrincipalDatabaseTest
{
@@ -50,10 +55,9 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
private PlainPasswordFilePrincipalDatabase _database;
private List<File> _testPwdFiles = new ArrayList<File>();
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
final PasswordCredentialManagingAuthenticationProvider
mockAuthenticationProvider = mock(PasswordCredentialManagingAuthenticationProvider.class);
when(mockAuthenticationProvider.getContextValue(Integer.class, AbstractScramAuthenticationManager.QPID_AUTHMANAGER_SCRAM_ITERATION_COUNT)).thenReturn(4096);
@@ -69,6 +73,7 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
// ******* Test Methods ********** //
+ @Test
public void testCreatePrincipal()
{
File testFile = createPasswordFile(1, 0);
@@ -89,15 +94,19 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
assertTrue("New user not created.", _database.createPrincipal(principal, CREATED_PASSWORD.toCharArray()));
+
loadPasswordFile(testFile);
assertNotNull("Created User was not saved", _database.getUser(CREATED_USERNAME));
- assertFalse("Duplicate user created.", _database.createPrincipal(principal, CREATED_PASSWORD.toCharArray()));
+ assertFalse("Duplicate user created.",
+ _database.createPrincipal(principal, CREATED_PASSWORD.toCharArray()));
+
testFile.delete();
}
+ @Test
public void testCreatePrincipalIsSavedToFile()
{
@@ -130,13 +139,12 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
String[] result = Pattern.compile(":").split(userLine);
- assertEquals("User line not complete '" + userLine + "'", 2, result.length);
+ assertEquals("User line not complete '" + userLine + "'", (long) 2, (long) result.length);
assertEquals("Username not correct,", TEST_USERNAME, result[0]);
assertEquals("Password not correct,", TEST_PASSWORD, result[1]);
assertFalse("File has more content", reader.ready());
-
}
catch (IOException e)
{
@@ -145,6 +153,7 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
testFile.delete();
}
+ @Test
public void testDeletePrincipal()
{
File testFile = createPasswordFile(1, 1);
@@ -190,6 +199,7 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
testFile.delete();
}
+ @Test
public void testGetUsers()
{
int USER_COUNT = 10;
@@ -204,7 +214,7 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
assertNotNull("Users list is null.", users);
- assertEquals(USER_COUNT, users.size());
+ assertEquals((long) USER_COUNT, (long) users.size());
boolean[] verify = new boolean[USER_COUNT];
for (int i = 0; i < USER_COUNT; i++)
@@ -229,6 +239,7 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
testFile.delete();
}
+ @Test
public void testUpdatePasswordIsSavedToFile()
{
@@ -264,13 +275,12 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
String[] result = Pattern.compile(":").split(userLine);
- assertEquals("User line not complete '" + userLine + "'", 2, result.length);
+ assertEquals("User line not complete '" + userLine + "'", (long) 2, (long) result.length);
assertEquals("Username not correct,", TEST_USERNAME + "0", result[0]);
assertEquals("New Password not correct,", NEW_PASSWORD, result[1]);
assertFalse("File has more content", reader.ready());
-
}
catch (IOException e)
{
@@ -279,6 +289,7 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
testFile.delete();
}
+ @Test
public void testSetPasswordFileWithMissingFile()
{
try
@@ -296,6 +307,7 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
}
+ @Test
public void testSetPasswordFileWithReadOnlyFile()
{
@@ -319,6 +331,7 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
testFile.delete();
}
+ @Test
public void testCreateUserPrincipal() throws IOException
{
Principal newPrincipal = createUserPrincipal();
@@ -335,13 +348,14 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
return _database.getUser(TEST_USERNAME);
}
+ @Test
public void testVerifyPassword() throws IOException, AccountNotFoundException
{
createUserPrincipal();
assertFalse(_database.verifyPassword(TEST_USERNAME, new char[]{}));
assertFalse(_database.verifyPassword(TEST_USERNAME, "massword".toCharArray()));
assertTrue(_database.verifyPassword(TEST_USERNAME, TEST_PASSWORD_CHARS));
-
+
try
{
_database.verifyPassword("made.up.username", TEST_PASSWORD_CHARS);
@@ -353,7 +367,8 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
}
}
- public void testUpdatePassword() throws IOException, AccountNotFoundException
+ @Test
+ public void testUpdatePassword() throws IOException, AccountNotFoundException
{
createUserPrincipal();
char[] newPwd = "newpassword".toCharArray();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
index f9fc4af..9be22a5 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
@@ -20,17 +20,24 @@
*/
package org.apache.qpid.server.security.auth.database;
-import org.apache.qpid.test.utils.QpidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+
/*
Note PlainUser is mainly tested by PlainPFPDTest, this is just to catch the extra methods
*/
-public class PlainUserTest extends QpidTestCase
+public class PlainUserTest extends UnitTestBase
{
private String USERNAME = "username";
private String PASSWORD = "password";
+ @Test
public void testTooLongArrayConstructor()
{
try
@@ -44,6 +51,7 @@ public class PlainUserTest extends QpidTestCase
}
}
+ @Test
public void testStringArrayConstructor()
{
PlainUser user = new PlainUser(new String[]{USERNAME, PASSWORD}, null);
@@ -56,7 +64,7 @@ public class PlainUserTest extends QpidTestCase
{
for (byte c : user.getEncodedPassword())
{
- assertEquals("Password incorrect", password[index], (char) c);
+ assertEquals("Password incorrect", (long) password[index], (long) (char) c);
index++;
}
}
@@ -70,7 +78,7 @@ public class PlainUserTest extends QpidTestCase
index=0;
for (char c : user.getPassword())
{
- assertEquals("Password incorrect", password[index], c);
+ assertEquals("Password incorrect", (long) password[index], (long) c);
index++;
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerTest.java
index 660ff5d..32be211 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerTest.java
@@ -21,27 +21,32 @@
package org.apache.qpid.server.security.auth.manager;
import static org.apache.qpid.server.security.auth.AuthenticatedPrincipalTestHelper.assertOnlyContainsWrapped;
-import static org.mockito.Mockito.mock;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.model.BrokerTestHelper;
+import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.sasl.SaslNegotiator;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AnonymousAuthenticationManagerTest extends QpidTestCase
+public class AnonymousAuthenticationManagerTest extends UnitTestBase
{
private AnonymousAuthenticationManager _manager;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
Map<String,Object> attrs = new HashMap<String, Object>();
attrs.put(AuthenticationProvider.ID, UUID.randomUUID());
attrs.put(AuthenticationProvider.NAME, getTestName());
@@ -49,21 +54,22 @@ public class AnonymousAuthenticationManagerTest extends QpidTestCase
}
- @Override
+ @After
public void tearDown() throws Exception
{
if(_manager != null)
{
_manager = null;
}
- super.tearDown();
}
+ @Test
public void testGetMechanisms() throws Exception
{
assertEquals(Collections.singletonList("ANONYMOUS"), _manager.getMechanisms());
}
+ @Test
public void testCreateSaslNegotiator() throws Exception
{
SaslNegotiator negotiator = _manager.createSaslNegotiator("ANONYMOUS", null, null);
@@ -73,14 +79,16 @@ public class AnonymousAuthenticationManagerTest extends QpidTestCase
assertNull("Should not be able to create SASL negotiator for mechanism 'PLAIN'", negotiator);
}
+ @Test
public void testAuthenticate() throws Exception
{
SaslNegotiator negotiator = _manager.createSaslNegotiator("ANONYMOUS", null, null);
AuthenticationResult result = negotiator.handleResponse(new byte[0]);
assertNotNull(result);
assertEquals("Expected authentication to be successful",
- AuthenticationResult.AuthenticationStatus.SUCCESS,
- result.getStatus());
+ AuthenticationResult.AuthenticationStatus.SUCCESS,
+ result.getStatus());
+
assertOnlyContainsWrapped(_manager.getAnonymousPrincipal(), result.getPrincipals());
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacherTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacherTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacherTest.java
index 8844fe1..27921a8 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacherTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacherTest.java
@@ -19,6 +19,7 @@
package org.apache.qpid.server.security.auth.manager;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -29,14 +30,17 @@ import java.util.concurrent.Callable;
import javax.security.auth.Subject;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.connection.ConnectionPrincipal;
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.transport.AMQPConnection;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AuthenticationResultCacherTest extends QpidTestCase
+public class AuthenticationResultCacherTest extends UnitTestBase
{
private AuthenticationResultCacher _authenticationResultCacher;
private final AuthenticationResult _successfulAuthenticationResult =
@@ -46,10 +50,9 @@ public class AuthenticationResultCacherTest extends QpidTestCase
private AMQPConnection _connection;
private Callable<AuthenticationResult> _loader;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_connection = mock(AMQPConnection.class);
when(_connection.getRemoteSocketAddress()).thenReturn(new InetSocketAddress("example.com", 9999));
_subject = new Subject(true,
@@ -70,6 +73,7 @@ public class AuthenticationResultCacherTest extends QpidTestCase
};
}
+ @Test
public void testCacheHit() throws Exception
{
Subject.doAs(_subject, new PrivilegedAction<Void>()
@@ -80,15 +84,16 @@ public class AuthenticationResultCacherTest extends QpidTestCase
AuthenticationResult result;
result = _authenticationResultCacher.getOrLoad(new String[]{"credentials"}, _loader);
assertEquals("Unexpected AuthenticationResult", _successfulAuthenticationResult, result);
- assertEquals("Unexpected number of loads before cache hit", 1, _loadCallCount);
+ assertEquals("Unexpected number of loads before cache hit", (long) 1, (long) _loadCallCount);
result = _authenticationResultCacher.getOrLoad(new String[]{"credentials"}, _loader);
assertEquals("Unexpected AuthenticationResult", _successfulAuthenticationResult, result);
- assertEquals("Unexpected number of loads after cache hit", 1, _loadCallCount);
+ assertEquals("Unexpected number of loads after cache hit", (long) 1, (long) _loadCallCount);
return null;
}
});
}
+ @Test
public void testCacheMissDifferentCredentials() throws Exception
{
Subject.doAs(_subject, new PrivilegedAction<Void>()
@@ -99,16 +104,17 @@ public class AuthenticationResultCacherTest extends QpidTestCase
AuthenticationResult result;
result = _authenticationResultCacher.getOrLoad(new String[]{"credentials"}, _loader);
assertEquals("Unexpected AuthenticationResult", _successfulAuthenticationResult, result);
- assertEquals("Unexpected number of loads before cache hit", 1, _loadCallCount);
+ assertEquals("Unexpected number of loads before cache hit", (long) 1, (long) _loadCallCount);
result = _authenticationResultCacher.getOrLoad(new String[]{"other credentials"}, _loader);
assertEquals("Unexpected AuthenticationResult", _successfulAuthenticationResult, result);
- assertEquals("Unexpected number of loads before cache hit", 2, _loadCallCount);
+ assertEquals("Unexpected number of loads before cache hit", (long) 2, (long) _loadCallCount);
return null;
}
});
}
+ @Test
public void testCacheMissDifferentAddress() throws Exception
{
Subject.doAs(_subject, new PrivilegedAction<Void>()
@@ -119,7 +125,7 @@ public class AuthenticationResultCacherTest extends QpidTestCase
AuthenticationResult result;
result = _authenticationResultCacher.getOrLoad(new String[]{"credentials"}, _loader);
assertEquals("Unexpected AuthenticationResult", _successfulAuthenticationResult, result);
- assertEquals("Unexpected number of loads before cache hit", 1, _loadCallCount);
+ assertEquals("Unexpected number of loads before cache hit", (long) 1, (long) _loadCallCount);
return null;
}
});
@@ -133,7 +139,7 @@ public class AuthenticationResultCacherTest extends QpidTestCase
AuthenticationResult result;
result = _authenticationResultCacher.getOrLoad(new String[]{"credentials"}, _loader);
assertEquals("Unexpected AuthenticationResult", _successfulAuthenticationResult, result);
- assertEquals("Unexpected number of loads before cache hit", 2, _loadCallCount);
+ assertEquals("Unexpected number of loads before cache hit", (long) 2, (long) _loadCallCount);
return null;
}
});
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java
index 3cd4090..a16cb70 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java
@@ -19,6 +19,9 @@
package org.apache.qpid.server.security.auth.manager;
import static org.apache.qpid.server.security.auth.AuthenticatedPrincipalTestHelper.assertOnlyContainsWrapped;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -29,24 +32,26 @@ import java.util.UUID;
import javax.security.auth.x500.X500Principal;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.model.AuthenticationProvider;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
-import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.security.auth.sasl.SaslNegotiator;
import org.apache.qpid.server.security.auth.sasl.SaslSettings;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class ExternalAuthenticationManagerTest extends QpidTestCase
+public class ExternalAuthenticationManagerTest extends UnitTestBase
{
private ExternalAuthenticationManager _manager;
private ExternalAuthenticationManager _managerUsingFullDN;
private SaslSettings _saslSettings;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
Map<String,Object> attrs = new HashMap<>();
attrs.put(AuthenticationProvider.ID, UUID.randomUUID());
attrs.put(AuthenticationProvider.NAME, getTestName());
@@ -65,16 +70,19 @@ public class ExternalAuthenticationManagerTest extends QpidTestCase
when(_saslSettings.getLocalFQDN()).thenReturn("example.example.com");
}
+ @Test
public void testGetMechanisms() throws Exception
{
assertEquals(Collections.singletonList("EXTERNAL"), _manager.getMechanisms());
}
+ @Test
public void testCreateSaslNegotiator() throws Exception
{
createSaslNegotiatorTestImpl(_manager);
}
+ @Test
public void testAuthenticatePrincipalNull_CausesAuthError() throws Exception
{
SaslNegotiator negotiator = _manager.createSaslNegotiator("EXTERNAL", _saslSettings, null);
@@ -82,11 +90,13 @@ public class ExternalAuthenticationManagerTest extends QpidTestCase
assertNotNull(result);
assertEquals("Expected authentication to be unsuccessful",
- AuthenticationResult.AuthenticationStatus.ERROR,
- result.getStatus());
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ result.getStatus());
+
assertNull(result.getMainPrincipal());
}
+ @Test
public void testAuthenticatePrincipalNoCn_CausesAuthError() throws Exception
{
X500Principal principal = new X500Principal("DC=example, DC=com, O=My Company Ltd, L=Newbury, ST=Berkshire, C=GB");
@@ -96,11 +106,12 @@ public class ExternalAuthenticationManagerTest extends QpidTestCase
assertNotNull(result);
assertEquals("Expected authentication to be unsuccessful",
- AuthenticationResult.AuthenticationStatus.ERROR,
- result.getStatus());
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ result.getStatus());
assertNull(result.getMainPrincipal());
}
+ @Test
public void testAuthenticatePrincipalEmptyCn_CausesAuthError() throws Exception
{
X500Principal principal = new X500Principal("CN=, DC=example, DC=com, O=My Company Ltd, L=Newbury, ST=Berkshire, C=GB");
@@ -110,11 +121,12 @@ public class ExternalAuthenticationManagerTest extends QpidTestCase
assertNotNull(result);
assertEquals("Expected authentication to be unsuccessful",
- AuthenticationResult.AuthenticationStatus.ERROR,
- result.getStatus());
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ result.getStatus());
assertNull(result.getMainPrincipal());
}
+ @Test
public void testAuthenticatePrincipalCnOnly() throws Exception
{
X500Principal principal = new X500Principal("CN=person");
@@ -125,12 +137,13 @@ public class ExternalAuthenticationManagerTest extends QpidTestCase
assertNotNull(result);
assertEquals("Expected authentication to be successful",
- AuthenticationResult.AuthenticationStatus.SUCCESS,
- result.getStatus());
+ AuthenticationResult.AuthenticationStatus.SUCCESS,
+ result.getStatus());
assertOnlyContainsWrapped(expectedPrincipal, result.getPrincipals());
assertEquals("person", result.getMainPrincipal().getName());
}
+ @Test
public void testAuthenticatePrincipalCnAndDc() throws Exception
{
X500Principal principal = new X500Principal("CN=person, DC=example, DC=com");
@@ -141,12 +154,13 @@ public class ExternalAuthenticationManagerTest extends QpidTestCase
assertNotNull(result);
assertEquals("Expected authentication to be successful",
- AuthenticationResult.AuthenticationStatus.SUCCESS,
- result.getStatus());
+ AuthenticationResult.AuthenticationStatus.SUCCESS,
+ result.getStatus());
assertOnlyContainsWrapped(expectedPrincipal, result.getPrincipals());
assertEquals("person@example.com", result.getMainPrincipal().getName());
}
+ @Test
public void testAuthenticatePrincipalCnDc_OtherComponentsIgnored() throws Exception
{
X500Principal principal = new X500Principal("CN=person, DC=example, DC=com, O=My Company Ltd, L=Newbury, ST=Berkshire, C=GB");
@@ -157,12 +171,13 @@ public class ExternalAuthenticationManagerTest extends QpidTestCase
assertNotNull(result);
assertEquals("Expected authentication to be successful",
- AuthenticationResult.AuthenticationStatus.SUCCESS,
- result.getStatus());
+ AuthenticationResult.AuthenticationStatus.SUCCESS,
+ result.getStatus());
assertOnlyContainsWrapped(expectedPrincipal, result.getPrincipals());
assertEquals("person@example.com", result.getMainPrincipal().getName());
}
+ @Test
public void testAuthenticatePrincipalCn_OtherComponentsIgnored() throws Exception
{
X500Principal principal = new X500Principal("CN=person, O=My Company Ltd, L=Newbury, ST=Berkshire, C=GB");
@@ -173,17 +188,19 @@ public class ExternalAuthenticationManagerTest extends QpidTestCase
AuthenticationResult result = negotiator.handleResponse(new byte[0]);
assertNotNull(result);
assertEquals("Expected authentication to be successful",
- AuthenticationResult.AuthenticationStatus.SUCCESS,
- result.getStatus());
+ AuthenticationResult.AuthenticationStatus.SUCCESS,
+ result.getStatus());
assertOnlyContainsWrapped(expectedPrincipal, result.getPrincipals());
assertEquals("person", result.getMainPrincipal().getName());
}
+ @Test
public void testFullDNMode_CreateSaslNegotiator() throws Exception
{
createSaslNegotiatorTestImpl(_managerUsingFullDN);
}
+ @Test
public void testFullDNMode_Authenticate() throws Exception
{
X500Principal principal = new X500Principal("CN=person, DC=example, DC=com");
@@ -193,8 +210,8 @@ public class ExternalAuthenticationManagerTest extends QpidTestCase
assertNotNull(result);
assertEquals("Expected authentication to be successful",
- AuthenticationResult.AuthenticationStatus.SUCCESS,
- result.getStatus());
+ AuthenticationResult.AuthenticationStatus.SUCCESS,
+ result.getStatus());
assertOnlyContainsWrapped(principal, result.getPrincipals());
assertEquals("CN=person,DC=example,DC=com", result.getMainPrincipal().getName());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ManagedAuthenticationManagerTestBase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ManagedAuthenticationManagerTestBase.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ManagedAuthenticationManagerTestBase.java
index fe1facc..2d00a74 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ManagedAuthenticationManagerTestBase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ManagedAuthenticationManagerTestBase.java
@@ -20,6 +20,12 @@
*/
package org.apache.qpid.server.security.auth.manager;
+import static junit.framework.TestCase.assertNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -31,6 +37,10 @@ import java.util.concurrent.ExecutionException;
import javax.security.auth.login.AccountNotFoundException;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.model.AuthenticationProvider;
@@ -40,9 +50,9 @@ import org.apache.qpid.server.model.User;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.sasl.SaslNegotiator;
import org.apache.qpid.server.security.auth.sasl.SaslSettings;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-abstract class ManagedAuthenticationManagerTestBase extends QpidTestCase
+abstract class ManagedAuthenticationManagerTestBase extends UnitTestBase
{
private static final String TEST_USER_NAME = "admin";
private static final String TEST_USER_PASSWORD = "admin";
@@ -52,10 +62,9 @@ abstract class ManagedAuthenticationManagerTestBase extends QpidTestCase
private Broker _broker;
private TaskExecutor _executor;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_executor = new CurrentThreadTaskExecutor();
_executor.start();
_broker = BrokerTestHelper.createBrokerMock();
@@ -69,11 +78,10 @@ abstract class ManagedAuthenticationManagerTestBase extends QpidTestCase
}
- @Override
+ @After
public void tearDown() throws Exception
{
_executor.stop();
- super.tearDown();
}
protected abstract ConfigModelPasswordManagingAuthenticationProvider createAuthManager(final Map<String, Object> attributesMap);
@@ -89,12 +97,14 @@ abstract class ManagedAuthenticationManagerTestBase extends QpidTestCase
}
+ @Test
public void testMechanisms()
{
assertFalse("PLAIN authentication should not be available on an insecure connection", _authManager.getAvailableMechanisms(false).contains("PLAIN"));
assertTrue("PLAIN authentication should be available on a secure connection", _authManager.getAvailableMechanisms(true).contains("PLAIN"));
}
+ @Test
public void testAddChildAndThenDelete() throws ExecutionException, InterruptedException
{
// No children should be present before the test starts
@@ -134,6 +144,7 @@ abstract class ManagedAuthenticationManagerTestBase extends QpidTestCase
}
+ @Test
public void testCreateUser() throws ExecutionException, InterruptedException
{
assertEquals("No users should be present before the test starts", 0, _authManager.getChildren(User.class).size());
@@ -181,6 +192,7 @@ abstract class ManagedAuthenticationManagerTestBase extends QpidTestCase
protected abstract boolean isPlain();
+ @Test
public void testUpdateUser()
{
assertTrue(_authManager.createUser(getTestName(), "password", Collections.<String, String>emptyMap()));
@@ -219,16 +231,15 @@ abstract class ManagedAuthenticationManagerTestBase extends QpidTestCase
authResult = _authManager.authenticate(getTestName(), "newerpassword");
assertEquals("User should authenticate with updated password", AuthenticationResult.AuthenticationStatus.SUCCESS, authResult.getStatus());
-
-
-
}
+ @Test
public void testGetMechanisms() throws Exception
{
assertFalse("Should support at least one mechanism", _authManager.getMechanisms().isEmpty());
}
+ @Test
public void testAuthenticateValidCredentials() throws Exception
{
_authManager.createUser(TEST_USER_NAME, TEST_USER_PASSWORD, Collections.<String, String>emptyMap());
@@ -237,6 +248,7 @@ abstract class ManagedAuthenticationManagerTestBase extends QpidTestCase
assertEquals("Unexpected result principal", TEST_USER_NAME, result.getMainPrincipal().getName());
}
+ @Test
public void testAuthenticateInvalidCredentials() throws Exception
{
_authManager.createUser(TEST_USER_NAME, TEST_USER_PASSWORD, Collections.<String, String>emptyMap());
@@ -245,6 +257,7 @@ abstract class ManagedAuthenticationManagerTestBase extends QpidTestCase
assertNull("Unexpected result principal", result.getMainPrincipal());
}
+ @Test
public void testAllSaslMechanisms() throws Exception
{
final SaslSettings saslSettings = mock(SaslSettings.class);
@@ -256,6 +269,7 @@ abstract class ManagedAuthenticationManagerTestBase extends QpidTestCase
}
}
+ @Test
public void testUnsupportedSaslMechanisms() throws Exception
{
final SaslSettings saslSettings = mock(SaslSettings.class);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainAuthenticationManagerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainAuthenticationManagerTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainAuthenticationManagerTest.java
index f7f6022..444a891 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainAuthenticationManagerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainAuthenticationManagerTest.java
@@ -25,12 +25,6 @@ import java.util.Map;
public class PlainAuthenticationManagerTest extends ManagedAuthenticationManagerTestBase
{
@Override
- public void setUp() throws Exception
- {
- super.setUp();
- }
-
- @Override
protected ConfigModelPasswordManagingAuthenticationProvider<?> createAuthManager(final Map<String, Object> attributesMap)
{
return new PlainAuthenticationProvider(attributesMap, getBroker());
@@ -41,11 +35,4 @@ public class PlainAuthenticationManagerTest extends ManagedAuthenticationManager
{
return true;
}
-
- @Override
- public void tearDown() throws Exception
- {
- super.tearDown();
- }
-
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainPasswordDatabaseAuthenticationManagerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainPasswordDatabaseAuthenticationManagerTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainPasswordDatabaseAuthenticationManagerTest.java
index c883736..ae73fff 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainPasswordDatabaseAuthenticationManagerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainPasswordDatabaseAuthenticationManagerTest.java
@@ -31,6 +31,10 @@ import java.io.File;
import java.util.HashMap;
import java.util.Map;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerTestHelper;
@@ -38,25 +42,24 @@ import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
import org.apache.qpid.server.model.User;
import org.apache.qpid.server.security.auth.AuthenticationResult;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class PlainPasswordDatabaseAuthenticationManagerTest extends QpidTestCase
+public class PlainPasswordDatabaseAuthenticationManagerTest extends UnitTestBase
{
private Broker<?> _broker;
private File _passwordFile;
private ConfiguredObjectFactory _objectFactory;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_broker = BrokerTestHelper.createBrokerMock();
_objectFactory = _broker.getObjectFactory();
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -68,10 +71,10 @@ public class PlainPasswordDatabaseAuthenticationManagerTest extends QpidTestCase
}
finally
{
- super.tearDown();
}
}
+ @Test
public void testExistingPasswordFile()
{
_passwordFile = TestFileUtils.createTempFile(this, ".user.password", "user:password");
@@ -89,6 +92,7 @@ public class PlainPasswordDatabaseAuthenticationManagerTest extends QpidTestCase
assertThat(user.getName(), is(equalTo("user")));
}
+ @Test
public void testAddUser()
{
_passwordFile = TestFileUtils.createTempFile(this, ".user.password");
@@ -111,6 +115,7 @@ public class PlainPasswordDatabaseAuthenticationManagerTest extends QpidTestCase
assertThat(user.getName(), is(equalTo("user")));
}
+ @Test
public void testRemoveUser()
{
_passwordFile = TestFileUtils.createTempFile(this, ".user.password", "user:password");
@@ -129,6 +134,7 @@ public class PlainPasswordDatabaseAuthenticationManagerTest extends QpidTestCase
assertThat(provider.getChildren(User.class).size(), is(equalTo(0)));
}
+ @Test
public void testDurability()
{
_passwordFile = TestFileUtils.createTempFile(this, ".user.password");
@@ -172,6 +178,7 @@ public class PlainPasswordDatabaseAuthenticationManagerTest extends QpidTestCase
}
}
+ @Test
public void testAuthenticate()
{
_passwordFile = TestFileUtils.createTempFile(this, ".user.password", "user:password");
@@ -203,6 +210,7 @@ public class PlainPasswordDatabaseAuthenticationManagerTest extends QpidTestCase
}
}
+ @Test
public void testDeleteProvider()
{
_passwordFile = TestFileUtils.createTempFile(this, ".user.password", "user:password");
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactoryTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactoryTest.java
index cedceff..ceb19e7 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactoryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactoryTest.java
@@ -19,38 +19,45 @@
*/
package org.apache.qpid.server.security.auth.manager;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.File;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase;
-import org.apache.qpid.server.model.BrokerTestHelper;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class PlainPasswordFileAuthenticationManagerFactoryTest extends TestCase
+public class PlainPasswordFileAuthenticationManagerFactoryTest extends UnitTestBase
{
- ConfiguredObjectFactory _factory = BrokerModel.getInstance().getObjectFactory();
+ private ConfiguredObjectFactory _factory = BrokerModel.getInstance().getObjectFactory();
private Map<String, Object> _configuration = new HashMap<String, Object>();
private File _emptyPasswordFile;
private Broker _broker = BrokerTestHelper.createBrokerMock();
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
- _emptyPasswordFile = File.createTempFile(getName(), "passwd");
+ _emptyPasswordFile = File.createTempFile(getTestName(), "passwd");
_emptyPasswordFile.deleteOnExit();
_configuration.put(AuthenticationProvider.ID, UUID.randomUUID());
- _configuration.put(AuthenticationProvider.NAME, getName());
+ _configuration.put(AuthenticationProvider.NAME, getTestName());
}
+ @Test
public void testPlainInstanceCreated() throws Exception
{
_configuration.put(AuthenticationProvider.TYPE, PlainPasswordDatabaseAuthenticationManager.PROVIDER_TYPE);
@@ -62,6 +69,7 @@ public class PlainPasswordFileAuthenticationManagerFactoryTest extends TestCase
assertTrue(((PrincipalDatabaseAuthenticationManager)manager).getPrincipalDatabase() instanceof PlainPasswordFilePrincipalDatabase);
}
+ @Test
public void testPasswordFileNotFound() throws Exception
{
//delete the file
@@ -78,6 +86,7 @@ public class PlainPasswordFileAuthenticationManagerFactoryTest extends TestCase
assertTrue(((PrincipalDatabaseAuthenticationManager)manager).getPrincipalDatabase() instanceof PlainPasswordFilePrincipalDatabase);
}
+ @Test
public void testThrowsExceptionWhenConfigForPlainPDImplementationNoPasswordFileValueSpecified() throws Exception
{
_configuration.put(AuthenticationProvider.TYPE, PlainPasswordDatabaseAuthenticationManager.PROVIDER_TYPE);
@@ -93,19 +102,12 @@ public class PlainPasswordFileAuthenticationManagerFactoryTest extends TestCase
}
}
- @Override
- protected void tearDown() throws Exception
+ @After
+ public void tearDown() throws Exception
{
- try
- {
- if (_emptyPasswordFile == null && _emptyPasswordFile.exists())
- {
- _emptyPasswordFile.delete();
- }
- }
- finally
+ if (_emptyPasswordFile == null && _emptyPasswordFile.exists())
{
- super.tearDown();
+ _emptyPasswordFile.delete();
}
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
index 8503368..d1860f1 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
@@ -21,6 +21,11 @@
package org.apache.qpid.server.security.auth.manager;
import static org.apache.qpid.server.security.auth.AuthenticatedPrincipalTestHelper.assertOnlyContainsWrapped;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
@@ -36,7 +41,12 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
import org.apache.qpid.server.security.auth.AuthenticationResult;
@@ -44,16 +54,15 @@ import org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationS
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase;
import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
-import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.security.auth.sasl.SaslNegotiator;
import org.apache.qpid.server.security.auth.sasl.SaslSettings;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
+
/**
* Tests the public methods of PrincipalDatabaseAuthenticationManager.
- *
*/
-public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
+public class PrincipalDatabaseAuthenticationManagerTest extends UnitTestBase
{
private static final String MOCK_MECH_NAME = "MOCK-MECH-NAME";
@@ -62,15 +71,14 @@ public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
private String _passwordFileLocation;
private SaslNegotiator _saslNegotiator = mock(SaslNegotiator.class);
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
- _passwordFileLocation = TMP_FOLDER + File.separator + PrincipalDatabaseAuthenticationManagerTest.class.getSimpleName() + "-" + getName();
+ _passwordFileLocation = TMP_FOLDER + File.separator + PrincipalDatabaseAuthenticationManagerTest.class.getSimpleName() + "-" + getTestName();
deletePasswordFileIfExists();
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -84,7 +92,6 @@ public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
{
deletePasswordFileIfExists();
}
- super.tearDown();
}
private void setupMocks() throws Exception
@@ -122,6 +129,7 @@ public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
}
}
+ @Test
public void testInitialiseWhenPasswordFileNotFound() throws Exception
{
PasswordCredentialManagingAuthenticationProvider mockAuthProvider = mock(PasswordCredentialManagingAuthenticationProvider.class);
@@ -136,10 +144,12 @@ public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
}
catch (IllegalConfigurationException e)
{
- assertTrue(e.getCause() instanceof FileNotFoundException);
+ final boolean condition = e.getCause() instanceof FileNotFoundException;
+ assertTrue(condition);
}
}
+ @Test
public void testInitialiseWhenPasswordFileExists() throws Exception
{
PasswordCredentialManagingAuthenticationProvider mockAuthProvider = mock(PasswordCredentialManagingAuthenticationProvider.class);
@@ -164,11 +174,12 @@ public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
}
_manager.initialise();
List<Principal> users = _principalDatabase.getUsers();
- assertEquals("Unexpected uses size", 1, users.size());
+ assertEquals("Unexpected uses size", (long) 1, (long) users.size());
Principal p = _principalDatabase.getUser("admin");
assertEquals("Unexpected principal name", "admin", p.getName());
}
+ @Test
public void testSaslMechanismCreation() throws Exception
{
setupMocks();
@@ -183,6 +194,7 @@ public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
* authentication success.
*
*/
+ @Test
public void testSaslAuthenticationSuccess() throws Exception
{
setupMocks();
@@ -202,6 +214,7 @@ public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
* authentication not complete.
*
*/
+ @Test
public void testSaslAuthenticationNotCompleted() throws Exception
{
setupMocks();
@@ -209,7 +222,7 @@ public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
when(_saslNegotiator.handleResponse(any(byte[].class))).thenReturn(new AuthenticationResult(AuthenticationStatus.CONTINUE));
AuthenticationResult result = _saslNegotiator.handleResponse("12345".getBytes());
- assertEquals("Principals was not expected size", 0, result.getPrincipals().size());
+ assertEquals("Principals was not expected size", (long) 0, (long) result.getPrincipals().size());
assertEquals(AuthenticationStatus.CONTINUE, result.getStatus());
}
@@ -220,6 +233,7 @@ public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
* authentication error.
*
*/
+ @Test
public void testSaslAuthenticationError() throws Exception
{
setupMocks();
@@ -227,10 +241,11 @@ public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
when(_saslNegotiator.handleResponse(any(byte[].class))).thenReturn(new AuthenticationResult(AuthenticationStatus.ERROR));
AuthenticationResult result = _saslNegotiator.handleResponse("12345".getBytes());
- assertEquals("Principals was not expected size", 0, result.getPrincipals().size());
+ assertEquals("Principals was not expected size", (long) 0, (long) result.getPrincipals().size());
assertEquals(AuthenticationStatus.ERROR, result.getStatus());
}
+ @Test
public void testNonSaslAuthenticationSuccess() throws Exception
{
setupMocks();
@@ -244,6 +259,7 @@ public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
assertEquals(AuthenticationStatus.SUCCESS, result.getStatus());
}
+ @Test
public void testNonSaslAuthenticationErrored() throws Exception
{
setupMocks();
@@ -251,10 +267,11 @@ public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
when(_principalDatabase.verifyPassword("guest", "wrongpassword".toCharArray())).thenReturn(false);
AuthenticationResult result = _manager.authenticate("guest", "wrongpassword");
- assertEquals("Principals was not expected size", 0, result.getPrincipals().size());
+ assertEquals("Principals was not expected size", (long) 0, (long) result.getPrincipals().size());
assertEquals(AuthenticationStatus.ERROR, result.getStatus());
}
+ @Test
public void testOnCreate() throws Exception
{
setupMocks();
@@ -262,6 +279,7 @@ public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
assertTrue("Password file was not created", new File(_passwordFileLocation).exists());
}
+ @Test
public void testOnDelete() throws Exception
{
setupMocks();
@@ -272,6 +290,7 @@ public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
assertFalse("Password file was not deleted", new File(_passwordFileLocation).exists());
}
+ @Test
public void testCreateForInvalidPath() throws Exception
{
setUpPrincipalDatabase();
@@ -290,7 +309,10 @@ public class PrincipalDatabaseAuthenticationManagerTest extends QpidTestCase
}
catch(IllegalConfigurationException e)
{
- assertEquals("Unexpected exception message:" + e.getMessage(), String.format("Cannot create password file at '%s'", path), e.getMessage());
+ assertEquals("Unexpected exception message:" + e.getMessage(),
+ String.format("Cannot create password file at '%s'", path),
+ e.getMessage());
+
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerTest.java
index 9a7e59a..37eb7d5 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerTest.java
@@ -20,18 +20,16 @@
*/
package org.apache.qpid.server.security.auth.manager;
+import static org.junit.Assert.fail;
+
import java.util.Collections;
import java.util.Map;
+import org.junit.Test;
+
public class ScramSHA1AuthenticationManagerTest extends ManagedAuthenticationManagerTestBase
{
@Override
- public void setUp() throws Exception
- {
- super.setUp();
- }
-
- @Override
protected ConfigModelPasswordManagingAuthenticationProvider<?> createAuthManager(final Map<String, Object> attributesMap)
{
return new ScramSHA1AuthenticationManager(attributesMap, getBroker());
@@ -43,13 +41,7 @@ public class ScramSHA1AuthenticationManagerTest extends ManagedAuthenticationMan
return false;
}
- @Override
- public void tearDown() throws Exception
- {
- super.tearDown();
- }
-
-
+ @Test
public void testNonASCIIUser()
{
try
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java
index 7b024ab..bf797e0 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.security.auth.manager;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -30,25 +33,27 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.model.AuthenticationProvider;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus;
import org.apache.qpid.server.security.auth.sasl.SaslNegotiator;
import org.apache.qpid.server.security.auth.sasl.SaslSettings;
import org.apache.qpid.server.security.auth.sasl.SaslUtil;
-import org.apache.qpid.server.model.BrokerTestHelper;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class SimpleAuthenticationManagerTest extends QpidTestCase
+public class SimpleAuthenticationManagerTest extends UnitTestBase
{
private static final String TEST_USER = "testUser";
private static final String TEST_PASSWORD = "testPassword";
private SimpleAuthenticationManager _authenticationManager;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
Map<String,Object> authManagerAttrs = new HashMap<String, Object>();
authManagerAttrs.put(AuthenticationProvider.NAME,"MANAGEMENT_MODE_AUTHENTICATION");
authManagerAttrs.put(AuthenticationProvider.ID, UUID.randomUUID());
@@ -59,16 +64,18 @@ public class SimpleAuthenticationManagerTest extends QpidTestCase
}
+ @Test
public void testGetMechanisms()
{
List<String> mechanisms = _authenticationManager.getMechanisms();
- assertEquals("Unexpected number of mechanisms", 4, mechanisms.size());
+ assertEquals("Unexpected number of mechanisms", (long) 4, (long) mechanisms.size());
assertTrue("PLAIN was not present: " + mechanisms, mechanisms.contains("PLAIN"));
assertTrue("CRAM-MD5 was not present: " + mechanisms, mechanisms.contains("CRAM-MD5"));
assertTrue("SCRAM-SHA-1 was not present: " + mechanisms, mechanisms.contains("SCRAM-SHA-1"));
assertTrue("SCRAM-SHA-256 was not present: " + mechanisms, mechanisms.contains("SCRAM-SHA-256"));
}
+ @Test
public void testCreateSaslNegotiatorForUnsupportedMechanisms() throws Exception
{
String[] unsupported = new String[] { "EXTERNAL", "CRAM-MD5-HEX", "CRAM-MD5-HASHED", "ANONYMOUS", "GSSAPI"};
@@ -76,46 +83,54 @@ public class SimpleAuthenticationManagerTest extends QpidTestCase
{
String mechanism = unsupported[i];
SaslNegotiator negotiator = _authenticationManager.createSaslNegotiator(mechanism, null, null);
- assertNull("Mechanism " + mechanism + " should not be supported by SimpleAuthenticationManager", negotiator);
+ assertNull("Mechanism " + mechanism + " should not be supported by SimpleAuthenticationManager",
+ negotiator);
}
}
+ @Test
public void testAuthenticateWithPlainSaslServer() throws Exception
{
AuthenticationResult result = authenticatePlain(TEST_USER, TEST_PASSWORD);
assertAuthenticated(result);
}
+ @Test
public void testAuthenticateWithPlainSaslServerInvalidPassword() throws Exception
{
AuthenticationResult result = authenticatePlain(TEST_USER, "wrong-password");
assertUnauthenticated(result);
}
+ @Test
public void testAuthenticateWithPlainSaslServerInvalidUsername() throws Exception
{
AuthenticationResult result = authenticatePlain("wrong-user", TEST_PASSWORD);
assertUnauthenticated(result);
}
+ @Test
public void testAuthenticateWithCramMd5SaslServer() throws Exception
{
AuthenticationResult result = authenticateCramMd5(TEST_USER, TEST_PASSWORD);
assertAuthenticated(result);
}
+ @Test
public void testAuthenticateWithCramMd5SaslServerInvalidPassword() throws Exception
{
AuthenticationResult result = authenticateCramMd5(TEST_USER, "wrong-password");
assertUnauthenticated(result);
}
+ @Test
public void testAuthenticateWithCramMd5SaslServerInvalidUsername() throws Exception
{
AuthenticationResult result = authenticateCramMd5("wrong-user", TEST_PASSWORD);
assertUnauthenticated(result);
}
+ @Test
public void testAuthenticateValidCredentials()
{
AuthenticationResult result = _authenticationManager.authenticate(TEST_USER, TEST_PASSWORD);
@@ -123,12 +138,14 @@ public class SimpleAuthenticationManagerTest extends QpidTestCase
assertAuthenticated(result);
}
+ @Test
public void testAuthenticateInvalidPassword()
{
AuthenticationResult result = _authenticationManager.authenticate(TEST_USER, "invalid");
assertUnauthenticated(result);
}
+ @Test
public void testAuthenticateInvalidUserName()
{
AuthenticationResult result = _authenticationManager.authenticate("invalid", TEST_PASSWORD);
@@ -141,7 +158,7 @@ public class SimpleAuthenticationManagerTest extends QpidTestCase
Principal principal = result.getMainPrincipal();
assertEquals("Unexpected principal name", TEST_USER, principal.getName());
Set<Principal> principals = result.getPrincipals();
- assertEquals("Unexpected principals size", 1, principals.size());
+ assertEquals("Unexpected principals size", (long) 1, (long) principals.size());
assertEquals("Unexpected principal name", TEST_USER, principals.iterator().next().getName());
}
@@ -150,7 +167,7 @@ public class SimpleAuthenticationManagerTest extends QpidTestCase
assertEquals("Unexpected authentication result", AuthenticationStatus.ERROR, result.getStatus());
assertNull("Unexpected principal", result.getMainPrincipal());
Set<Principal> principals = result.getPrincipals();
- assertEquals("Unexpected principals size", 0, principals.size());
+ assertEquals("Unexpected principals size", (long) 0, (long) principals.size());
}
private AuthenticationResult authenticatePlain(String userName, String userPassword) throws Exception
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
index a3cf2e0..909884f 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
@@ -20,6 +20,8 @@
package org.apache.qpid.server.security.auth.manager;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -29,15 +31,18 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.TrustStore;
-import org.apache.qpid.server.model.BrokerTestHelper;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class SimpleLDAPAuthenticationManagerFactoryTest extends QpidTestCase
+public class SimpleLDAPAuthenticationManagerFactoryTest extends UnitTestBase
{
private ConfiguredObjectFactory _factory = BrokerModel.getInstance().getObjectFactory();
private Map<String, Object> _configuration = new HashMap<String, Object>();
@@ -45,18 +50,18 @@ public class SimpleLDAPAuthenticationManagerFactoryTest extends QpidTestCase
private TrustStore _trustStore = mock(TrustStore.class);
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
when(_trustStore.getName()).thenReturn("mytruststore");
when(_trustStore.getId()).thenReturn(UUID.randomUUID());
_configuration.put(AuthenticationProvider.ID, UUID.randomUUID());
- _configuration.put(AuthenticationProvider.NAME, getName());
+ _configuration.put(AuthenticationProvider.NAME, getTestName());
}
+ @Test
public void testLdapCreated() throws Exception
{
_configuration.put(AuthenticationProvider.TYPE, SimpleLDAPAuthenticationManager.PROVIDER_TYPE);
@@ -68,6 +73,7 @@ public class SimpleLDAPAuthenticationManagerFactoryTest extends QpidTestCase
_factory.create(AuthenticationProvider.class, _configuration, _broker);
}
+ @Test
public void testLdapsWhenTrustStoreNotFound() throws Exception
{
when(_broker.getChildren(eq(TrustStore.class))).thenReturn(Collections.singletonList(_trustStore));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGeneratorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGeneratorTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGeneratorTest.java
index 1c3a307..023a5e8 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGeneratorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGeneratorTest.java
@@ -21,25 +21,32 @@
package org.apache.qpid.server.security.auth.manager.ldap;
import static org.apache.qpid.server.security.auth.manager.ldap.LDAPSSLSocketFactoryGenerator.TARGET_PACKAGE_NAME;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import javax.net.SocketFactory;
import javax.net.ssl.SSLSocketFactory;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
-public class LDAPSSLSocketFactoryGeneratorTest extends QpidTestCase
+public class LDAPSSLSocketFactoryGeneratorTest extends UnitTestBase
{
private SSLSocketFactory _sslSocketFactory = mock(SSLSocketFactory.class);
+ @Test
public void testPackageAndClassName() throws Exception
{
Class<? extends SocketFactory> socketFactoryClass = LDAPSSLSocketFactoryGenerator.createSubClass("MyNewClass", _sslSocketFactory);
+
assertEquals("MyNewClass", socketFactoryClass.getSimpleName());
assertEquals(TARGET_PACKAGE_NAME, socketFactoryClass.getPackage().getName());
}
+ @Test
public void testLoadingWithClassForName() throws Exception
{
Class<? extends AbstractLDAPSSLSocketFactory> socketFactoryClass = LDAPSSLSocketFactoryGenerator.createSubClass("MyNewClass", _sslSocketFactory);
@@ -61,6 +68,7 @@ public class LDAPSSLSocketFactoryGeneratorTest extends QpidTestCase
assertEquals(socketFactoryClass, loaded);
}
+ @Test
public void testClassloaderDelegatesToParent() throws Exception
{
ClassLoader classLoader = LDAPSSLSocketFactoryGenerator.createSubClass("MyNewClass", _sslSocketFactory).getClassLoader();
@@ -68,12 +76,14 @@ public class LDAPSSLSocketFactoryGeneratorTest extends QpidTestCase
assertEquals(TestClassForLoading.class, classLoader.loadClass(TestClassForLoading.class.getName()));
}
+ @Test
public void testGetDefaultCreatesInstance() throws Exception
{
Class<? extends AbstractLDAPSSLSocketFactory> socketFactoryClass = LDAPSSLSocketFactoryGenerator.createSubClass("MyNewClass", _sslSocketFactory);
AbstractLDAPSSLSocketFactory socketFactory = invokeGetDefaultMethod(socketFactoryClass);
- assertTrue(socketFactory instanceof AbstractLDAPSSLSocketFactory);
+ final boolean condition = socketFactory instanceof AbstractLDAPSSLSocketFactory;
+ assertTrue(condition);
assertEquals("MyNewClass", socketFactory.getClass().getSimpleName());
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2AuthenticationProviderImplTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2AuthenticationProviderImplTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2AuthenticationProviderImplTest.java
index 67beaa5..1de8242 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2AuthenticationProviderImplTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2AuthenticationProviderImplTest.java
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.security.auth.manager.oauth2;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -35,6 +37,10 @@ import javax.net.ssl.SSLSession;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.model.Broker;
@@ -47,9 +53,9 @@ import org.apache.qpid.server.security.auth.manager.CachingAuthenticationProvide
import org.apache.qpid.server.security.auth.manager.oauth2.cloudfoundry.CloudFoundryOAuth2IdentityResolverService;
import org.apache.qpid.server.security.auth.sasl.SaslNegotiator;
import org.apache.qpid.server.security.auth.sasl.oauth2.OAuth2Negotiator;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class OAuth2AuthenticationProviderImplTest extends QpidTestCase
+public class OAuth2AuthenticationProviderImplTest extends UnitTestBase
{
static final String UTF8 = StandardCharsets.UTF_8.name();
@@ -81,10 +87,9 @@ public class OAuth2AuthenticationProviderImplTest extends QpidTestCase
private OAuth2AuthenticationProvider<?> _authProvider;
private OAuth2MockEndpointHolder _server;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_server = new OAuth2MockEndpointHolder();
_server.start();
@@ -134,7 +139,7 @@ public class OAuth2AuthenticationProviderImplTest extends QpidTestCase
HttpsURLConnection.setDefaultHostnameVerifier(new BlindHostnameVerifier());
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -146,16 +151,19 @@ public class OAuth2AuthenticationProviderImplTest extends QpidTestCase
}
finally
{
- super.tearDown();
}
}
+ @Test
public void testGetSecureOnlyMechanisms() throws Exception
{
assertEquals("OAuth2 should be a secure only mechanism",
- Collections.singletonList(OAuth2Negotiator.MECHANISM), _authProvider.getSecureOnlyMechanisms());
+ Collections.singletonList(OAuth2Negotiator.MECHANISM),
+ _authProvider.getSecureOnlyMechanisms());
+
}
+ @Test
public void testAuthenticateViaSasl() throws Exception
{
_server.setEndpoints(Collections.singletonMap(TEST_IDENTITY_RESOLVER_ENDPOINT_PATH,
@@ -166,6 +174,7 @@ public class OAuth2AuthenticationProviderImplTest extends QpidTestCase
assertSuccess(authenticationResult);
}
+ @Test
public void testFailAuthenticateViaSasl() throws Exception
{
OAuth2MockEndpoint mockIdentityResolverEndpoint = createMockIdentityResolverEndpoint();
@@ -179,6 +188,7 @@ public class OAuth2AuthenticationProviderImplTest extends QpidTestCase
assertFailure(authenticationResult, "invalid_token");
}
+ @Test
public void testAuthenticateViaAuthorizationCode() throws Exception
{
Map<String, OAuth2MockEndpoint> mockEndpoints = new HashMap<>();
@@ -195,6 +205,7 @@ public class OAuth2AuthenticationProviderImplTest extends QpidTestCase
assertSuccess(authenticationResult);
}
+ @Test
public void testFailAuthenticateViaInvalidAuthorizationCode() throws Exception
{
Map<String, OAuth2MockEndpoint> mockEndpoints = new HashMap<>();
@@ -214,6 +225,7 @@ public class OAuth2AuthenticationProviderImplTest extends QpidTestCase
assertFailure(authenticationResult, "invalid_grant");
}
+ @Test
public void testAuthenticateViaAccessToken() throws Exception
{
_server.setEndpoints(Collections.singletonMap(TEST_IDENTITY_RESOLVER_ENDPOINT_PATH,
@@ -224,6 +236,7 @@ public class OAuth2AuthenticationProviderImplTest extends QpidTestCase
assertSuccess(authenticationResult);
}
+ @Test
public void testFailAuthenticateViaInvalidAccessToken() throws Exception
{
OAuth2MockEndpoint mockIdentityResolverEndpoint = createMockIdentityResolverEndpoint();
@@ -240,18 +253,23 @@ public class OAuth2AuthenticationProviderImplTest extends QpidTestCase
private void assertSuccess(final AuthenticationResult authenticationResult)
{
assertEquals("Authentication was not successful: " + authenticationResult.getCause(),
- AuthenticationResult.AuthenticationStatus.SUCCESS, authenticationResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.SUCCESS,
+ authenticationResult.getStatus());
assertEquals("AuthenticationResult has the wrong Principal",
- TEST_USER_NAME, authenticationResult.getMainPrincipal().getName());
+ TEST_USER_NAME,
+ authenticationResult.getMainPrincipal().getName());
}
private void assertFailure(final AuthenticationResult authenticationResult, final String failureCauseString)
{
assertEquals("Authentication should not succeed",
- AuthenticationResult.AuthenticationStatus.ERROR, authenticationResult.getStatus());
- assertTrue(authenticationResult.getCause().toString(), authenticationResult.getCause().toString().contains(failureCauseString));
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ authenticationResult.getStatus());
+ assertTrue(authenticationResult.getCause().toString(),
+ authenticationResult.getCause().toString().contains(failureCauseString));
assertEquals("AuthenticationResult has the wrong Principal",
- null, authenticationResult.getMainPrincipal());
+ null,
+ authenticationResult.getMainPrincipal());
}
private OAuth2MockEndpoint createMockTokenEndpoint()
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousNegotiatorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousNegotiatorTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousNegotiatorTest.java
index c978cc1..41cec68 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousNegotiatorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousNegotiatorTest.java
@@ -20,21 +20,27 @@
package org.apache.qpid.server.security.auth.sasl.anonymous;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
+import org.junit.Test;
+
import org.apache.qpid.server.security.auth.AuthenticationResult;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AnonymousNegotiatorTest extends QpidTestCase
+public class AnonymousNegotiatorTest extends UnitTestBase
{
+ @Test
public void testHandleResponse() throws Exception
{
final AuthenticationResult result = mock(AuthenticationResult.class);
AnonymousNegotiator negotiator = new AnonymousNegotiator(result);
- assertEquals("Unexpected result", result, negotiator.handleResponse(new byte[0]));
+ final Object actual = negotiator.handleResponse(new byte[0]);
+ assertEquals("Unexpected result", result, actual);
AuthenticationResult secondResult = negotiator.handleResponse(new byte[0]);
assertEquals("Only first call to handleResponse should be successful",
- AuthenticationResult.AuthenticationStatus.ERROR, secondResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ secondResult.getStatus());
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org