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:26 UTC
[19/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/sasl/crammd5/CramMd5NegotiatorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5NegotiatorTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5NegotiatorTest.java
index 18eb6e3..5bd686a 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5NegotiatorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5NegotiatorTest.java
@@ -20,6 +20,9 @@
package org.apache.qpid.server.security.auth.sasl.crammd5;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -31,14 +34,18 @@ import java.security.NoSuchAlgorithmException;
import javax.xml.bind.DatatypeConverter;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.database.HashedUser;
import org.apache.qpid.server.security.auth.sasl.PasswordSource;
import org.apache.qpid.server.security.auth.sasl.SaslUtil;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class CramMd5NegotiatorTest extends QpidTestCase
+public class CramMd5NegotiatorTest extends UnitTestBase
{
private static final String TEST_FQDN = "example.com";
private static final String VALID_USERNAME = "testUser";
@@ -50,43 +57,45 @@ public class CramMd5NegotiatorTest extends QpidTestCase
private PasswordSource _passwordSource;
private PasswordCredentialManagingAuthenticationProvider<?> _authenticationProvider;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_passwordSource = mock(PasswordSource.class);
when(_passwordSource.getPassword(eq(VALID_USERNAME))).thenReturn(VALID_USERPASSWORD);
_authenticationProvider = mock(PasswordCredentialManagingAuthenticationProvider.class);
}
- @Override
+ @After
public void tearDown() throws Exception
{
- super.tearDown();
if (_negotiator != null)
{
_negotiator.dispose();
}
}
+ @Test
public void testHandleResponseCramMD5ValidCredentials() throws Exception
{
_negotiator = new CramMd5Negotiator(_authenticationProvider, TEST_FQDN, _passwordSource);
doHandleResponseWithValidCredentials(CramMd5Negotiator.MECHANISM);
}
+ @Test
public void testHandleResponseCramMD5InvalidPassword() throws Exception
{
_negotiator = new CramMd5Negotiator(_authenticationProvider, TEST_FQDN, _passwordSource);
doHandleResponseWithInvalidPassword(CramMd5Negotiator.MECHANISM);
}
+ @Test
public void testHandleResponseCramMD5InvalidUsername() throws Exception
{
_negotiator = new CramMd5Negotiator(_authenticationProvider, TEST_FQDN, _passwordSource);
doHandleResponseWithInvalidUsername(CramMd5Negotiator.MECHANISM);
}
+ @Test
public void testHandleResponseCramMD5HashedValidCredentials() throws Exception
{
hashPassword();
@@ -96,6 +105,7 @@ public class CramMd5NegotiatorTest extends QpidTestCase
doHandleResponseWithValidCredentials(CramMd5HashedNegotiator.MECHANISM);
}
+ @Test
public void testHandleResponseCramMD5HashedInvalidPassword() throws Exception
{
hashPassword();
@@ -105,6 +115,7 @@ public class CramMd5NegotiatorTest extends QpidTestCase
doHandleResponseWithInvalidPassword(CramMd5HashedNegotiator.MECHANISM);
}
+ @Test
public void testHandleResponseCramMD5HashedInvalidUsername() throws Exception
{
hashPassword();
@@ -114,6 +125,7 @@ public class CramMd5NegotiatorTest extends QpidTestCase
doHandleResponseWithInvalidUsername(CramMd5HashedNegotiator.MECHANISM);
}
+ @Test
public void testHandleResponseCramMD5HexValidCredentials() throws Exception
{
hashPassword();
@@ -123,6 +135,7 @@ public class CramMd5NegotiatorTest extends QpidTestCase
doHandleResponseWithValidCredentials(CramMd5HexNegotiator.MECHANISM);
}
+ @Test
public void testHandleResponseCramMD5HexInvalidPassword() throws Exception
{
hashPassword();
@@ -132,6 +145,7 @@ public class CramMd5NegotiatorTest extends QpidTestCase
doHandleResponseWithInvalidPassword(CramMd5HexNegotiator.MECHANISM);
}
+ @Test
public void testHandleResponseCramMD5HexInvalidUsername() throws Exception
{
hashPassword();
@@ -141,6 +155,7 @@ public class CramMd5NegotiatorTest extends QpidTestCase
doHandleResponseWithInvalidUsername(CramMd5HexNegotiator.MECHANISM);
}
+ @Test
public void testHandleResponseCramMD5Base64HexValidCredentials() throws Exception
{
base64Password();
@@ -150,6 +165,7 @@ public class CramMd5NegotiatorTest extends QpidTestCase
doHandleResponseWithValidCredentials(CramMd5Base64HexNegotiator.MECHANISM);
}
+ @Test
public void testHandleResponseCramMD5Base64HexInvalidPassword() throws Exception
{
base64Password();
@@ -159,6 +175,7 @@ public class CramMd5NegotiatorTest extends QpidTestCase
doHandleResponseWithInvalidPassword(CramMd5Base64HexNegotiator.MECHANISM);
}
+ @Test
public void testHandleResponseCramMD5Base64HexInvalidUsername() throws Exception
{
base64Password();
@@ -168,6 +185,7 @@ public class CramMd5NegotiatorTest extends QpidTestCase
doHandleResponseWithInvalidUsername(CramMd5Base64HexNegotiator.MECHANISM);
}
+ @Test
public void testHandleResponseCramMD5Base64HashedValidCredentials() throws Exception
{
base64Password();
@@ -177,6 +195,7 @@ public class CramMd5NegotiatorTest extends QpidTestCase
doHandleResponseWithValidCredentials(CramMd5Base64HashedNegotiator.MECHANISM);
}
+ @Test
public void testHandleResponseCramMD5Base64HashedInvalidPassword() throws Exception
{
base64Password();
@@ -186,6 +205,7 @@ public class CramMd5NegotiatorTest extends QpidTestCase
doHandleResponseWithInvalidPassword(CramMd5Base64HashedNegotiator.MECHANISM);
}
+ @Test
public void testHandleResponseCramMD5Base64HashedInvalidUsername() throws Exception
{
base64Password();
@@ -198,61 +218,83 @@ public class CramMd5NegotiatorTest extends QpidTestCase
private void doHandleResponseWithValidCredentials(final String mechanism) throws Exception
{
AuthenticationResult firstResult = _negotiator.handleResponse(new byte[0]);
- assertEquals("Unexpected first result status", AuthenticationResult.AuthenticationStatus.CONTINUE, firstResult.getStatus());
+ assertEquals("Unexpected first result status",
+ AuthenticationResult.AuthenticationStatus.CONTINUE,
+ firstResult.getStatus());
+
+
assertNotNull("Unexpected first result challenge", firstResult.getChallenge());
byte[] responseBytes = SaslUtil.generateCramMD5ClientResponse(mechanism, VALID_USERNAME, new String(VALID_USERPASSWORD), firstResult.getChallenge());
AuthenticationResult secondResult = _negotiator.handleResponse(responseBytes);
- assertEquals("Unexpected second result status", AuthenticationResult.AuthenticationStatus.SUCCESS, secondResult.getStatus());
+ assertEquals("Unexpected second result status",
+ AuthenticationResult.AuthenticationStatus.SUCCESS,
+ secondResult.getStatus());
assertNull("Unexpected second result challenge", secondResult.getChallenge());
- assertEquals("Unexpected second result main principal", VALID_USERNAME, secondResult.getMainPrincipal().getName());
+ assertEquals("Unexpected second result main principal",
+ VALID_USERNAME,
+ secondResult.getMainPrincipal().getName());
verify(_passwordSource).getPassword(eq(VALID_USERNAME));
AuthenticationResult thirdResult = _negotiator.handleResponse(new byte[0]);
- assertEquals("Unexpected third result status", AuthenticationResult.AuthenticationStatus.ERROR, thirdResult.getStatus());
+ assertEquals("Unexpected third result status",
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ thirdResult.getStatus());
}
private void doHandleResponseWithInvalidPassword(final String mechanism) throws Exception
{
AuthenticationResult firstResult = _negotiator.handleResponse(new byte[0]);
- assertEquals("Unexpected first result status", AuthenticationResult.AuthenticationStatus.CONTINUE, firstResult.getStatus());
+ assertEquals("Unexpected first result status",
+ AuthenticationResult.AuthenticationStatus.CONTINUE,
+ firstResult.getStatus());
assertNotNull("Unexpected first result challenge", firstResult.getChallenge());
byte[] responseBytes = SaslUtil.generateCramMD5ClientResponse(mechanism, VALID_USERNAME, INVALID_USERPASSWORD, firstResult.getChallenge());
AuthenticationResult secondResult = _negotiator.handleResponse(responseBytes);
- assertEquals("Unexpected second result status", AuthenticationResult.AuthenticationStatus.ERROR, secondResult.getStatus());
+ assertEquals("Unexpected second result status",
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ secondResult.getStatus());
assertNull("Unexpected second result challenge", secondResult.getChallenge());
- assertNull("Unexpected second result main principal", secondResult.getMainPrincipal());
+ assertNull("Unexpected second result main principal", secondResult.getMainPrincipal());
verify(_passwordSource).getPassword(eq(VALID_USERNAME));
AuthenticationResult thirdResult = _negotiator.handleResponse(new byte[0]);
- assertEquals("Unexpected third result status", AuthenticationResult.AuthenticationStatus.ERROR, thirdResult.getStatus());
+ assertEquals("Unexpected third result status",
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ thirdResult.getStatus());
}
private void doHandleResponseWithInvalidUsername(final String mechanism) throws Exception
{
AuthenticationResult firstResult = _negotiator.handleResponse(new byte[0]);
- assertEquals("Unexpected first result status", AuthenticationResult.AuthenticationStatus.CONTINUE, firstResult.getStatus());
+ assertEquals("Unexpected first result status",
+ AuthenticationResult.AuthenticationStatus.CONTINUE,
+ firstResult.getStatus());
assertNotNull("Unexpected first result challenge", firstResult.getChallenge());
byte[] responseBytes = SaslUtil.generateCramMD5ClientResponse(mechanism, INVALID_USERNAME, new String(VALID_USERPASSWORD), firstResult.getChallenge());
AuthenticationResult secondResult = _negotiator.handleResponse(responseBytes);
- assertEquals("Unexpected second result status", AuthenticationResult.AuthenticationStatus.ERROR, secondResult.getStatus());
+ assertEquals("Unexpected second result status",
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ secondResult.getStatus());
assertNull("Unexpected second result challenge", secondResult.getChallenge());
- assertNull("Unexpected second result main principal", secondResult.getMainPrincipal());
+ assertNull("Unexpected second result main principal", secondResult.getMainPrincipal());
verify(_passwordSource).getPassword(eq(INVALID_USERNAME));
AuthenticationResult thirdResult = _negotiator.handleResponse(new byte[0]);
- assertEquals("Unexpected third result status", AuthenticationResult.AuthenticationStatus.ERROR, thirdResult.getStatus());
+ assertEquals("Unexpected third result status",
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ thirdResult.getStatus());
}
private void hashPassword()
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/external/ExternalNegotiatorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/external/ExternalNegotiatorTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/external/ExternalNegotiatorTest.java
index 4adabfe..af2bb9f 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/external/ExternalNegotiatorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/external/ExternalNegotiatorTest.java
@@ -21,24 +21,29 @@
package org.apache.qpid.server.security.auth.sasl.external;
+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;
-
import java.security.Principal;
import javax.security.auth.x500.X500Principal;
+import org.junit.Test;
+
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.manager.ExternalAuthenticationManager;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class ExternalNegotiatorTest extends QpidTestCase
+public class ExternalNegotiatorTest extends UnitTestBase
{
private static final String VALID_USER_DN = "cn=test,dc=example,dc=com";
private static final String VALID_USER_NAME = "test@example.com";
private static final String USERNAME_NO_CN_DC = "ou=test,o=example,o=com";
+ @Test
public void testHandleResponseUseFullDNValidExternalPrincipal() throws Exception
{
ExternalAuthenticationManager<?> externalAuthenticationManager = mock(ExternalAuthenticationManager.class);
@@ -48,18 +53,21 @@ public class ExternalNegotiatorTest extends QpidTestCase
AuthenticationResult firstResult = negotiator.handleResponse(new byte[0]);
assertEquals("Unexpected first result status",
- AuthenticationResult.AuthenticationStatus.SUCCESS,
- firstResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.SUCCESS,
+ firstResult.getStatus());
+
String principalName = firstResult.getMainPrincipal().getName();
assertTrue(String.format("Unexpected first result principal '%s'", principalName),
- VALID_USER_DN.equalsIgnoreCase(principalName));
+ VALID_USER_DN.equalsIgnoreCase(principalName));
+
AuthenticationResult secondResult = negotiator.handleResponse(new byte[0]);
assertEquals("Unexpected second result status",
- AuthenticationResult.AuthenticationStatus.ERROR,
- secondResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ secondResult.getStatus());
}
+ @Test
public void testHandleResponseNotUseFullDNValidExternalPrincipal() throws Exception
{
ExternalAuthenticationManager<?> externalAuthenticationManager = mock(ExternalAuthenticationManager.class);
@@ -69,17 +77,18 @@ public class ExternalNegotiatorTest extends QpidTestCase
AuthenticationResult firstResult = negotiator.handleResponse(new byte[0]);
assertEquals("Unexpected first result status",
- AuthenticationResult.AuthenticationStatus.SUCCESS,
- firstResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.SUCCESS,
+ firstResult.getStatus());
String principalName = firstResult.getMainPrincipal().getName();
assertEquals("Unexpected first result principal", VALID_USER_NAME, principalName);
AuthenticationResult secondResult = negotiator.handleResponse(new byte[0]);
assertEquals("Unexpected second result status",
- AuthenticationResult.AuthenticationStatus.ERROR,
- secondResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ secondResult.getStatus());
}
+ @Test
public void testHandleResponseNotUseFullDN_No_CN_DC_In_ExternalPrincipal() throws Exception
{
ExternalAuthenticationManager<?> externalAuthenticationManager = mock(ExternalAuthenticationManager.class);
@@ -89,11 +98,12 @@ public class ExternalNegotiatorTest extends QpidTestCase
AuthenticationResult firstResult = negotiator.handleResponse(new byte[0]);
assertEquals("Unexpected first result status",
- AuthenticationResult.AuthenticationStatus.ERROR,
- firstResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ firstResult.getStatus());
assertNull("Unexpected first result principal", firstResult.getMainPrincipal());
}
+ @Test
public void testHandleResponseUseFullDN_No_CN_DC_In_ExternalPrincipal() throws Exception
{
ExternalAuthenticationManager<?> externalAuthenticationManager = mock(ExternalAuthenticationManager.class);
@@ -103,18 +113,19 @@ public class ExternalNegotiatorTest extends QpidTestCase
AuthenticationResult firstResult = negotiator.handleResponse(new byte[0]);
assertEquals("Unexpected first result status",
- AuthenticationResult.AuthenticationStatus.SUCCESS,
- firstResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.SUCCESS,
+ firstResult.getStatus());
String principalName = firstResult.getMainPrincipal().getName();
assertTrue(String.format("Unexpected first result principal '%s'", principalName),
- USERNAME_NO_CN_DC.equalsIgnoreCase(principalName));
+ USERNAME_NO_CN_DC.equalsIgnoreCase(principalName));
AuthenticationResult secondResult = negotiator.handleResponse(new byte[0]);
assertEquals("Unexpected second result status",
- AuthenticationResult.AuthenticationStatus.ERROR,
- secondResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ secondResult.getStatus());
}
+ @Test
public void testHandleResponseFailsWithoutExternalPrincipal() throws Exception
{
ExternalAuthenticationManager<?> externalAuthenticationManager = mock(ExternalAuthenticationManager.class);
@@ -123,12 +134,13 @@ public class ExternalNegotiatorTest extends QpidTestCase
AuthenticationResult firstResult = negotiator.handleResponse(new byte[0]);
assertEquals("Unexpected first result status",
- AuthenticationResult.AuthenticationStatus.ERROR,
- firstResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ firstResult.getStatus());
assertNull("Unexpected first result principal", firstResult.getMainPrincipal());
}
+ @Test
public void testHandleResponseSucceedsForNonX500Principal() throws Exception
{
ExternalAuthenticationManager<?> externalAuthenticationManager = mock(ExternalAuthenticationManager.class);
@@ -138,13 +150,13 @@ public class ExternalNegotiatorTest extends QpidTestCase
AuthenticationResult firstResult = negotiator.handleResponse(new byte[0]);
assertEquals("Unexpected first result status",
- AuthenticationResult.AuthenticationStatus.SUCCESS,
- firstResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.SUCCESS,
+ firstResult.getStatus());
assertEquals("Unexpected first result principal", principal, firstResult.getMainPrincipal());
AuthenticationResult secondResult = negotiator.handleResponse(new byte[0]);
assertEquals("Unexpected second result status",
- AuthenticationResult.AuthenticationStatus.ERROR,
- secondResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ secondResult.getStatus());
}
}
\ No newline at end of file
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/oauth2/OAuth2NegotiatorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/oauth2/OAuth2NegotiatorTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/oauth2/OAuth2NegotiatorTest.java
index d1e1d2a..577fa2a 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/oauth2/OAuth2NegotiatorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/oauth2/OAuth2NegotiatorTest.java
@@ -22,17 +22,22 @@ package org.apache.qpid.server.security.auth.sasl.oauth2;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.manager.oauth2.OAuth2AuthenticationProvider;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class OAuth2NegotiatorTest extends QpidTestCase
+public class OAuth2NegotiatorTest extends UnitTestBase
{
private static final String VALID_TOKEN = "token";
private static final byte[] VALID_RESPONSE = ("auth=Bearer " + VALID_TOKEN + "\1\1").getBytes();
@@ -43,39 +48,43 @@ public class OAuth2NegotiatorTest extends QpidTestCase
private OAuth2Negotiator _negotiator;
private OAuth2AuthenticationProvider<?> _authenticationProvider;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_authenticationProvider = mock(OAuth2AuthenticationProvider.class);
_negotiator = new OAuth2Negotiator(_authenticationProvider, null);
}
+ @Test
public void testHandleResponse_ResponseHasAuthOnly() throws Exception
{
doHandleResponseWithValidResponse(VALID_RESPONSE);
}
+ @Test
public void testHandleResponse_ResponseAuthAndOthers() throws Exception
{
doHandleResponseWithValidResponse(VALID_TOKEN_WITH_CRUD);
}
+ @Test
public void testHandleResponse_ResponseAuthAbsent() throws Exception
{
AuthenticationResult actualResult = _negotiator.handleResponse(RESPONSE_WITH_NO_TOKEN);
assertEquals("Unexpected result status",
- AuthenticationResult.AuthenticationStatus.ERROR,
- actualResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ actualResult.getStatus());
+
assertNull("Unexpected result principal", actualResult.getMainPrincipal());
}
+ @Test
public void testHandleResponse_ResponseAuthMalformed() throws Exception
{
AuthenticationResult actualResult = _negotiator.handleResponse(RESPONSE_WITH_MALFORMED_AUTH);
assertEquals("Unexpected result status",
- AuthenticationResult.AuthenticationStatus.ERROR,
- actualResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ actualResult.getStatus());
assertNull("Unexpected result principal", actualResult.getMainPrincipal());
}
@@ -90,21 +99,27 @@ public class OAuth2NegotiatorTest extends QpidTestCase
AuthenticationResult secondResult = _negotiator.handleResponse(validResponse);
assertEquals("Unexpected second result status",
- AuthenticationResult.AuthenticationStatus.ERROR,
- secondResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ secondResult.getStatus());
}
+ @Test
public void testHandleNoInitialResponse() throws Exception
{
final AuthenticationResult result = _negotiator.handleResponse(new byte[0]);
- assertEquals("Unexpected authentication status", AuthenticationResult.AuthenticationStatus.CONTINUE, result.getStatus());
+ assertEquals("Unexpected authentication status",
+ AuthenticationResult.AuthenticationStatus.CONTINUE,
+ result.getStatus());
assertArrayEquals("Unexpected authentication challenge", new byte[0], result.getChallenge());
}
+ @Test
public void testHandleNoInitialResponseNull() throws Exception
{
final AuthenticationResult result = _negotiator.handleResponse(null);
- assertEquals("Unexpected authentication status", AuthenticationResult.AuthenticationStatus.CONTINUE, result.getStatus());
+ assertEquals("Unexpected authentication status",
+ AuthenticationResult.AuthenticationStatus.CONTINUE,
+ result.getStatus());
assertArrayEquals("Unexpected authentication challenge", new byte[0], result.getChallenge());
}
}
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/plain/PlainNegotiatorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiatorTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiatorTest.java
index ba53e60..8571151 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiatorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiatorTest.java
@@ -22,6 +22,7 @@ package org.apache.qpid.server.security.auth.sasl.plain;
import static java.nio.charset.StandardCharsets.US_ASCII;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import static org.mockito.AdditionalMatchers.not;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
@@ -29,11 +30,15 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.manager.UsernamePasswordAuthenticationProvider;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class PlainNegotiatorTest extends QpidTestCase
+public class PlainNegotiatorTest extends UnitTestBase
{
private static final String VALID_PASSWORD = "testPassword";
private static final String VALID_USERNAME = "testUsername";
@@ -44,10 +49,9 @@ public class PlainNegotiatorTest extends QpidTestCase
private AuthenticationResult _successfulResult;
private AuthenticationResult _errorResult;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_successfulResult = mock(AuthenticationResult.class);
_errorResult = mock(AuthenticationResult.class);
_authenticationProvider = mock(UsernamePasswordAuthenticationProvider.class);
@@ -57,16 +61,16 @@ public class PlainNegotiatorTest extends QpidTestCase
_negotiator = new PlainNegotiator(_authenticationProvider);
}
- @Override
+ @After
public void tearDown() throws Exception
{
- super.tearDown();
if (_negotiator != null)
{
_negotiator.dispose();
}
}
+ @Test
public void testHandleResponse() throws Exception
{
final AuthenticationResult result = _negotiator.handleResponse(VALID_RESPONSE.getBytes(US_ASCII));
@@ -74,50 +78,66 @@ public class PlainNegotiatorTest extends QpidTestCase
assertEquals("Unexpected authentication result", _successfulResult, result);
}
+ @Test
public void testMultipleAuthenticationAttempts() throws Exception
{
final AuthenticationResult firstResult = _negotiator.handleResponse(VALID_RESPONSE.getBytes(US_ASCII));
assertEquals("Unexpected first authentication result", _successfulResult, firstResult);
final AuthenticationResult secondResult = _negotiator.handleResponse(VALID_RESPONSE.getBytes(US_ASCII));
- assertEquals("Unexpected second authentication result", AuthenticationResult.AuthenticationStatus.ERROR, secondResult.getStatus());
+ assertEquals("Unexpected second authentication result",
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ secondResult.getStatus());
}
+ @Test
public void testHandleInvalidUser() throws Exception
{
final AuthenticationResult result = _negotiator.handleResponse(String.format(RESPONSE_FORMAT_STRING, "invalidUser", VALID_PASSWORD).getBytes(US_ASCII));
assertEquals("Unexpected authentication result", _errorResult, result);
}
+ @Test
public void testHandleInvalidPassword() throws Exception
{
final AuthenticationResult result = _negotiator.handleResponse(String.format(RESPONSE_FORMAT_STRING, VALID_USERNAME, "invalidPassword").getBytes(US_ASCII));
assertEquals("Unexpected authentication result", _errorResult, result);
}
+ @Test
public void testHandleNeverSendAResponse() throws Exception
{
final AuthenticationResult firstResult = _negotiator.handleResponse(new byte[0]);
- assertEquals("Unexpected authentication status", AuthenticationResult.AuthenticationStatus.CONTINUE, firstResult.getStatus());
+ assertEquals("Unexpected authentication status",
+ AuthenticationResult.AuthenticationStatus.CONTINUE,
+ firstResult.getStatus());
assertArrayEquals("Unexpected authentication challenge", new byte[0], firstResult.getChallenge());
final AuthenticationResult secondResult = _negotiator.handleResponse(new byte[0]);
- assertEquals("Unexpected first authentication result", AuthenticationResult.AuthenticationStatus.ERROR, secondResult.getStatus());
+ assertEquals("Unexpected first authentication result",
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ secondResult.getStatus());
}
+ @Test
public void testHandleNoInitialResponse() throws Exception
{
final AuthenticationResult result = _negotiator.handleResponse(new byte[0]);
- assertEquals("Unexpected authentication status", AuthenticationResult.AuthenticationStatus.CONTINUE, result.getStatus());
+ assertEquals("Unexpected authentication status",
+ AuthenticationResult.AuthenticationStatus.CONTINUE,
+ result.getStatus());
assertArrayEquals("Unexpected authentication challenge", new byte[0], result.getChallenge());
final AuthenticationResult firstResult = _negotiator.handleResponse(VALID_RESPONSE.getBytes());
assertEquals("Unexpected first authentication result", _successfulResult, firstResult);
}
+ @Test
public void testHandleNoInitialResponseNull() throws Exception
{
final AuthenticationResult result = _negotiator.handleResponse(null);
- assertEquals("Unexpected authentication status", AuthenticationResult.AuthenticationStatus.CONTINUE, result.getStatus());
+ assertEquals("Unexpected authentication status",
+ AuthenticationResult.AuthenticationStatus.CONTINUE,
+ result.getStatus());
assertArrayEquals("Unexpected authentication challenge", new byte[0], result.getChallenge());
final AuthenticationResult firstResult = _negotiator.handleResponse(VALID_RESPONSE.getBytes());
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/scram/ScramNegotiatorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java
index cc3abdf..48e6440 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java
@@ -21,6 +21,10 @@
package org.apache.qpid.server.security.auth.sasl.scram;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -38,6 +42,10 @@ import javax.crypto.spec.SecretKeySpec;
import javax.security.sasl.SaslException;
import javax.xml.bind.DatatypeConverter;
+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;
@@ -49,10 +57,10 @@ import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.manager.ScramSHA1AuthenticationManager;
import org.apache.qpid.server.security.auth.manager.ScramSHA256AuthenticationManager;
import org.apache.qpid.server.security.auth.sasl.PasswordSource;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.server.util.Strings;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class ScramNegotiatorTest extends QpidTestCase
+public class ScramNegotiatorTest extends UnitTestBase
{
private static final String VALID_USER_NAME = "testUser";
private static final String VALID_USER_PASSWORD = "testPassword";
@@ -69,10 +77,9 @@ public class ScramNegotiatorTest extends QpidTestCase
private AuthenticationProvider<?> _authenticationProvider;
private Broker<?> _broker;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_clientNonce = UUID.randomUUID().toString();
_passwordSource = mock(PasswordSource.class);
when(_passwordSource.getPassword(eq(VALID_USER_NAME))).thenReturn(VALID_USER_PASSWORD.toCharArray());
@@ -80,12 +87,11 @@ public class ScramNegotiatorTest extends QpidTestCase
_broker = BrokerTestHelper.createBrokerMock();
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
{
- super.tearDown();
}
finally
{
@@ -93,6 +99,7 @@ public class ScramNegotiatorTest extends QpidTestCase
}
}
+ @Test
public void testHandleResponseForScramSha256ValidCredentialsAdapterSource() throws Exception
{
final ScramSaslServerSource scramSaslServerSource =
@@ -105,6 +112,7 @@ public class ScramNegotiatorTest extends QpidTestCase
scramSaslServerSource);
}
+ @Test
public void testHandleResponseForScramSha1ValidCredentialsAdapterSource() throws Exception
{
final ScramSaslServerSource scramSaslServerSource =
@@ -117,6 +125,7 @@ public class ScramNegotiatorTest extends QpidTestCase
scramSaslServerSource);
}
+ @Test
public void testHandleResponseForScramSha256InvalidPasswordAdapterSource() throws Exception
{
final ScramSaslServerSource scramSaslServerSource =
@@ -131,6 +140,7 @@ public class ScramNegotiatorTest extends QpidTestCase
scramSaslServerSource);
}
+ @Test
public void testHandleResponseForScramSha1InvalidPasswordAdapterSource() throws Exception
{
final ScramSaslServerSource scramSaslServerSource =
@@ -145,6 +155,7 @@ public class ScramNegotiatorTest extends QpidTestCase
scramSaslServerSource);
}
+ @Test
public void testHandleResponseForScramSha256InvalidUsernameAdapterSource() throws Exception
{
final ScramSaslServerSource scramSaslServerSource =
@@ -159,6 +170,7 @@ public class ScramNegotiatorTest extends QpidTestCase
scramSaslServerSource);
}
+ @Test
public void testHandleResponseForScramSha1InvalidUsernameAdapterSource() throws Exception
{
final ScramSaslServerSource scramSaslServerSource =
@@ -173,6 +185,7 @@ public class ScramNegotiatorTest extends QpidTestCase
scramSaslServerSource);
}
+ @Test
public void testHandleResponseForScramSha256ValidCredentialsAuthenticationProvider() throws Exception
{
_authenticationProvider = createTestAuthenticationManager(ScramSHA256AuthenticationManager.PROVIDER_TYPE);
@@ -180,6 +193,7 @@ public class ScramNegotiatorTest extends QpidTestCase
(ScramSaslServerSource) _authenticationProvider);
}
+ @Test
public void testHandleResponseForScramSha1ValidCredentialsAuthenticationProvider() throws Exception
{
_authenticationProvider = createTestAuthenticationManager(ScramSHA1AuthenticationManager.PROVIDER_TYPE);
@@ -187,6 +201,7 @@ public class ScramNegotiatorTest extends QpidTestCase
(ScramSaslServerSource) _authenticationProvider);
}
+ @Test
public void testHandleResponseForScramSha256InvalidPasswordAuthenticationProvider() throws Exception
{
_authenticationProvider = createTestAuthenticationManager(ScramSHA256AuthenticationManager.PROVIDER_TYPE);
@@ -197,6 +212,7 @@ public class ScramNegotiatorTest extends QpidTestCase
(ScramSaslServerSource) _authenticationProvider);
}
+ @Test
public void testHandleResponseForScramSha1InvalidPasswordAuthenticationProvider() throws Exception
{
_authenticationProvider = createTestAuthenticationManager(ScramSHA1AuthenticationManager.PROVIDER_TYPE);
@@ -207,6 +223,7 @@ public class ScramNegotiatorTest extends QpidTestCase
(ScramSaslServerSource) _authenticationProvider);
}
+ @Test
public void testHandleResponseForScramSha256InvalidUsernameAuthenticationProvider() throws Exception
{
_authenticationProvider = createTestAuthenticationManager(ScramSHA256AuthenticationManager.PROVIDER_TYPE);
@@ -217,6 +234,7 @@ public class ScramNegotiatorTest extends QpidTestCase
(ScramSaslServerSource) _authenticationProvider);
}
+ @Test
public void testHandleResponseForScramSha1InvalidUsernameAuthenticationProvider() throws Exception
{
_authenticationProvider = createTestAuthenticationManager(ScramSHA1AuthenticationManager.PROVIDER_TYPE);
@@ -240,8 +258,9 @@ public class ScramNegotiatorTest extends QpidTestCase
AuthenticationResult firstResult = scramNegotiator.handleResponse(initialResponse);
assertEquals("Unexpected first result status",
- AuthenticationResult.AuthenticationStatus.CONTINUE,
- firstResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.CONTINUE,
+ firstResult.getStatus());
+
assertNotNull("Unexpected first result challenge", firstResult.getChallenge());
byte[] response = calculateClientProof(firstResult.getChallenge(),
@@ -250,10 +269,12 @@ public class ScramNegotiatorTest extends QpidTestCase
VALID_USER_PASSWORD);
AuthenticationResult secondResult = scramNegotiator.handleResponse(response);
assertEquals("Unexpected second result status",
- AuthenticationResult.AuthenticationStatus.SUCCESS,
- secondResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.SUCCESS,
+ secondResult.getStatus());
assertNotNull("Unexpected second result challenge", secondResult.getChallenge());
- assertEquals("Unexpected second result principal", VALID_USER_NAME, secondResult.getMainPrincipal().getName());
+ assertEquals("Unexpected second result principal",
+ VALID_USER_NAME,
+ secondResult.getMainPrincipal().getName());
String serverFinalMessage = new String(secondResult.getChallenge(), ASCII);
String[] parts = serverFinalMessage.split(",");
@@ -269,8 +290,8 @@ public class ScramNegotiatorTest extends QpidTestCase
AuthenticationResult thirdResult = scramNegotiator.handleResponse(initialResponse);
assertEquals("Unexpected result status after completion of negotiation",
- AuthenticationResult.AuthenticationStatus.ERROR,
- thirdResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ thirdResult.getStatus());
assertNull("Unexpected principal after completion of negotiation", thirdResult.getMainPrincipal());
}
@@ -288,8 +309,8 @@ public class ScramNegotiatorTest extends QpidTestCase
byte[] initialResponse = createInitialResponse(userName);
AuthenticationResult firstResult = scramNegotiator.handleResponse(initialResponse);
assertEquals("Unexpected first result status",
- AuthenticationResult.AuthenticationStatus.CONTINUE,
- firstResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.CONTINUE,
+ firstResult.getStatus());
assertNotNull("Unexpected first result challenge", firstResult.getChallenge());
byte[] response = calculateClientProof(firstResult.getChallenge(),
@@ -298,8 +319,8 @@ public class ScramNegotiatorTest extends QpidTestCase
userPassword);
AuthenticationResult secondResult = scramNegotiator.handleResponse(response);
assertEquals("Unexpected second result status",
- AuthenticationResult.AuthenticationStatus.ERROR,
- secondResult.getStatus());
+ AuthenticationResult.AuthenticationStatus.ERROR,
+ secondResult.getStatus());
assertNull("Unexpected second result challenge", secondResult.getChallenge());
assertNull("Unexpected second result principal", secondResult.getMainPrincipal());
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java
index 59f9d1a..7d287a6 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java
@@ -20,6 +20,10 @@
*/
package org.apache.qpid.server.security.encryption;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
@@ -45,31 +49,33 @@ import java.util.UUID;
import javax.crypto.Cipher;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.SystemConfig;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AESKeyFileEncrypterFactoryTest extends QpidTestCase
+public class AESKeyFileEncrypterFactoryTest extends UnitTestBase
{
private Broker _broker;
private Path _tmpDir;
private AESKeyFileEncrypterFactory _factory;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_broker = mock(Broker.class);
_tmpDir = Files.createTempDirectory(getTestName());
when(_broker.getContextKeys(eq(false))).thenReturn(Collections.<String>emptySet());
when(_broker.getContextValue(eq(String.class), eq(SystemConfig.QPID_WORK_DIR))).thenReturn(_tmpDir.toString());
when(_broker.getCategoryClass()).thenReturn(Broker.class);
- when(_broker.getName()).thenReturn(getName());
+ when(_broker.getName()).thenReturn(getTestName());
final ArgumentCaptor<Map> attributesCaptor = ArgumentCaptor.forClass(Map.class);
doAnswer(new Answer<Void>()
@@ -90,6 +96,7 @@ public class AESKeyFileEncrypterFactoryTest extends QpidTestCase
_factory = new AESKeyFileEncrypterFactory();
}
+ @Test
public void testCreateKeyInDefaultLocation() throws Exception
{
if(isStrongEncryptionEnabled() && supportsPosixFileAttributes())
@@ -120,9 +127,9 @@ public class AESKeyFileEncrypterFactoryTest extends QpidTestCase
// check the encrypter works
assertEquals(secret, encrypter.decrypt(encrypter.encrypt(secret)));
-
}
+ @Test
public void testSettingContextKeyLeadsToFileCreation() throws Exception
{
if(isStrongEncryptionEnabled() && supportsPosixFileAttributes())
@@ -144,6 +151,7 @@ public class AESKeyFileEncrypterFactoryTest extends QpidTestCase
}
+ @Test
public void testUnableToCreateFileInSpecifiedLocation() throws Exception
{
if(isStrongEncryptionEnabled())
@@ -172,6 +180,7 @@ public class AESKeyFileEncrypterFactoryTest extends QpidTestCase
}
+ @Test
public void testPermissionsAreChecked() throws Exception
{
if(isStrongEncryptionEnabled() && supportsPosixFileAttributes())
@@ -204,6 +213,7 @@ public class AESKeyFileEncrypterFactoryTest extends QpidTestCase
}
}
+ @Test
public void testInvalidKey() throws Exception
{
if(isStrongEncryptionEnabled() && supportsPosixFileAttributes())
@@ -243,7 +253,7 @@ public class AESKeyFileEncrypterFactoryTest extends QpidTestCase
return Files.getFileAttributeView(_tmpDir, PosixFileAttributeView.class) != null;
}
- @Override
+ @After
public void tearDown() throws Exception
{
Files.walkFileTree(_tmpDir,
@@ -265,7 +275,6 @@ public class AESKeyFileEncrypterFactoryTest extends QpidTestCase
return FileVisitResult.CONTINUE;
}
});
- super.tearDown();
}
private boolean isStrongEncryptionEnabled() throws NoSuchAlgorithmException
@@ -283,7 +292,7 @@ public class AESKeyFileEncrypterFactoryTest extends QpidTestCase
public KeyFilePathChecker()
{
- this(AESKeyFileEncrypterFactory.DEFAULT_KEYS_SUBDIR_NAME, "Broker_" + AESKeyFileEncrypterFactoryTest.this.getName() + ".key");
+ this(AESKeyFileEncrypterFactory.DEFAULT_KEYS_SUBDIR_NAME, "Broker_" + getTestName() + ".key");
}
public KeyFilePathChecker(final String subdirName, final String fileName)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterTest.java
index 3feb458..371b683 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterTest.java
@@ -20,6 +20,12 @@
*/
package org.apache.qpid.server.security.encryption;
+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 java.nio.charset.StandardCharsets;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
@@ -32,13 +38,16 @@ import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.SecretKeySpec;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AESKeyFileEncrypterTest extends QpidTestCase
+public class AESKeyFileEncrypterTest extends UnitTestBase
{
private final SecureRandom _random = new SecureRandom();
public static final String PLAINTEXT = "notaverygoodpassword";
+ @Test
public void testSimpleEncryptDecrypt() throws Exception
{
if(isStrongEncryptionEnabled())
@@ -48,6 +57,7 @@ public class AESKeyFileEncrypterTest extends QpidTestCase
}
+ @Test
public void testRepeatedEncryptionsReturnDifferentValues() throws Exception
{
if(isStrongEncryptionEnabled())
@@ -64,7 +74,7 @@ public class AESKeyFileEncrypterTest extends QpidTestCase
encryptions.add(encrypter.encrypt(PLAINTEXT));
}
- assertEquals("Not all encryptions were distinct", iterations, encryptions.size());
+ assertEquals("Not all encryptions were distinct", (long) iterations, (long) encryptions.size());
for (String encrypted : encryptions)
{
@@ -73,6 +83,7 @@ public class AESKeyFileEncrypterTest extends QpidTestCase
}
}
+ @Test
public void testCreationFailsOnInvalidSecret() throws Exception
{
if(isStrongEncryptionEnabled())
@@ -101,6 +112,7 @@ public class AESKeyFileEncrypterTest extends QpidTestCase
}
}
+ @Test
public void testEncryptionOfEmptyString() throws Exception
{
if(isStrongEncryptionEnabled())
@@ -119,10 +131,11 @@ public class AESKeyFileEncrypterTest extends QpidTestCase
assertNotNull("Encrypter did not return a result from encryption", encrypted);
assertFalse("Plain text and encrypted version are equal", text.equals(encrypted));
String decrypted = encrypter.decrypt(encrypted);
- assertNotNull("Encrypter did not return a result from decryption",decrypted);
+ assertNotNull("Encrypter did not return a result from decryption", decrypted);
assertTrue("Encryption was not reversible", text.equals(decrypted));
}
+ @Test
public void testEncryptingNullFails() throws Exception
{
if(isStrongEncryptionEnabled())
@@ -142,6 +155,7 @@ public class AESKeyFileEncrypterTest extends QpidTestCase
}
}
+ @Test
public void testEncryptingVeryLargeSecret() throws Exception
{
if(isStrongEncryptionEnabled())
@@ -162,6 +176,7 @@ public class AESKeyFileEncrypterTest extends QpidTestCase
return Cipher.getMaxAllowedKeyLength("AES")>=256;
}
+ @Test
public void testDecryptNonsense() throws Exception
{
if(isStrongEncryptionEnabled())
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java
index 68a36ac..a9fb9ab 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java
@@ -19,6 +19,11 @@
*/
package org.apache.qpid.server.security.group;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -26,11 +31,13 @@ import java.io.IOException;
import java.util.Properties;
import java.util.Set;
-import org.apache.qpid.server.security.group.FileGroupDatabase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class FileGroupDatabaseTest extends QpidTestCase
+public class FileGroupDatabaseTest extends UnitTestBase
{
private static final String USER1 = "user1";
private static final String USER2 = "user2";
@@ -43,23 +50,26 @@ public class FileGroupDatabaseTest extends QpidTestCase
private FileGroupDatabase _groupDatabase = new FileGroupDatabase();
private String _groupFile;
+ @Test
public void testGetAllGroups() throws Exception
{
writeAndSetGroupFile("myGroup.users", USER1);
Set<String> groups = _groupDatabase.getAllGroups();
- assertEquals(1, groups.size());
+ assertEquals((long) 1, (long) groups.size());
assertTrue(groups.contains(MY_GROUP));
}
+ @Test
public void testGetAllGroupsWhenGroupFileEmpty() throws Exception
{
_groupDatabase.setGroupFile(_groupFile);
Set<String> groups = _groupDatabase.getAllGroups();
- assertEquals(0, groups.size());
+ assertEquals((long) 0, (long) groups.size());
}
+ @Test
public void testMissingGroupFile() throws Exception
{
try
@@ -73,6 +83,7 @@ public class FileGroupDatabaseTest extends QpidTestCase
}
}
+ @Test
public void testInvalidFormat() throws Exception
{
writeGroupFile("name.notvalid", USER1);
@@ -88,6 +99,7 @@ public class FileGroupDatabaseTest extends QpidTestCase
}
}
+ @Test
public void testGetUsersInGroup() throws Exception
{
writeGroupFile("myGroup.users", "user1,user2,user3");
@@ -96,18 +108,20 @@ public class FileGroupDatabaseTest extends QpidTestCase
Set<String> users = _groupDatabase.getUsersInGroup(MY_GROUP);
assertNotNull(users);
- assertEquals(3, users.size());
+ assertEquals((long) 3, (long) users.size());
}
+ @Test
public void testDuplicateUsersInGroupAreConflated() throws Exception
{
writeAndSetGroupFile("myGroup.users", "user1,user1,user3,user1");
Set<String> users = _groupDatabase.getUsersInGroup(MY_GROUP);
assertNotNull(users);
- assertEquals(2, users.size());
+ assertEquals((long) 2, (long) users.size());
}
+ @Test
public void testGetUsersWithEmptyGroup() throws Exception
{
writeAndSetGroupFile("myGroup.users", "");
@@ -117,6 +131,7 @@ public class FileGroupDatabaseTest extends QpidTestCase
assertTrue(users.isEmpty());
}
+ @Test
public void testGetUsersInNonExistentGroup() throws Exception
{
writeAndSetGroupFile("myGroup.users", "user1,user2,user3");
@@ -126,67 +141,73 @@ public class FileGroupDatabaseTest extends QpidTestCase
assertTrue(users.isEmpty());
}
+ @Test
public void testGetUsersInNullGroup() throws Exception
{
writeAndSetGroupFile();
assertTrue(_groupDatabase.getUsersInGroup(null).isEmpty());
}
+ @Test
public void testGetGroupPrincipalsForUserWhenUserBelongsToOneGroup() throws Exception
{
writeAndSetGroupFile("myGroup.users", "user1,user2");
Set<String> groups = _groupDatabase.getGroupsForUser(USER1);
- assertEquals(1, groups.size());
+ assertEquals((long) 1, (long) groups.size());
assertTrue(groups.contains(MY_GROUP));
}
+ @Test
public void testGetGroupPrincipalsForUserWhenUserBelongsToTwoGroup() throws Exception
{
writeAndSetGroupFile("myGroup1.users", "user1,user2",
"myGroup2.users", "user1,user3");
Set<String> groups = _groupDatabase.getGroupsForUser(USER1);
- assertEquals(2, groups.size());
+ assertEquals((long) 2, (long) groups.size());
assertTrue(groups.contains(MY_GROUP1));
assertTrue(groups.contains(MY_GROUP2));
}
+ @Test
public void testGetGroupPrincipalsForUserWhenUserAddedToGroup() throws Exception
{
writeAndSetGroupFile("myGroup1.users", "user1,user2",
"myGroup2.users", USER2);
Set<String> groups = _groupDatabase.getGroupsForUser(USER1);
- assertEquals(1, groups.size());
+ assertEquals((long) 1, (long) groups.size());
assertTrue(groups.contains(MY_GROUP1));
_groupDatabase.addUserToGroup(USER1, MY_GROUP2);
groups = _groupDatabase.getGroupsForUser(USER1);
- assertEquals(2, groups.size());
+ assertEquals((long) 2, (long) groups.size());
assertTrue(groups.contains(MY_GROUP1));
assertTrue(groups.contains(MY_GROUP2));
Set<String> users = _groupDatabase.getUsersInGroup(MY_GROUP2);
- assertEquals(2, users.size());
+ assertEquals((long) 2, (long) users.size());
assertTrue(users.contains(USER1));
assertTrue(users.contains(USER2));
}
+ @Test
public void testGetGroupPrincipalsForUserWhenUserRemovedFromGroup() throws Exception
{
writeAndSetGroupFile("myGroup1.users", "user1,user2",
"myGroup2.users", "user1,user2");
Set<String> groups = _groupDatabase.getGroupsForUser(USER1);
- assertEquals(2, groups.size());
+ assertEquals((long) 2, (long) groups.size());
assertTrue(groups.contains(MY_GROUP1));
assertTrue(groups.contains(MY_GROUP2));
_groupDatabase.removeUserFromGroup(USER1, MY_GROUP2);
groups = _groupDatabase.getGroupsForUser(USER1);
- assertEquals(1, groups.size());
+ assertEquals((long) 1, (long) groups.size());
assertTrue(groups.contains(MY_GROUP1));
}
+ @Test
public void testGetGroupPrincipalsForUserWhenUserAddedToGroupTheyAreAlreadyIn() throws Exception
{
writeAndSetGroupFile("myGroup.users", USER1);
@@ -194,64 +215,69 @@ public class FileGroupDatabaseTest extends QpidTestCase
Set<String> groups = _groupDatabase.getGroupsForUser(USER1);
- assertEquals(1, groups.size());
+ assertEquals((long) 1, (long) groups.size());
assertTrue(groups.contains(MY_GROUP));
Set<String> users = _groupDatabase.getUsersInGroup(MY_GROUP);
- assertEquals(1, users.size());
+ assertEquals((long) 1, (long) users.size());
assertTrue(users.contains(USER1));
}
+ @Test
public void testGetGroupPrincipalsForUserWhenUserNotKnown() throws Exception
{
writeAndSetGroupFile("myGroup.users", "user1,user2");
Set<String> groups = _groupDatabase.getGroupsForUser(USER3);
- assertEquals(0, groups.size());
+ assertEquals((long) 0, (long) groups.size());
}
+ @Test
public void testGetGroupPrincipalsForNullUser() throws Exception
{
writeAndSetGroupFile();
assertTrue(_groupDatabase.getGroupsForUser(null).isEmpty());
}
+ @Test
public void testAddUserToExistingGroup() throws Exception
{
writeAndSetGroupFile("myGroup.users", "user1,user2");
Set<String> users = _groupDatabase.getUsersInGroup(MY_GROUP);
assertNotNull(users);
- assertEquals(2, users.size());
+ assertEquals((long) 2, (long) users.size());
_groupDatabase.addUserToGroup(USER3, MY_GROUP);
users = _groupDatabase.getUsersInGroup(MY_GROUP);
assertNotNull(users);
- assertEquals(3, users.size());
+ assertEquals((long) 3, (long) users.size());
}
+ @Test
public void testAddUserToEmptyGroup() throws Exception
{
writeAndSetGroupFile("myGroup.users", "");
Set<String> users = _groupDatabase.getUsersInGroup(MY_GROUP);
assertNotNull(users);
- assertEquals(0, users.size());
+ assertEquals((long) 0, (long) users.size());
_groupDatabase.addUserToGroup(USER3, MY_GROUP);
users = _groupDatabase.getUsersInGroup(MY_GROUP);
assertNotNull(users);
- assertEquals(1, users.size());
+ assertEquals((long) 1, (long) users.size());
}
+ @Test
public void testAddUserToNonExistentGroup() throws Exception
{
writeAndSetGroupFile();
Set<String> users = _groupDatabase.getUsersInGroup(MY_GROUP);
assertNotNull(users);
- assertEquals(0, users.size());
+ assertEquals((long) 0, (long) users.size());
try
{
@@ -265,24 +291,26 @@ public class FileGroupDatabaseTest extends QpidTestCase
users = _groupDatabase.getUsersInGroup(MY_GROUP);
assertNotNull(users);
- assertEquals(0, users.size());
+ assertEquals((long) 0, (long) users.size());
}
+ @Test
public void testRemoveUserFromExistingGroup() throws Exception
{
writeAndSetGroupFile("myGroup.users", "user1,user2");
Set<String> users = _groupDatabase.getUsersInGroup(MY_GROUP);
assertNotNull(users);
- assertEquals(2, users.size());
+ assertEquals((long) 2, (long) users.size());
_groupDatabase.removeUserFromGroup(USER2, MY_GROUP);
users = _groupDatabase.getUsersInGroup(MY_GROUP);
assertNotNull(users);
- assertEquals(1, users.size());
+ assertEquals((long) 1, (long) users.size());
}
+ @Test
public void testRemoveUserFromNonexistentGroup() throws Exception
{
writeAndSetGroupFile();
@@ -300,6 +328,7 @@ public class FileGroupDatabaseTest extends QpidTestCase
assertTrue(_groupDatabase.getUsersInGroup(MY_GROUP).isEmpty());
}
+ @Test
public void testRemoveUserFromGroupTwice() throws Exception
{
writeAndSetGroupFile("myGroup.users", USER1);
@@ -312,97 +341,100 @@ public class FileGroupDatabaseTest extends QpidTestCase
assertTrue(_groupDatabase.getUsersInGroup(MY_GROUP).isEmpty());
}
+ @Test
public void testAddUserPersistedToFile() throws Exception
{
writeAndSetGroupFile("myGroup.users", "user1,user2");
Set<String> users = _groupDatabase.getUsersInGroup(MY_GROUP);
- assertEquals(2, users.size());
+ assertEquals((long) 2, (long) users.size());
_groupDatabase.addUserToGroup(USER3, MY_GROUP);
- assertEquals(3, users.size());
+ assertEquals((long) 3, (long) users.size());
FileGroupDatabase newGroupDatabase = new FileGroupDatabase();
newGroupDatabase.setGroupFile(_groupFile);
Set<String> newUsers = newGroupDatabase.getUsersInGroup(MY_GROUP);
- assertEquals(users.size(), newUsers.size());
+ assertEquals((long) users.size(), (long) newUsers.size());
}
+ @Test
public void testRemoveUserPersistedToFile() throws Exception
{
writeAndSetGroupFile("myGroup.users", "user1,user2");
Set<String> users = _groupDatabase.getUsersInGroup(MY_GROUP);
- assertEquals(2, users.size());
+ assertEquals((long) 2, (long) users.size());
_groupDatabase.removeUserFromGroup(USER2, MY_GROUP);
- assertEquals(1, users.size());
+ assertEquals((long) 1, (long) users.size());
FileGroupDatabase newGroupDatabase = new FileGroupDatabase();
newGroupDatabase.setGroupFile(_groupFile);
Set<String> newUsers = newGroupDatabase.getUsersInGroup(MY_GROUP);
- assertEquals(users.size(), newUsers.size());
+ assertEquals((long) users.size(), (long) newUsers.size());
}
+ @Test
public void testCreateGroupPersistedToFile() throws Exception
{
writeAndSetGroupFile();
Set<String> groups = _groupDatabase.getAllGroups();
- assertEquals(0, groups.size());
+ assertEquals((long) 0, (long) groups.size());
_groupDatabase.createGroup(MY_GROUP);
groups = _groupDatabase.getAllGroups();
- assertEquals(1, groups.size());
+ assertEquals((long) 1, (long) groups.size());
assertTrue(groups.contains(MY_GROUP));
FileGroupDatabase newGroupDatabase = new FileGroupDatabase();
newGroupDatabase.setGroupFile(_groupFile);
Set<String> newGroups = newGroupDatabase.getAllGroups();
- assertEquals(1, newGroups.size());
+ assertEquals((long) 1, (long) newGroups.size());
assertTrue(newGroups.contains(MY_GROUP));
}
+ @Test
public void testRemoveGroupPersistedToFile() throws Exception
{
writeAndSetGroupFile("myGroup1.users", "user1,user2",
"myGroup2.users", "user1,user2");
Set<String> groups = _groupDatabase.getAllGroups();
- assertEquals(2, groups.size());
+ assertEquals((long) 2, (long) groups.size());
Set<String> groupsForUser1 = _groupDatabase.getGroupsForUser(USER1);
- assertEquals(2, groupsForUser1.size());
+ assertEquals((long) 2, (long) groupsForUser1.size());
_groupDatabase.removeGroup(MY_GROUP1);
groups = _groupDatabase.getAllGroups();
- assertEquals(1, groups.size());
+ assertEquals((long) 1, (long) groups.size());
assertTrue(groups.contains(MY_GROUP2));
groupsForUser1 = _groupDatabase.getGroupsForUser(USER1);
- assertEquals(1, groupsForUser1.size());
+ assertEquals((long) 1, (long) groupsForUser1.size());
FileGroupDatabase newGroupDatabase = new FileGroupDatabase();
newGroupDatabase.setGroupFile(_groupFile);
Set<String> newGroups = newGroupDatabase.getAllGroups();
- assertEquals(1, newGroups.size());
+ assertEquals((long) 1, (long) newGroups.size());
assertTrue(newGroups.contains(MY_GROUP2));
Set<String> newGroupsForUser1 = newGroupDatabase.getGroupsForUser(USER1);
- assertEquals(1, newGroupsForUser1.size());
+ assertEquals((long) 1, (long) newGroupsForUser1.size());
assertTrue(newGroupsForUser1.contains(MY_GROUP2));
-}
+ }
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
_groupFile = createEmptyTestGroupFile();
}
@@ -441,10 +473,9 @@ public class FileGroupDatabaseTest extends QpidTestCase
return tmpGroupFile.getAbsolutePath();
}
- @Override
- protected void tearDown() throws Exception
+ @After
+ public void tearDown() throws Exception
{
- super.tearDown();
if (_groupFile != null)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/group/GroupPrincipalTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/group/GroupPrincipalTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/group/GroupPrincipalTest.java
index 8f28280..c7254ac 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/group/GroupPrincipalTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/group/GroupPrincipalTest.java
@@ -20,19 +20,27 @@
*/
package org.apache.qpid.server.security.group;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+
import org.apache.qpid.server.model.GroupProvider;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
+import org.apache.qpid.test.utils.UnitTestBase;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class GroupPrincipalTest extends QpidTestCase
+public class GroupPrincipalTest extends UnitTestBase
{
+ @Test
public void testGetName()
{
final GroupPrincipal principal = new GroupPrincipal("group", (GroupProvider) null);
assertEquals("group", principal.getName());
}
+ @Test
public void testAddRejected()
{
final GroupPrincipal principal = new GroupPrincipal("group", (GroupProvider) null);
@@ -49,6 +57,7 @@ public class GroupPrincipalTest extends QpidTestCase
}
}
+ @Test
public void testEqualitySameName()
{
final String string = "string";
@@ -57,6 +66,7 @@ public class GroupPrincipalTest extends QpidTestCase
assertTrue(principal1.equals(principal2));
}
+ @Test
public void testEqualityEqualName()
{
final GroupPrincipal principal1 = new GroupPrincipal(new String("string"), (GroupProvider) null);
@@ -64,6 +74,7 @@ public class GroupPrincipalTest extends QpidTestCase
assertTrue(principal1.equals(principal2));
}
+ @Test
public void testInequalityDifferentGroupPrincipals()
{
GroupPrincipal principal1 = new GroupPrincipal("string1", (GroupProvider) null);
@@ -71,12 +82,14 @@ public class GroupPrincipalTest extends QpidTestCase
assertFalse(principal1.equals(principal2));
}
+ @Test
public void testInequalityNonGroupPrincipal()
{
GroupPrincipal principal = new GroupPrincipal("string", (GroupProvider) null);
assertFalse(principal.equals(new UsernamePrincipal("string", null)));
}
+ @Test
public void testInequalityNull()
{
GroupPrincipal principal = new GroupPrincipal("string", (GroupProvider) null);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/ssl/TrustManagerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/ssl/TrustManagerTest.java b/broker-core/src/test/java/org/apache/qpid/server/ssl/TrustManagerTest.java
index f152796..093cc2c 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/ssl/TrustManagerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/ssl/TrustManagerTest.java
@@ -18,6 +18,9 @@
package org.apache.qpid.server.ssl;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.cert.Certificate;
@@ -30,13 +33,15 @@ import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.test.utils.TestSSLConstants;
+import org.junit.Test;
+
import org.apache.qpid.server.transport.network.security.ssl.QpidMultipleTrustManager;
import org.apache.qpid.server.transport.network.security.ssl.QpidPeersOnlyTrustManager;
import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.test.utils.TestSSLConstants;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class TrustManagerTest extends QpidTestCase
+public class TrustManagerTest extends UnitTestBase
{
private static final String STORE_TYPE = "JKS";
private static final String DEFAULT_TRUST_MANAGER_ALGORITHM = TrustManagerFactory.getDefaultAlgorithm();
@@ -67,6 +72,7 @@ public class TrustManagerTest extends QpidTestCase
* Tests that the QpidPeersOnlyTrustManager gives the expected behaviour when loaded separately
* with the broker peerstore and truststore.
*/
+ @Test
public void testQpidPeersOnlyTrustManager() throws Exception
{
// first let's check that peer manager loaded with the PEERstore succeeds
@@ -156,6 +162,7 @@ public class TrustManagerTest extends QpidTestCase
* Tests that the QpidMultipleTrustManager gives the expected behaviour when wrapping a
* regular TrustManager against the broker truststore.
*/
+ @Test
public void testQpidMultipleTrustManagerWithRegularTrustStore() throws Exception
{
final QpidMultipleTrustManager mulTrustManager = new QpidMultipleTrustManager();
@@ -214,6 +221,7 @@ public class TrustManagerTest extends QpidTestCase
* Tests that the QpidMultipleTrustManager gives the expected behaviour when wrapping a
* QpidPeersOnlyTrustManager against the broker peerstore.
*/
+ @Test
public void testQpidMultipleTrustManagerWithPeerStore() throws Exception
{
final QpidMultipleTrustManager mulTrustManager = new QpidMultipleTrustManager();
@@ -274,6 +282,7 @@ public class TrustManagerTest extends QpidTestCase
* QpidPeersOnlyTrustManager against the broker peerstore, a regular TrustManager
* against the broker truststore.
*/
+ @Test
public void testQpidMultipleTrustManagerWithTrustAndPeerStores() throws Exception
{
final QpidMultipleTrustManager mulTrustManager = new QpidMultipleTrustManager();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/stats/FormattingStatisticsResolverTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/stats/FormattingStatisticsResolverTest.java b/broker-core/src/test/java/org/apache/qpid/server/stats/FormattingStatisticsResolverTest.java
index 8864261..afb55ee 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/stats/FormattingStatisticsResolverTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/stats/FormattingStatisticsResolverTest.java
@@ -21,6 +21,7 @@
package org.apache.qpid.server.stats;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -28,11 +29,13 @@ import java.util.Date;
import java.util.Map;
import com.google.common.collect.Maps;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class FormattingStatisticsResolverTest extends QpidTestCase
+public class FormattingStatisticsResolverTest extends UnitTestBase
{
private static final String LARGEST_POSITIVE_VALUE_STAT_NAME = "largestPositiveValue";
private static final String LARGER_POSITIVE_VALUE_STAT_NAME = "largerPositiveValue";
@@ -45,10 +48,9 @@ public class FormattingStatisticsResolverTest extends QpidTestCase
private FormattingStatisticsResolver _resolver;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
final ConfiguredObject<?> object = mock(ConfiguredObject.class);
final Map<String, Object> statisticsMap = Maps.newHashMap();
@@ -65,6 +67,7 @@ public class FormattingStatisticsResolverTest extends QpidTestCase
_resolver = new FormattingStatisticsResolver(object);
}
+ @Test
public void testNoFormatting() throws Exception
{
assertEquals("10", _resolver.resolve(POSITIVE_VALUE_STAT_NAME, null));
@@ -72,29 +75,47 @@ public class FormattingStatisticsResolverTest extends QpidTestCase
assertEquals("-1", _resolver.resolve(NEGATIVE_VALUE_STAT_NAME, null));
}
+ @Test
public void testDuration() throws Exception
{
- assertEquals("PT17M28.577S", _resolver.resolve(LARGEST_POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.DURATION, null));
- assertEquals("PT0S", _resolver.resolve(ZERO_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.DURATION, null));
- assertEquals("-", _resolver.resolve(NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.DURATION, null));
+ assertEquals("PT17M28.577S",
+ _resolver.resolve(LARGEST_POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.DURATION, null));
+ assertEquals("PT0S",
+ _resolver.resolve(ZERO_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.DURATION, null));
+ assertEquals("-",
+ _resolver.resolve(NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.DURATION, null));
}
+ @Test
public void testDateTime() throws Exception
{
- assertEquals("1970-01-01T00:00:00Z", _resolver.resolve(ZERO_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.DATETIME, null));
- assertEquals("1970-01-01T00:00:00Z", _resolver.resolve(EPOCH_DATE_STAT_NAME + ":" + FormattingStatisticsResolver.DATETIME, null));
- assertEquals("-", _resolver.resolve(NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.DATETIME, null));
+ assertEquals("1970-01-01T00:00:00Z",
+ _resolver.resolve(ZERO_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.DATETIME,
+ null));
+ assertEquals("1970-01-01T00:00:00Z",
+ _resolver.resolve(EPOCH_DATE_STAT_NAME + ":" + FormattingStatisticsResolver.DATETIME, null));
+ assertEquals("-",
+ _resolver.resolve(NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.DATETIME,
+ null));
}
+ @Test
public void testIEC80000BinaryPrefixed() throws Exception
{
- assertEquals("1.0 MiB", _resolver.resolve(LARGEST_POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
- assertEquals("1.0 KiB", _resolver.resolve(LARGER_POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
- assertEquals("10 B", _resolver.resolve(POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
- assertEquals("0 B", _resolver.resolve(ZERO_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
- assertEquals("-1 B", _resolver.resolve(NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
- assertEquals("-1.0 KiB", _resolver.resolve(SMALLER_NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
- assertEquals("-1.0 MiB", _resolver.resolve(SMALLEST_NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
+ assertEquals("1.0 MiB",
+ _resolver.resolve(LARGEST_POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
+ assertEquals("1.0 KiB",
+ _resolver.resolve(LARGER_POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
+ assertEquals("10 B",
+ _resolver.resolve(POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
+ assertEquals("0 B",
+ _resolver.resolve(ZERO_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
+ assertEquals("-1 B",
+ _resolver.resolve(NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
+ assertEquals("-1.0 KiB",
+ _resolver.resolve(SMALLER_NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
+ assertEquals("-1.0 MiB",
+ _resolver.resolve(SMALLEST_NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/store/AbstractConfigurationStoreUpgraderAndRecovererTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/store/AbstractConfigurationStoreUpgraderAndRecovererTest.java b/broker-core/src/test/java/org/apache/qpid/server/store/AbstractConfigurationStoreUpgraderAndRecovererTest.java
index 2100838..84e0980 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/store/AbstractConfigurationStoreUpgraderAndRecovererTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/store/AbstractConfigurationStoreUpgraderAndRecovererTest.java
@@ -19,20 +19,25 @@
package org.apache.qpid.server.store;
-import org.apache.qpid.test.utils.QpidTestCase;
+import static org.junit.Assert.fail;
-public class AbstractConfigurationStoreUpgraderAndRecovererTest extends QpidTestCase
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+
+public class AbstractConfigurationStoreUpgraderAndRecovererTest extends UnitTestBase
{
private TestConfigurationStoreUpgraderAndRecoverer _recoverer;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
_recoverer = new TestConfigurationStoreUpgraderAndRecoverer();
}
+ @Test
public void testRegister()
{
_recoverer.register(new TestStoreUpgraderPhase("0.0", "1.0"));
@@ -40,6 +45,7 @@ public class AbstractConfigurationStoreUpgraderAndRecovererTest extends QpidTest
_recoverer.register(new TestStoreUpgraderPhase("1.1", "2.0"));
}
+ @Test
public void testRegisterFailsOnUnknownFromVersion()
{
_recoverer.register(new TestStoreUpgraderPhase("0.0", "1.0"));
@@ -54,6 +60,7 @@ public class AbstractConfigurationStoreUpgraderAndRecovererTest extends QpidTest
}
}
+ @Test
public void testRegisterFailsOnNoVersionNumberChange()
{
_recoverer.register(new TestStoreUpgraderPhase("0.0", "1.0"));
@@ -68,6 +75,7 @@ public class AbstractConfigurationStoreUpgraderAndRecovererTest extends QpidTest
}
}
+ @Test
public void testRegisterFailsOnDuplicateFromVersion()
{
_recoverer.register(new TestStoreUpgraderPhase("0.0", "1.0"));
@@ -82,6 +90,7 @@ public class AbstractConfigurationStoreUpgraderAndRecovererTest extends QpidTest
}
}
+ @Test
public void testRegisterFailsOnUnexpectedFromVersionInFirstUpgrader()
{
try
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org