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:33 UTC
[26/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/logging/messages/BrokerMessagesTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
index aa18ddd..14164e4 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
@@ -23,11 +23,14 @@ package org.apache.qpid.server.logging.messages;
import java.text.NumberFormat;
import java.util.List;
+import org.junit.Test;
+
/**
* Test BRK log Messages
*/
public class BrokerMessagesTest extends AbstractTestMessages
{
+ @Test
public void testBrokerStartup()
{
String version = "Qpid 0.6";
@@ -41,6 +44,7 @@ public class BrokerMessagesTest extends AbstractTestMessages
validateLogMessage(log, "BRK-1001", expected);
}
+ @Test
public void testBrokerListening()
{
String transport = "TCP";
@@ -56,6 +60,7 @@ public class BrokerMessagesTest extends AbstractTestMessages
validateLogMessage(log, "BRK-1002", expected);
}
+ @Test
public void testBrokerShuttingDown()
{
String transport = "TCP";
@@ -70,6 +75,7 @@ public class BrokerMessagesTest extends AbstractTestMessages
validateLogMessage(log, "BRK-1003", expected);
}
+ @Test
public void testBrokerReady()
{
_logMessage = BrokerMessages.READY();
@@ -80,6 +86,7 @@ public class BrokerMessagesTest extends AbstractTestMessages
validateLogMessage(log, "BRK-1004", expected);
}
+ @Test
public void testBrokerStopped()
{
_logMessage = BrokerMessages.STOPPED();
@@ -90,6 +97,7 @@ public class BrokerMessagesTest extends AbstractTestMessages
validateLogMessage(log, "BRK-1005", expected);
}
+ @Test
public void testBrokerConfig()
{
String path = "/file/path/to/configuration.xml";
@@ -102,6 +110,7 @@ public class BrokerMessagesTest extends AbstractTestMessages
validateLogMessage(log, "BRK-1006", expected);
}
+ @Test
public void testBrokerPlatform()
{
String javaVendor = "jvendor";
@@ -121,6 +130,7 @@ public class BrokerMessagesTest extends AbstractTestMessages
validateLogMessage(log, "BRK-1010", expected);
}
+ @Test
public void testBrokerMemory()
{
long oneGiga = 1024*1024*1024;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
index 2f12765..b657273 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
@@ -22,11 +22,14 @@ package org.apache.qpid.server.logging.messages;
import java.util.List;
+import org.junit.Test;
+
/**
* Test CHN Log Messges
*/
public class ChannelMessagesTest extends AbstractTestMessages
{
+ @Test
public void testChannelCreate()
{
_logMessage = ChannelMessages.CREATE();
@@ -39,6 +42,7 @@ public class ChannelMessagesTest extends AbstractTestMessages
validateLogMessage(log, "CHN-1001", expected);
}
+ @Test
public void testChannelFlow()
{
String flow = "ON";
@@ -51,6 +55,7 @@ public class ChannelMessagesTest extends AbstractTestMessages
validateLogMessage(log, "CHN-1002", expected);
}
+ @Test
public void testChannelClose()
{
_logMessage = ChannelMessages.CLOSE();
@@ -61,6 +66,7 @@ public class ChannelMessagesTest extends AbstractTestMessages
validateLogMessage(log, "CHN-1003", expected);
}
+ @Test
public void testChannelCloseForced()
{
_logMessage = ChannelMessages.CLOSE_FORCED(1, "Test");
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
index 058f8b1..6ed208a 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
@@ -22,11 +22,14 @@ package org.apache.qpid.server.logging.messages;
import java.util.List;
+import org.junit.Test;
+
/**
* Test CON Log Messages
*/
public class ConnectionMessagesTest extends AbstractTestMessages
{
+ @Test
public void testConnectionOpen_WithOptional()
{
String port = "myport";
@@ -49,6 +52,7 @@ public class ConnectionMessagesTest extends AbstractTestMessages
validateLogMessage(log, "CON-1001", expected);
}
+ @Test
public void testConnectionOpen()
{
String port = "myport";
@@ -65,6 +69,7 @@ public class ConnectionMessagesTest extends AbstractTestMessages
validateLogMessage(log, "CON-1001", expected);
}
+ @Test
public void testSslConnectionOpen()
{
String port = "myport";
@@ -83,6 +88,7 @@ public class ConnectionMessagesTest extends AbstractTestMessages
}
+ @Test
public void testConnectionClose()
{
_logMessage = ConnectionMessages.CLOSE(null, false);
@@ -93,6 +99,7 @@ public class ConnectionMessagesTest extends AbstractTestMessages
validateLogMessage(log, "CON-1002", expected);
}
+ @Test
public void testConnectionCloseWithCause()
{
_logMessage = ConnectionMessages.CLOSE("Test", true);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ConsumerMessagesTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ConsumerMessagesTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ConsumerMessagesTest.java
index c7cd291..43327a5 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ConsumerMessagesTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ConsumerMessagesTest.java
@@ -22,11 +22,14 @@ package org.apache.qpid.server.logging.messages;
import java.util.List;
+import org.junit.Test;
+
/**
* Test SUB Log Messages
*/
public class ConsumerMessagesTest extends AbstractTestMessages
{
+ @Test
public void testSubscriptionCreateALL()
{
String arguments = "arguments";
@@ -39,6 +42,7 @@ public class ConsumerMessagesTest extends AbstractTestMessages
validateLogMessage(log, "SUB-1001", expected);
}
+ @Test
public void testSubscriptionCreateDurable()
{
_logMessage = SubscriptionMessages.CREATE(null, true, false);
@@ -49,6 +53,7 @@ public class ConsumerMessagesTest extends AbstractTestMessages
validateLogMessage(log, "SUB-1001", expected);
}
+ @Test
public void testSubscriptionCreateArguments()
{
String arguments = "arguments";
@@ -62,6 +67,7 @@ public class ConsumerMessagesTest extends AbstractTestMessages
}
+ @Test
public void testSubscriptionClose()
{
_logMessage = SubscriptionMessages.CLOSE();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
index 86610e5..7e6f044 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
@@ -22,6 +22,8 @@ package org.apache.qpid.server.logging.messages;
import java.util.List;
+import org.junit.Test;
+
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.BrokerTestHelper;
@@ -30,6 +32,7 @@ import org.apache.qpid.server.model.BrokerTestHelper;
*/
public class ExchangeMessagesTest extends AbstractTestMessages
{
+ @Test
public void testExchangeCreated_Transient() throws Exception
{
Exchange<?> exchange = BrokerTestHelper.createExchange("test", false, getEventLogger());
@@ -45,6 +48,7 @@ public class ExchangeMessagesTest extends AbstractTestMessages
validateLogMessageNoSubject(log, "EXH-1001", expected);
}
+ @Test
public void testExchangeCreated_Persistent() throws Exception
{
Exchange<?> exchange = BrokerTestHelper.createExchange("test", true, getEventLogger());
@@ -60,6 +64,7 @@ public class ExchangeMessagesTest extends AbstractTestMessages
validateLogMessageNoSubject(log, "EXH-1001", expected);
}
+ @Test
public void testExchangeDeleted()
{
_logMessage = ExchangeMessages.DELETED();
@@ -70,6 +75,7 @@ public class ExchangeMessagesTest extends AbstractTestMessages
validateLogMessage(log, "EXH-1002", expected);
}
+ @Test
public void testExchangeDiscardedMessage() throws Exception
{
Exchange<?> exchange = BrokerTestHelper.createExchange("test", false, getEventLogger());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
index 168572c..a473179 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
@@ -22,6 +22,8 @@ package org.apache.qpid.server.logging.messages;
import java.util.List;
+import org.junit.Test;
+
import org.apache.qpid.server.model.Transport;
/**
@@ -29,6 +31,7 @@ import org.apache.qpid.server.model.Transport;
*/
public class ManagementConsoleMessagesTest extends AbstractTestMessages
{
+ @Test
public void testManagementStartup()
{
_logMessage = ManagementConsoleMessages.STARTUP("My");
@@ -39,6 +42,7 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages
validateLogMessage(log, "MNG-1001", expected);
}
+ @Test
public void testManagementListening()
{
String management = "HTTP";
@@ -52,6 +56,7 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages
validateLogMessage(log, "MNG-1002", expected);
}
+ @Test
public void testManagementShuttingDown()
{
String transport = "HTTP";
@@ -65,6 +70,7 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages
validateLogMessage(log, "MNG-1003", expected);
}
+ @Test
public void testManagementReady()
{
_logMessage = ManagementConsoleMessages.READY("My");
@@ -75,6 +81,7 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages
validateLogMessage(log, "MNG-1004", expected);
}
+ @Test
public void testManagementStopped()
{
_logMessage = ManagementConsoleMessages.STOPPED("My");
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
index 3377573..2e27c6e 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
@@ -22,11 +22,14 @@ package org.apache.qpid.server.logging.messages;
import java.util.List;
+import org.junit.Test;
+
/**
* Test MST Log Messages
*/
public class MessageStoreMessagesTest extends AbstractTestMessages
{
+ @Test
public void testMessageStoreCreated()
{
_logMessage = MessageStoreMessages.CREATED();
@@ -37,6 +40,7 @@ public class MessageStoreMessagesTest extends AbstractTestMessages
validateLogMessage(log, "MST-1001", expected);
}
+ @Test
public void testMessageStoreStoreLocation()
{
String location = "/path/to/the/message/store.files";
@@ -49,6 +53,7 @@ public class MessageStoreMessagesTest extends AbstractTestMessages
validateLogMessage(log, "MST-1002", expected);
}
+ @Test
public void testMessageStoreClosed()
{
_logMessage = MessageStoreMessages.CLOSED();
@@ -59,7 +64,8 @@ public class MessageStoreMessagesTest extends AbstractTestMessages
validateLogMessage(log, "MST-1003", expected);
}
- public void testMessageStoreRecoveryStart()
+ @Test
+ public void testMessageStoreRecoveryStart()
{
_logMessage = MessageStoreMessages.RECOVERY_START();
List<Object> log = performLog();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
index 49fc3ca..038a634 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
@@ -22,11 +22,14 @@ package org.apache.qpid.server.logging.messages;
import java.util.List;
+import org.junit.Test;
+
/**
* Test QUE Log Messages
*/
public class QueueMessagesTest extends AbstractTestMessages
{
+ @Test
public void testQueueCreatedALL()
{
String owner = "guest";
@@ -42,6 +45,7 @@ public class QueueMessagesTest extends AbstractTestMessages
validateLogMessage(log, "QUE-1001", expected);
}
+ @Test
public void testQueueCreatedOwnerAutoDelete()
{
String owner = "guest";
@@ -54,6 +58,7 @@ public class QueueMessagesTest extends AbstractTestMessages
validateLogMessage(log, "QUE-1001", expected);
}
+ @Test
public void testQueueCreatedOwnerPriority()
{
String owner = "guest";
@@ -68,6 +73,7 @@ public class QueueMessagesTest extends AbstractTestMessages
validateLogMessage(log, "QUE-1001", expected);
}
+ @Test
public void testQueueCreatedOwnerAutoDeletePriority()
{
String owner = "guest";
@@ -83,6 +89,7 @@ public class QueueMessagesTest extends AbstractTestMessages
validateLogMessage(log, "QUE-1001", expected);
}
+ @Test
public void testQueueCreatedOwnerAutoDeleteTransient()
{
String owner = "guest";
@@ -96,6 +103,7 @@ public class QueueMessagesTest extends AbstractTestMessages
validateLogMessage(log, "QUE-1001", expected);
}
+ @Test
public void testQueueCreatedOwnerAutoDeleteTransientPriority()
{
String owner = "guest";
@@ -111,6 +119,7 @@ public class QueueMessagesTest extends AbstractTestMessages
validateLogMessage(log, "QUE-1001", expected);
}
+ @Test
public void testQueueCreatedOwnerAutoDeleteDurable()
{
String owner = "guest";
@@ -124,6 +133,7 @@ public class QueueMessagesTest extends AbstractTestMessages
validateLogMessage(log, "QUE-1001", expected);
}
+ @Test
public void testQueueCreatedOwnerAutoDeleteDurablePriority()
{
String owner = "guest";
@@ -139,6 +149,7 @@ public class QueueMessagesTest extends AbstractTestMessages
validateLogMessage(log, "QUE-1001", expected);
}
+ @Test
public void testQueueCreatedAutoDelete()
{
_logMessage = QueueMessages.CREATED("uuid", null, null, false, true, false, false, false);
@@ -149,6 +160,7 @@ public class QueueMessagesTest extends AbstractTestMessages
validateLogMessage(log, "QUE-1001", expected);
}
+ @Test
public void testQueueCreatedPriority()
{
Integer priority = 3;
@@ -162,6 +174,7 @@ public class QueueMessagesTest extends AbstractTestMessages
validateLogMessage(log, "QUE-1001", expected);
}
+ @Test
public void testQueueCreatedAutoDeletePriority()
{
Integer priority = 3;
@@ -176,6 +189,7 @@ public class QueueMessagesTest extends AbstractTestMessages
validateLogMessage(log, "QUE-1001", expected);
}
+ @Test
public void testQueueCreatedAutoDeleteTransient()
{
_logMessage = QueueMessages.CREATED("uuid", null, null, false, true, false, true, false);
@@ -187,6 +201,7 @@ public class QueueMessagesTest extends AbstractTestMessages
validateLogMessage(log, "QUE-1001", expected);
}
+ @Test
public void testQueueCreatedAutoDeleteTransientPriority()
{
Integer priority = 3;
@@ -201,6 +216,7 @@ public class QueueMessagesTest extends AbstractTestMessages
validateLogMessage(log, "QUE-1001", expected);
}
+ @Test
public void testQueueCreatedAutoDeleteDurable()
{
_logMessage = QueueMessages.CREATED("uuid", null, null, false, true, true, false, false);
@@ -212,6 +228,7 @@ public class QueueMessagesTest extends AbstractTestMessages
validateLogMessage(log, "QUE-1001", expected);
}
+ @Test
public void testQueueCreatedAutoDeleteDurablePriority()
{
Integer priority = 3;
@@ -226,6 +243,7 @@ public class QueueMessagesTest extends AbstractTestMessages
validateLogMessage(log, "QUE-1001", expected);
}
+ @Test
public void testQueueDeleted()
{
_logMessage = QueueMessages.DELETED("uuid");
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
index 5a272ff..deafe52 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
@@ -22,11 +22,14 @@ package org.apache.qpid.server.logging.messages;
import java.util.List;
+import org.junit.Test;
+
/**
* Test VHT Log Messages
*/
public class VirtualHostMessagesTest extends AbstractTestMessages
{
+ @Test
public void testVirtualhostCreated()
{
String name = "test";
@@ -38,6 +41,7 @@ public class VirtualHostMessagesTest extends AbstractTestMessages
validateLogMessage(log, "VHT-1001", expected);
}
+ @Test
public void testVirtualhostClosed()
{
String name = "test";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
index 26d67ac..3b4da0e 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
@@ -21,17 +21,25 @@
package org.apache.qpid.server.logging.subjects;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.util.List;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.logging.UnitTestMessageLogger;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.model.BrokerTestHelper;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
+
/**
* Abstract Test for LogSubject testing
@@ -44,23 +52,20 @@ import org.apache.qpid.test.utils.QpidTestCase;
* The resulting log file is then validated.
*
*/
-public abstract class AbstractTestLogSubject extends QpidTestCase
+public abstract class AbstractTestLogSubject extends UnitTestBase
{
protected LogSubject _subject = null;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
BrokerTestHelper.setUp();
}
- @Override
+ @After
public void tearDown() throws Exception
{
BrokerTestHelper.tearDown();
- super.tearDown();
-
}
protected List<Object> performLog(boolean statusUpdatesEnabled)
@@ -105,14 +110,14 @@ public abstract class AbstractTestLogSubject extends QpidTestCase
// This should return us MockProtocolSessionUser@null/test
String connectionSlice = getSlice("con:" + connectionID, message);
- assertNotNull("Unable to find connection 'con:" + connectionID + "' in '"+message+"'",
- connectionSlice);
+ assertNotNull("Unable to find connection 'con:" + connectionID + "' in '" + message + "'",
+ connectionSlice);
// Extract the userName
String[] userNameParts = connectionSlice.split("@");
assertEquals("Unable to split Username from rest of Connection:"
- + connectionSlice, 2, userNameParts.length);
+ + connectionSlice, (long) 2, (long) userNameParts.length);
assertEquals("Username not as expected", userNameParts[0], user);
@@ -123,7 +128,7 @@ public abstract class AbstractTestLogSubject extends QpidTestCase
// We will have three sections
assertEquals("Unable to split IP from rest of Connection:"
- + userNameParts[1] + " in '"+message+"'", 3, ipParts.length);
+ + userNameParts[1] + " in '" + message + "'", (long) 3, (long) ipParts.length);
// We need to skip the first '/' split will be empty so validate 1 as IP
assertEquals("IP not as expected", ipString, ipParts[1]);
@@ -144,8 +149,7 @@ public abstract class AbstractTestLogSubject extends QpidTestCase
assertNotNull("Routing Key not found:" + message, routingKeySlice);
- assertEquals("Routing key not correct",
- routingKey, routingKeySlice);
+ assertEquals("Routing key not correct", routingKey, routingKeySlice);
}
/**
@@ -160,8 +164,7 @@ public abstract class AbstractTestLogSubject extends QpidTestCase
assertNotNull("Queue not found:" + message, queueSlice);
- assertEquals("Queue name not correct",
- queue.getName(), queueSlice);
+ assertEquals("Queue name not correct", queue.getName(), queueSlice);
}
/**
@@ -179,15 +182,11 @@ public abstract class AbstractTestLogSubject extends QpidTestCase
String[] exchangeParts = exchangeSlice.split("/");
- assertEquals("Exchange should be in two parts ex(type/name)", 2,
- exchangeParts.length);
-
- assertEquals("Exchange type not correct",
- exchange.getType(), exchangeParts[0]);
+ assertEquals("Exchange should be in two parts ex(type/name)", (long) 2, (long) exchangeParts.length);
- assertEquals("Exchange name not correct",
- exchange.getName(), exchangeParts[1]);
+ assertEquals("Exchange type not correct", exchange.getType(), exchangeParts[0]);
+ assertEquals("Exchange name not correct", exchange.getName(), exchangeParts[1]);
}
/**
@@ -248,11 +247,12 @@ public abstract class AbstractTestLogSubject extends QpidTestCase
* Test that when Logging occurs a single log statement is provided
*
*/
+ @Test
public void testEnabled()
{
List<Object> logs = performLog(true);
- assertEquals("Log has incorrect message count", 1, logs.size());
+ assertEquals("Log has incorrect message count", (long) 1, (long) logs.size());
validateLogStatement(String.valueOf(logs.get(0)));
}
@@ -268,11 +268,12 @@ public abstract class AbstractTestLogSubject extends QpidTestCase
/**
* Ensure that when status updates are off this does not perform logging
*/
+ @Test
public void testDisabled()
{
List<Object> logs = performLog(false);
- assertEquals("Log has incorrect message count", 0, logs.size());
+ assertEquals("Log has incorrect message count", (long) 0, (long) logs.size());
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
index baf5d0f..e3af379 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
@@ -20,15 +20,17 @@
*/
package org.apache.qpid.server.logging.subjects;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.junit.After;
+import org.junit.Before;
+
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
/**
* Validate BindingLogSubjects are logged as expected
*/
@@ -40,12 +42,12 @@ public class BindingLogSubjectTest extends AbstractTestLogSubject
private Exchange<?> _exchange;
private QueueManagingVirtualHost _testVhost;
- @Override
+ @Before
public void setUp() throws Exception
{
super.setUp();
- _testVhost = BrokerTestHelper.createVirtualHost("test");
+ _testVhost = BrokerTestHelper.createVirtualHost("test", this);
_routingKey = "RoutingKey";
_exchange = (Exchange<?>) _testVhost.getChildByName(Exchange.class, "amq.direct");
_queue = mock(Queue.class);
@@ -55,7 +57,7 @@ public class BindingLogSubjectTest extends AbstractTestLogSubject
_subject = new BindingLogSubject(_routingKey, _exchange, _queue);
}
- @Override
+ @After
public void tearDown() throws Exception
{
if (_testVhost != null)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
index d88b2e9..cf98bde 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
@@ -23,6 +23,8 @@ package org.apache.qpid.server.logging.subjects;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.junit.Assert;
+
import org.apache.qpid.server.session.AMQPSession;
/**
@@ -32,7 +34,7 @@ public class ChannelLogSubjectTest extends ConnectionLogSubjectTest
{
private final int _channelID = 1;
- @Override
+ @org.junit.Before
public void setUp() throws Exception
{
super.setUp();
@@ -56,8 +58,7 @@ public class ChannelLogSubjectTest extends ConnectionLogSubjectTest
super.validateLogStatement(message);
// Finally check that the channel identifier is correctly added
- assertTrue("Channel 1 identifier not found as part of Subject",
- message.contains(")/ch:1]"));
+ Assert.assertTrue("Channel 1 identifier not found as part of Subject", message.contains(")/ch:1]"));
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
index f46d67f..e453871 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
@@ -20,12 +20,14 @@
*/
package org.apache.qpid.server.logging.subjects;
-import org.apache.qpid.server.transport.AMQPConnection;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.security.Principal;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import org.junit.Before;
+
+import org.apache.qpid.server.transport.AMQPConnection;
/**
* Validate ConnectionLogSubjects are logged as expected
@@ -40,7 +42,7 @@ public class ConnectionLogSubjectTest extends AbstractTestLogSubject
private AMQPConnection _connection;
- @Override
+ @Before
public void setUp() throws Exception
{
super.setUp();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
index ab626ca..e0680c5 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
@@ -20,10 +20,12 @@
*/
package org.apache.qpid.server.logging.subjects;
+import org.junit.After;
+import org.junit.Before;
+
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.model.BrokerTestHelper;
-
/**
* Validate ExchangeLogSubjects are logged as expected
@@ -33,18 +35,18 @@ public class ExchangeLogSubjectTest extends AbstractTestLogSubject
private Exchange<?> _exchange;
private VirtualHost<?> _testVhost;
- @Override
+ @Before
public void setUp() throws Exception
{
super.setUp();
- _testVhost = BrokerTestHelper.createVirtualHost("test");
+ _testVhost = BrokerTestHelper.createVirtualHost("test", this);
_exchange = (Exchange<?>) _testVhost.getChildByName(Exchange.class, "amq.direct");
_subject = new ExchangeLogSubject(_exchange,_testVhost);
}
- @Override
+ @After
public void tearDown() throws Exception
{
if (_testVhost != null)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
index 1b3d07b..357bc38 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
@@ -20,8 +20,14 @@
*/
package org.apache.qpid.server.logging.subjects;
-import org.apache.qpid.server.model.VirtualHost;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.After;
+import org.junit.Before;
+
import org.apache.qpid.server.model.BrokerTestHelper;
+import org.apache.qpid.server.model.VirtualHost;
/**
* Validate MessageStoreLogSubjects are logged as expected
@@ -30,18 +36,18 @@ public class MessageStoreLogSubjectTest extends AbstractTestLogSubject
{
private VirtualHost<?> _testVhost;
- @Override
+ @Before
public void setUp() throws Exception
{
super.setUp();
- _testVhost = BrokerTestHelper.createVirtualHost("test");
+ _testVhost = BrokerTestHelper.createVirtualHost("test", this);
_subject = new MessageStoreLogSubject(_testVhost.getName(),
_testVhost.getMessageStore().getClass().getSimpleName());
}
- @Override
+ @After
public void tearDown() throws Exception
{
if (_testVhost != null)
@@ -66,8 +72,9 @@ public class MessageStoreLogSubjectTest extends AbstractTestLogSubject
assertNotNull("MessageStore not found:" + message, msSlice);
assertEquals("MessageStore not correct",
- _testVhost.getMessageStore().getClass().getSimpleName(),
- msSlice);
+ _testVhost.getMessageStore().getClass().getSimpleName(),
+ msSlice);
+
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
index 4705053..fafb918 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
@@ -20,14 +20,16 @@
*/
package org.apache.qpid.server.logging.subjects;
-import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.model.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.junit.After;
+import org.junit.Before;
+
+import org.apache.qpid.server.model.BrokerTestHelper;
+import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
+
/**
* Validate QueueLogSubjects are logged as expected
*/
@@ -37,12 +39,12 @@ public class QueueLogSubjectTest extends AbstractTestLogSubject
private Queue<?> _queue;
private QueueManagingVirtualHost _testVhost;
- @Override
+ @Before
public void setUp() throws Exception
{
super.setUp();
- _testVhost = BrokerTestHelper.createVirtualHost("test");
+ _testVhost = BrokerTestHelper.createVirtualHost("test", this);
_queue = mock(Queue.class);
when(_queue.getName()).thenReturn("QueueLogSubjectTest");
@@ -51,7 +53,7 @@ public class QueueLogSubjectTest extends AbstractTestLogSubject
_subject = new QueueLogSubject(_queue);
}
- @Override
+ @After
public void tearDown() throws Exception
{
if (_testVhost != null)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/message/AbstractServerMessageTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/message/AbstractServerMessageTest.java b/broker-core/src/test/java/org/apache/qpid/server/message/AbstractServerMessageTest.java
index 5a8dc84..c36e85c 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/message/AbstractServerMessageTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/message/AbstractServerMessageTest.java
@@ -20,17 +20,22 @@
*/
package org.apache.qpid.server.message;
+import static org.junit.Assert.assertFalse;
+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 java.util.UUID;
+import org.junit.Test;
+
import org.apache.qpid.server.store.StorableMessageMetaData;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AbstractServerMessageTest extends QpidTestCase
+public class AbstractServerMessageTest extends UnitTestBase
{
private static class TestMessage<T extends StorableMessageMetaData> extends AbstractServerMessageImpl<TestMessage<T>,T>
{
@@ -92,12 +97,14 @@ public class AbstractServerMessageTest extends QpidTestCase
return queue;
}
+ @Test
public void testReferences()
{
TransactionLogResource q1 = createQueue("1");
TransactionLogResource q2 = createQueue("2");
TestMessage<StorableMessageMetaData> msg = new TestMessage<StorableMessageMetaData>(mock(StoredMessage.class),this);
+
assertFalse(msg.isReferenced());
assertFalse(msg.isReferenced(q1));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
index b5cb7e3..89057a1 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/AttributeValueConverterTest.java
@@ -23,10 +23,14 @@ package org.apache.qpid.server.model;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyMap;
import static java.util.Collections.singletonMap;
-import static java.util.Collections.unmodifiableSet;
import static java.util.Collections.unmodifiableList;
-
+import static java.util.Collections.unmodifiableSet;
import static org.apache.qpid.server.model.AttributeValueConverter.getConverter;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
@@ -41,25 +45,28 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import org.apache.qpid.server.model.testmodels.hierarchy.TestModel;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.model.testmodels.hierarchy.TestCar;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.server.model.testmodels.hierarchy.TestModel;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AttributeValueConverterTest extends QpidTestCase
+public class AttributeValueConverterTest extends UnitTestBase
{
private final ConfiguredObjectFactory _objectFactory = TestModel.getInstance().getObjectFactory();
private final Map<String, Object> _attributes = new HashMap<>();
private final Map<String, String> _context = new HashMap<>();
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
_attributes.put(ConfiguredObject.NAME, "objectName");
_attributes.put(ConfiguredObject.CONTEXT, _context);
}
+ @Test
public void testMapConverter()
{
_context.put("simpleMap", "{\"a\" : \"b\"}");
@@ -97,6 +104,7 @@ public class AttributeValueConverterTest extends QpidTestCase
}
}
+ @Test
public void testDateConverter() throws Exception
{
final long nowMillis = System.currentTimeMillis();
@@ -110,14 +118,23 @@ public class AttributeValueConverterTest extends QpidTestCase
assertEquals("Cannot convert date expressed as Date", now, converter.convert(now, object));
- assertEquals("Cannot convert date expressed as Number", new Date(nowMillis), converter.convert(nowMillis, object));
- assertEquals("Cannot convert date expressed as String containing Number", new Date(nowMillis), converter.convert(""+nowMillis, object));
+ assertEquals("Cannot convert date expressed as Number",
+ new Date(nowMillis),
+ converter.convert(nowMillis, object));
+
+ assertEquals("Cannot convert date expressed as String containing Number",
+ new Date(nowMillis),
+ converter.convert("" + nowMillis, object));
final String iso8601DateTime = "1970-01-01T00:00:01Z";
- assertEquals("Cannot convert date expressed as ISO8601 date time", new Date(1000), converter.convert(iso8601DateTime, object));
+ assertEquals("Cannot convert date expressed as ISO8601 date time",
+ new Date(1000),
+ converter.convert(iso8601DateTime, object));
final String iso8601Date = "1970-01-02Z";
- assertEquals("Cannot convert date expressed as ISO8601 date", new Date(TimeUnit.MILLISECONDS.convert(1, TimeUnit.DAYS)), converter.convert(iso8601Date, object));
+ assertEquals("Cannot convert date expressed as ISO8601 date",
+ new Date(TimeUnit.MILLISECONDS.convert(1, TimeUnit.DAYS)),
+ converter.convert(iso8601Date, object));
try
{
@@ -131,6 +148,7 @@ public class AttributeValueConverterTest extends QpidTestCase
}
+ @Test
public void testNonGenericCollectionConverter()
{
_context.put("simpleCollection", "[\"a\", \"b\"]");
@@ -146,12 +164,12 @@ public class AttributeValueConverterTest extends QpidTestCase
assertTrue(emptyCollection.isEmpty());
Collection<String> collection = collectionConverter.convert("[\"a\", \"b\"]", object);
- assertEquals(2, collection.size());
+ assertEquals((long) 2, (long) collection.size());
assertTrue(collection.contains("a"));
assertTrue(collection.contains("b"));
Collection<String> collectionFromInterpolatedVar = collectionConverter.convert("${simpleCollection}", object);
- assertEquals(2, collectionFromInterpolatedVar.size());
+ assertEquals((long) 2, (long) collectionFromInterpolatedVar.size());
assertTrue(collectionFromInterpolatedVar.contains("a"));
assertTrue(collectionFromInterpolatedVar.contains("b"));
@@ -166,6 +184,7 @@ public class AttributeValueConverterTest extends QpidTestCase
}
}
+ @Test
public void testNonGenericListConverter()
{
_context.put("simpleList", "[\"a\", \"b\"]");
@@ -199,6 +218,7 @@ public class AttributeValueConverterTest extends QpidTestCase
}
}
+ @Test
public void testNonGenericSetConverter()
{
_context.put("simpleSet", "[\"a\", \"b\"]");
@@ -250,17 +270,22 @@ public class AttributeValueConverterTest extends QpidTestCase
+ "DvGOnwB5LOoTnZUCRaLFhQFcGFMIjdHpg0qt/QkEFX/0m+849RK6muHT1C"
+ "NlcXtCFXwPTJ+9h+1auTP+Yp/6ii9SU3W1dzYawy2p9IhkMZEpJaHCLnaC";
+ @Test
public void testBase64EncodedCertificateConverter() throws ParseException
{
ConfiguredObject object = _objectFactory.create(TestCar.class, _attributes, null);
AttributeValueConverter<Certificate> certificateConverter = getConverter(Certificate.class, Certificate.class);
Certificate certificate = certificateConverter.convert(BASE_64_ENCODED_CERTIFICATE, object);
- assertTrue("Unexpected certificate", certificate instanceof X509Certificate);
+ final boolean condition = certificate instanceof X509Certificate;
+ assertTrue("Unexpected certificate", condition);
X509Certificate x509Certificate = (X509Certificate)certificate;
- assertEquals("CN=app2@acme.org,OU=art,O=acme,L=Toronto,ST=ON,C=CA", x509Certificate.getSubjectX500Principal().getName());
+ assertEquals("CN=app2@acme.org,OU=art,O=acme,L=Toronto,ST=ON,C=CA",
+ x509Certificate.getSubjectX500Principal().getName());
+
assertEquals("CN=MyRootCA,O=ACME,ST=Ontario,C=CA", x509Certificate.getIssuerX500Principal().getName());
}
+ @Test
public void testPEMCertificateConverter() throws ParseException
{
ConfiguredObject object = _objectFactory.create(TestCar.class, _attributes, null);
@@ -276,12 +301,15 @@ public class AttributeValueConverterTest extends QpidTestCase
pemCertificate.append("\n-----END CERTIFICATE-----\n");
Certificate certificate = certificateConverter.convert(pemCertificate.toString(), object);
- assertTrue("Unexpected certificate", certificate instanceof X509Certificate);
+ final boolean condition = certificate instanceof X509Certificate;
+ assertTrue("Unexpected certificate", condition);
X509Certificate x509Certificate = (X509Certificate)certificate;
- assertEquals("CN=app2@acme.org,OU=art,O=acme,L=Toronto,ST=ON,C=CA", x509Certificate.getSubjectX500Principal().getName());
+ assertEquals("CN=app2@acme.org,OU=art,O=acme,L=Toronto,ST=ON,C=CA",
+ x509Certificate.getSubjectX500Principal().getName());
assertEquals("CN=MyRootCA,O=ACME,ST=Ontario,C=CA", x509Certificate.getIssuerX500Principal().getName());
}
+ @Test
public void testMapToManagedAttributeValue()
{
ConfiguredObject object = _objectFactory.create(TestCar.class, _attributes, null);
@@ -301,14 +329,14 @@ public class AttributeValueConverterTest extends QpidTestCase
assertEquals(expectedStringValue, value.getString());
assertEquals(expectedIntegerValue, value.getInteger());
- assertEquals(expectedIntegerPrimitiveValue, value.getInt());
+ assertEquals((long) expectedIntegerPrimitiveValue, (long) value.getInt());
assertNull(expectedStringValue, value.getAnotherString());
final TestManagedAttributeValue nullValues = converter.convert(Collections.emptyMap(), object);
assertNull(nullValues.getString());
assertNull(nullValues.getInteger());
- assertEquals(0, nullValues.getInt());
+ assertEquals((long) 0, (long) nullValues.getInt());
assertNull(expectedStringValue, nullValues.getAnotherString());
}
@@ -321,6 +349,7 @@ public class AttributeValueConverterTest extends QpidTestCase
String getAnotherString();
}
+ @Test
public void testMapToManagedAttributeValueEquality()
{
ConfiguredObject object = _objectFactory.create(TestCar.class, _attributes, null);
@@ -352,6 +381,7 @@ public class AttributeValueConverterTest extends QpidTestCase
String getString();
}
+ @Test
public void testMapToManagedAttributeValueWithFactory()
{
ConfiguredObject object = _objectFactory.create(TestCar.class, _attributes, null);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
index 0046ec9..e6ed0ef 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
@@ -60,7 +60,8 @@ import org.apache.qpid.server.transport.AMQPConnection;
import org.apache.qpid.server.virtualhost.AbstractVirtualHost;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
+
public class BrokerTestHelper
{
@@ -164,14 +165,18 @@ public class BrokerTestHelper
{
}
- public static QueueManagingVirtualHost<?> createVirtualHost(Map<String, Object> attributes)
+ public static QueueManagingVirtualHost<?> createVirtualHost(Map<String, Object> attributes,
+ final UnitTestBase testBase)
{
Broker<?> broker = createBrokerMock(createAccessControlMock());
- return createVirtualHost(attributes, broker, false, createAccessControlMock());
+ return createVirtualHost(attributes, broker, false, createAccessControlMock(), testBase);
}
private static QueueManagingVirtualHost<?> createVirtualHost(final Map<String, Object> attributes,
- final Broker<?> broker, boolean defaultVHN, AccessControl accessControl)
+ final Broker<?> broker,
+ boolean defaultVHN,
+ AccessControl accessControl,
+ final UnitTestBase testBase)
{
ConfiguredObjectFactory objectFactory = broker.getObjectFactory();
@@ -203,28 +208,37 @@ public class BrokerTestHelper
host.start();
when(virtualHostNode.getVirtualHost()).thenReturn(host);
_createdVirtualHosts.add(host);
- QpidTestCase testCase = QpidTestCase.getCurrentInstance();
- testCase.registerTearDown(_closeVirtualHosts);
+
+ testBase.registerTearDown(_closeVirtualHosts);
return host;
}
- public static QueueManagingVirtualHost<?> createVirtualHost(String name) throws Exception
+ public static QueueManagingVirtualHost<?> createVirtualHost(String name,
+ final UnitTestBase testBase) throws Exception
{
- return createVirtualHost(name, createBrokerMock(createAccessControlMock()), false, createAccessControlMock());
+ return createVirtualHost(name, createBrokerMock(createAccessControlMock()), false, createAccessControlMock(),
+ testBase);
}
- public static QueueManagingVirtualHost<?> createVirtualHost(String name, Broker<?> broker, boolean defaultVHN) throws Exception
+ public static QueueManagingVirtualHost<?> createVirtualHost(String name,
+ Broker<?> broker,
+ boolean defaultVHN,
+ final UnitTestBase testBase) throws Exception
{
- return createVirtualHost(name, broker, defaultVHN, createAccessControlMock());
+ return createVirtualHost(name, broker, defaultVHN, createAccessControlMock(), testBase);
}
- private static QueueManagingVirtualHost<?> createVirtualHost(String name, Broker<?> broker, boolean defaultVHN, AccessControl accessControl) throws Exception
+ private static QueueManagingVirtualHost<?> createVirtualHost(String name,
+ Broker<?> broker,
+ boolean defaultVHN,
+ AccessControl accessControl,
+ final UnitTestBase testBase) throws Exception
{
Map<String,Object> attributes = new HashMap<>();
attributes.put(org.apache.qpid.server.model.VirtualHost.TYPE, TestMemoryVirtualHost.VIRTUAL_HOST_TYPE);
attributes.put(org.apache.qpid.server.model.VirtualHost.NAME, name);
- return createVirtualHost(attributes, broker, defaultVHN, accessControl);
+ return createVirtualHost(attributes, broker, defaultVHN, accessControl, testBase);
}
public static AMQPSession<?,?> createSession(int channelId, AMQPConnection<?> connection)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectJacksonModuleTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectJacksonModuleTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectJacksonModuleTest.java
index a3cf1e7..18eada4 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectJacksonModuleTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectJacksonModuleTest.java
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.model;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -31,14 +33,16 @@ import java.util.Collections;
import java.util.Map;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class ConfiguredObjectJacksonModuleTest extends QpidTestCase
+public class ConfiguredObjectJacksonModuleTest extends UnitTestBase
{
private static final String UTF8 = StandardCharsets.UTF_8.name();
+ @Test
public void testPrincipalSerialisation() throws Exception
{
final String username = "testuser@withFunky%";
@@ -57,6 +61,7 @@ public class ConfiguredObjectJacksonModuleTest extends QpidTestCase
assertEquals("unexpected principal serialisation", expectedSerialisation, json);
}
+ @Test
public void testManageableAttributeType() throws IOException
{
ManagedAttributeValue testType = new TestManagedAttributeValue();
@@ -65,14 +70,13 @@ public class ConfiguredObjectJacksonModuleTest extends QpidTestCase
String encodedValue = encoder.writeValueAsString(testType);
ObjectMapper decoder = new ObjectMapper();
Map decodedMap = decoder.readValue(encodedValue, Map.class);
- assertEquals(3, decodedMap.size());
+ assertEquals((long) 3, (long) decodedMap.size());
assertTrue(decodedMap.containsKey("name"));
assertTrue(decodedMap.containsKey("map"));
assertTrue(decodedMap.containsKey("type"));
assertEquals("foo", decodedMap.get("name"));
- assertEquals(Collections.singletonMap("key","value"), decodedMap.get("map"));
- assertEquals(Collections.singletonMap("nested",true), decodedMap.get("type"));
-
+ assertEquals(Collections.singletonMap("key", "value"), decodedMap.get("map"));
+ assertEquals(Collections.singletonMap("nested", true), decodedMap.get("type"));
}
@ManagedAttributeValueType(isAbstract = true)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/UUIDGeneratorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/UUIDGeneratorTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/UUIDGeneratorTest.java
index c686a24..cd686bd 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/UUIDGeneratorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/UUIDGeneratorTest.java
@@ -20,13 +20,19 @@
*/
package org.apache.qpid.server.model;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
-public class UUIDGeneratorTest extends QpidTestCase
+public class UUIDGeneratorTest extends UnitTestBase
{
private static final String VIRTUAL_HOST_NAME_1 = "virtualHost1";
private static final String VIRTUAL_HOST_NAME_2 = "virtualHost2";
@@ -51,6 +57,7 @@ public class UUIDGeneratorTest extends QpidTestCase
private static final String USER_1 = "user1";
private static final String USER_2 = "user2";
+ @Test
public void testDifferentObjectTypeReturnDifferentIdFromSameValues() throws Exception
{
String value = "name";
@@ -75,9 +82,10 @@ public class UUIDGeneratorTest extends QpidTestCase
UUID id9 = UUIDGenerator.generateGroupMemberUUID(value, value, value);
idSet.add(id9);
- assertEquals("The produced UUIDs were not all unique", 9, idSet.size());
+ assertEquals("The produced UUIDs were not all unique", (long) 9, (long) idSet.size());
}
+ @Test
public void testQueueIdGeneration() throws Exception
{
//check repeated generation is deterministic
@@ -96,6 +104,7 @@ public class UUIDGeneratorTest extends QpidTestCase
assertFalse("Queue IDs should not be equal", queue1.equals(queue2));
}
+ @Test
public void testExchangeIdGeneration() throws Exception
{
//check repeated generation is deterministic
@@ -114,11 +123,13 @@ public class UUIDGeneratorTest extends QpidTestCase
assertFalse("Exchange IDs should not be equal", exchange1.equals(exchange2));
}
+ @Test
public void testBindingIdGeneration() throws Exception
{
//check repeated generation is deterministic
UUID binding1 = UUIDGenerator.generateBindingUUID(EXCHANGE_NAME_1, QUEUE_NAME_1, BINDING_KEY_1, VIRTUAL_HOST_NAME_1);
UUID binding2 = UUIDGenerator.generateBindingUUID(EXCHANGE_NAME_1, QUEUE_NAME_1, BINDING_KEY_1, VIRTUAL_HOST_NAME_1);
+
assertEquals("Binding IDs should be equal", binding1, binding2);
//check different name gives different ID
@@ -132,6 +143,7 @@ public class UUIDGeneratorTest extends QpidTestCase
assertFalse("Binding IDs should not be equal", binding1.equals(binding2));
}
+ @Test
public void testVhostIdGeneration() throws Exception
{
//check repeated generation is deterministic
@@ -145,6 +157,7 @@ public class UUIDGeneratorTest extends QpidTestCase
assertFalse("Virtualhost IDs should not be equal", vhost1.equals(vhost2));
}
+ @Test
public void testVhostAliasIdGeneration() throws Exception
{
//check repeated generation is deterministic
@@ -163,6 +176,7 @@ public class UUIDGeneratorTest extends QpidTestCase
assertFalse("Virtualhost Alias IDs should not be equal", alias1.equals(alias2));
}
+ @Test
public void testConsumerIdGeneration() throws Exception
{
//check repeated generation is deterministic
@@ -173,6 +187,7 @@ public class UUIDGeneratorTest extends QpidTestCase
//check different name gives different ID
consumer1 = UUIDGenerator.generateConsumerUUID(VIRTUAL_HOST_NAME_1, QUEUE_NAME_1, CONN_REMOTE_ADDR_1, CHANNEL_NUMBER_1, CONSUMER_NAME_1);
consumer2 = UUIDGenerator.generateConsumerUUID(VIRTUAL_HOST_NAME_1, QUEUE_NAME_1, CONN_REMOTE_ADDR_1, CHANNEL_NUMBER_1, CONSUMER_NAME_2);
+
assertFalse("Consumer IDs should not be equal", consumer1.equals(consumer2));
//check different vhost name gives different ID
@@ -196,6 +211,7 @@ public class UUIDGeneratorTest extends QpidTestCase
assertFalse("Consumer IDs should not be equal", consumer1.equals(consumer2));
}
+ @Test
public void testUserIdGeneration() throws Exception
{
//check repeated generation is deterministic
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
index b9d8695..e69addf 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
@@ -20,6 +20,11 @@
*/
package org.apache.qpid.server.model;
+import static org.junit.Assert.assertEquals;
+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.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.argThat;
@@ -46,6 +51,9 @@ import java.util.UUID;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatcher;
import org.mockito.invocation.InvocationOnMock;
@@ -74,9 +82,9 @@ import org.apache.qpid.server.virtualhost.NoopConnectionEstablishmentPolicy;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostUnavailableException;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class VirtualHostTest extends QpidTestCase
+public class VirtualHostTest extends UnitTestBase
{
private final AccessControl _mockAccessControl = BrokerTestHelper.createAccessControlMock();
private Broker _broker;
@@ -87,10 +95,9 @@ public class VirtualHostTest extends QpidTestCase
private StoreConfigurationChangeListener _storeConfigurationChangeListener;
private PreferenceStore _preferenceStore;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
_broker = BrokerTestHelper.createBrokerMock();
@@ -123,7 +130,7 @@ public class VirtualHostTest extends QpidTestCase
when(_virtualHostNode.createPreferenceStore()).thenReturn(_preferenceStore);
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -142,13 +149,13 @@ public class VirtualHostTest extends QpidTestCase
}
finally
{
- super.tearDown();
}
}
+ @Test
public void testNewVirtualHost()
{
- String virtualHostName = getName();
+ String virtualHostName = getTestName();
QueueManagingVirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
assertNotNull("Unexpected id", virtualHost.getId());
@@ -158,9 +165,10 @@ public class VirtualHostTest extends QpidTestCase
verify(_configStore).update(eq(true), matchesRecord(virtualHost.getId(), virtualHost.getType()));
}
+ @Test
public void testDeleteVirtualHost()
{
- VirtualHost<?> virtualHost = createVirtualHost(getName());
+ VirtualHost<?> virtualHost = createVirtualHost(getTestName());
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
virtualHost.delete();
@@ -170,9 +178,10 @@ public class VirtualHostTest extends QpidTestCase
verify(_preferenceStore).onDelete();
}
+ @Test
public void testStopAndStartVirtualHost()
{
- String virtualHostName = getName();
+ String virtualHostName = getTestName();
VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
@@ -189,9 +198,10 @@ public class VirtualHostTest extends QpidTestCase
verify(_preferenceStore, times(2)).openAndLoad(any(PreferenceStoreUpdater.class));
}
+ @Test
public void testRestartingVirtualHostRecoversChildren()
{
- String virtualHostName = getName();
+ String virtualHostName = getTestName();
VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
@@ -208,8 +218,13 @@ public class VirtualHostTest extends QpidTestCase
Exchange exchange = virtualHost.createChild(Exchange.class, exchangeArgs);
final ConfiguredObjectRecord exchangeCor = exchange.asObjectRecord();
- assertEquals("Unexpected number of queues before stop", 1, virtualHost.getChildren(Queue.class).size());
- assertEquals("Unexpected number of exchanges before stop", 5, virtualHost.getChildren(Exchange.class).size());
+ assertEquals("Unexpected number of queues before stop",
+ (long) 1,
+ (long) virtualHost.getChildren(Queue.class).size());
+
+ assertEquals("Unexpected number of exchanges before stop",
+ (long) 5,
+ (long) virtualHost.getChildren(Exchange.class).size());
final List<ConfiguredObjectRecord> allObjects = new ArrayList<>();
allObjects.add(virtualHostCor);
@@ -222,9 +237,12 @@ public class VirtualHostTest extends QpidTestCase
((AbstractConfiguredObject<?>)virtualHost).stop();
assertEquals("Unexpected state", State.STOPPED, virtualHost.getState());
- assertEquals("Unexpected number of queues after stop", 0, virtualHost.getChildren(Queue.class).size());
- assertEquals("Unexpected number of exchanges after stop", 0, virtualHost.getChildren(Exchange.class).size());
-
+ assertEquals("Unexpected number of queues after stop",
+ (long) 0,
+ (long) virtualHost.getChildren(Queue.class).size());
+ assertEquals("Unexpected number of exchanges after stop",
+ (long) 0,
+ (long) virtualHost.getChildren(Exchange.class).size());
// Setup an answer that will return the configured object records
doAnswer(new Answer()
@@ -248,14 +266,19 @@ public class VirtualHostTest extends QpidTestCase
((AbstractConfiguredObject<?>)virtualHost).start();
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
- assertEquals("Unexpected number of queues after restart", 1, virtualHost.getChildren(Queue.class).size());
- assertEquals("Unexpected number of exchanges after restart", 5, virtualHost.getChildren(Exchange.class).size());
+ assertEquals("Unexpected number of queues after restart",
+ (long) 1,
+ (long) virtualHost.getChildren(Queue.class).size());
+ assertEquals("Unexpected number of exchanges after restart",
+ (long) 5,
+ (long) virtualHost.getChildren(Exchange.class).size());
}
+ @Test
public void testModifyDurableChildAfterRestartingVirtualHost()
{
- String virtualHostName = getName();
+ String virtualHostName = getTestName();
VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
final ConfiguredObjectRecord virtualHostCor = virtualHost.asObjectRecord();
@@ -292,7 +315,7 @@ public class VirtualHostTest extends QpidTestCase
((AbstractConfiguredObject<?>)virtualHost).start();
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
final Collection<Queue> queues = virtualHost.getChildren(Queue.class);
- assertEquals("Unexpected number of queues after restart", 1, queues.size());
+ assertEquals("Unexpected number of queues after restart", (long) 1, (long) queues.size());
final Queue recoveredQueue = queues.iterator().next();
recoveredQueue.setAttributes(Collections.singletonMap(ConfiguredObject.DESCRIPTION, "testDescription"));
@@ -302,65 +325,72 @@ public class VirtualHostTest extends QpidTestCase
}
+ @Test
public void testStopVirtualHost_ClosesConnections()
{
- String virtualHostName = getName();
+ String virtualHostName = getTestName();
QueueManagingVirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
AbstractAMQPConnection connection = createMockProtocolConnection(virtualHost);
- assertEquals("Unexpected number of connections before connection registered", 0, virtualHost.getConnectionCount());
+ assertEquals("Unexpected number of connections before connection registered",
+ (long) 0,
+ virtualHost.getConnectionCount());
AMQPConnection modelConnection = mock(AMQPConnection.class);
when(modelConnection.closeAsync()).thenReturn(Futures.immediateFuture(null));
virtualHost.registerConnection(modelConnection, new NoopConnectionEstablishmentPolicy());
- assertEquals("Unexpected number of connections after connection registered", 1, virtualHost.getConnectionCount());
+ assertEquals("Unexpected number of connections after connection registered",
+ (long) 1,
+ virtualHost.getConnectionCount());
((AbstractConfiguredObject<?>)virtualHost).stop();
assertEquals("Unexpected state", State.STOPPED, virtualHost.getState());
assertEquals("Unexpected number of connections after virtualhost stopped",
- 0,
- virtualHost.getConnectionCount());
+ (long) 0,
+ virtualHost.getConnectionCount());
verify(modelConnection).closeAsync();
}
+ @Test
public void testDeleteVirtualHost_ClosesConnections()
{
- String virtualHostName = getName();
+ String virtualHostName = getTestName();
QueueManagingVirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
AbstractAMQPConnection connection = createMockProtocolConnection(virtualHost);
assertEquals("Unexpected number of connections before connection registered",
- 0,
- virtualHost.getConnectionCount());
+ (long) 0,
+ virtualHost.getConnectionCount());
AMQPConnection modelConnection = mock(AMQPConnection.class);
when(modelConnection.closeAsync()).thenReturn(Futures.immediateFuture(null));
virtualHost.registerConnection(modelConnection, new NoopConnectionEstablishmentPolicy());
assertEquals("Unexpected number of connections after connection registered",
- 1,
- virtualHost.getConnectionCount());
+ (long) 1,
+ virtualHost.getConnectionCount());
virtualHost.delete();
assertEquals("Unexpected state", State.DELETED, virtualHost.getState());
assertEquals("Unexpected number of connections after virtualhost deleted",
- 0,
- virtualHost.getConnectionCount());
+ (long) 0,
+ virtualHost.getConnectionCount());
verify(modelConnection).closeAsync();
}
+ @Test
public void testCreateDurableQueue()
{
- String virtualHostName = getName();
+ String virtualHostName = getTestName();
VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
String queueName = "myQueue";
@@ -375,9 +405,10 @@ public class VirtualHostTest extends QpidTestCase
verify(_configStore).update(eq(true), matchesRecord(queue.getId(), queue.getType()));
}
+ @Test
public void testCreateNonDurableQueue()
{
- String virtualHostName = getName();
+ String virtualHostName = getTestName();
VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
String queueName = "myQueue";
@@ -394,14 +425,16 @@ public class VirtualHostTest extends QpidTestCase
// *************** VH Access Control Tests ***************
+ @Test
public void testUpdateDeniedByACL()
{
- String virtualHostName = getName();
+ String virtualHostName = getTestName();
VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
when(_mockAccessControl.authorise(eq(null), eq(Operation.UPDATE), eq(virtualHost), any(Map.class))).thenReturn(Result.DENIED);
+
assertNull(virtualHost.getDescription());
try
@@ -417,9 +450,10 @@ public class VirtualHostTest extends QpidTestCase
verify(_configStore, never()).update(eq(false), matchesRecord(virtualHost.getId(), virtualHost.getType()));
}
+ @Test
public void testStopDeniedByACL()
{
- String virtualHostName = getName();
+ String virtualHostName = getTestName();
VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
when(_mockAccessControl.authorise(eq(null),
@@ -440,9 +474,10 @@ public class VirtualHostTest extends QpidTestCase
verify(_configStore, never()).update(eq(false), matchesRecord(virtualHost.getId(), virtualHost.getType()));
}
+ @Test
public void testDeleteDeniedByACL()
{
- String virtualHostName = getName();
+ String virtualHostName = getTestName();
VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
when(_mockAccessControl.authorise(eq(null),
@@ -463,6 +498,7 @@ public class VirtualHostTest extends QpidTestCase
verify(_configStore, never()).remove(matchesRecord(virtualHost.getId(), virtualHost.getType()));
}
+ @Test
public void testExistingConnectionBlocking()
{
VirtualHost<?> host = createVirtualHost(getTestName());
@@ -472,11 +508,13 @@ public class VirtualHostTest extends QpidTestCase
verify(connection).block();
}
+ @Test
public void testCreateValidation()
{
try
{
- createVirtualHost(getTestName(), Collections.singletonMap(QueueManagingVirtualHost.NUMBER_OF_SELECTORS, "-1"));
+ createVirtualHost(getTestName(), Collections.singletonMap(QueueManagingVirtualHost.NUMBER_OF_SELECTORS,
+ "-1"));
fail("Exception not thrown for negative number of selectors");
}
catch (IllegalConfigurationException e)
@@ -503,6 +541,7 @@ public class VirtualHostTest extends QpidTestCase
}
}
+ @Test
public void testChangeValidation()
{
QueueManagingVirtualHost<?> virtualHost = createVirtualHost(getTestName());
@@ -536,30 +575,37 @@ public class VirtualHostTest extends QpidTestCase
}
}
+ @Test
public void testRegisterConnection()
{
QueueManagingVirtualHost<?> vhost = createVirtualHost("sdf");
AMQPConnection<?> connection = getMockConnection();
- assertEquals("unexpected number of connections before test", 0, vhost.getConnectionCount());
+ assertEquals("unexpected number of connections before test", (long) 0, vhost.getConnectionCount());
vhost.registerConnection(connection, new NoopConnectionEstablishmentPolicy());
- assertEquals("unexpected number of connections after registerConnection", 1, vhost.getConnectionCount());
+ assertEquals("unexpected number of connections after registerConnection",
+ (long) 1,
+ vhost.getConnectionCount());
assertEquals("unexpected connection object", Collections.singleton(connection), vhost.getConnections());
}
+ @Test
public void testStopVirtualhostClosesConnections()
{
QueueManagingVirtualHost<?> vhost = createVirtualHost("sdf");
AMQPConnection<?> connection = getMockConnection();
vhost.registerConnection(connection, new NoopConnectionEstablishmentPolicy());
- assertEquals("unexpected number of connections after registerConnection", 1, vhost.getConnectionCount());
+ assertEquals("unexpected number of connections after registerConnection",
+ (long) 1,
+ vhost.getConnectionCount());
assertEquals("unexpected connection object", Collections.singleton(connection), vhost.getConnections());
((AbstractConfiguredObject<?>)vhost).stop();
verify(connection).stopConnection();
verify(connection).closeAsync();
}
+ @Test
public void testRegisterConnectionOnStoppedVirtualhost()
{
QueueManagingVirtualHost<?> vhost = createVirtualHost("sdf");
@@ -575,12 +621,13 @@ public class VirtualHostTest extends QpidTestCase
{
// pass
}
- assertEquals("unexpected number of connections", 0, vhost.getConnectionCount());
+ assertEquals("unexpected number of connections", (long) 0, vhost.getConnectionCount());
((AbstractConfiguredObject<?>)vhost).start();
vhost.registerConnection(connection, new NoopConnectionEstablishmentPolicy());
- assertEquals("unexpected number of connections", 1, vhost.getConnectionCount());
+ assertEquals("unexpected number of connections", (long) 1, vhost.getConnectionCount());
}
+ @Test
public void testAddValidAutoCreationPolicies()
{
NodeAutoCreationPolicy[] policies = new NodeAutoCreationPolicy[] {
@@ -659,7 +706,9 @@ public class VirtualHostTest extends QpidTestCase
vhost.setAttributes(newAttributes);
List<NodeAutoCreationPolicy> retrievedPoliciesList = vhost.getNodeAutoCreationPolicies();
- assertEquals("Retrieved node policies list has incorrect size", 2, retrievedPoliciesList.size());
+ assertEquals("Retrieved node policies list has incorrect size",
+ (long) 2,
+ (long) retrievedPoliciesList.size());
NodeAutoCreationPolicy firstPolicy = retrievedPoliciesList.get(0);
NodeAutoCreationPolicy secondPolicy = retrievedPoliciesList.get(1);
assertEquals("fooQ*", firstPolicy.getPattern());
@@ -668,6 +717,7 @@ public class VirtualHostTest extends QpidTestCase
assertEquals(false, secondPolicy.isCreatedOnConsume());
}
+ @Test
public void testAddInvalidAutoCreationPolicies()
{
NodeAutoCreationPolicy[] policies = new NodeAutoCreationPolicy[] {
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerImplTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerImplTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerImplTest.java
index 9fb2dd9..8df9ca8 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerImplTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerImplTest.java
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.model.adapter;
+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 static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -37,6 +40,10 @@ import java.util.concurrent.TimeoutException;
import javax.security.auth.Subject;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.model.Broker;
@@ -58,20 +65,18 @@ import org.apache.qpid.server.store.preferences.PreferenceStore;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
import org.apache.qpid.server.virtualhostnode.TestVirtualHostNode;
-import org.apache.qpid.test.utils.QpidTestCase;
-
+import org.apache.qpid.test.utils.UnitTestBase;
-public class BrokerImplTest extends QpidTestCase
+public class BrokerImplTest extends UnitTestBase
{
private TaskExecutorImpl _taskExecutor;
private SystemConfig _systemConfig;
private BrokerImpl _brokerImpl;
private PreferenceStore _preferenceStore;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_taskExecutor = new TaskExecutorImpl();
_taskExecutor.start();
@@ -86,7 +91,7 @@ public class BrokerImplTest extends QpidTestCase
when(_systemConfig.createPreferenceStore()).thenReturn(_preferenceStore);
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -104,25 +109,28 @@ public class BrokerImplTest extends QpidTestCase
}
finally
{
- super.tearDown();
}
}
+ @Test
public void testAssignTargetSizes_NoQueueDepth() throws Exception
{
doAssignTargetSizeTest(new long[] {0, 0}, 1024 * 1024 * 1024);
}
+ @Test
public void testAssignTargetSizes_OneQueue() throws Exception
{
doAssignTargetSizeTest(new long[] {37}, 1024 * 1024 * 1024);
}
+ @Test
public void testAssignTargetSizes_ThreeQueues() throws Exception
{
doAssignTargetSizeTest(new long[] {37, 47, 0}, 1024 * 1024 * 1024);
}
+ @Test
public void testAssignTargetSizes_QueuesOversize() throws Exception
{
int flowToDiskThreshold = 1024 * 1024 * 1024;
@@ -130,6 +138,7 @@ public class BrokerImplTest extends QpidTestCase
flowToDiskThreshold);
}
+ @Test
public void testNetworkBufferSize()
{
Map<String, Object> attributes = new HashMap<>();
@@ -144,13 +153,16 @@ public class BrokerImplTest extends QpidTestCase
_brokerImpl = new BrokerImpl(attributes, _systemConfig);
_brokerImpl.open();
assertEquals("Broker open should fail with network buffer size less then minimum",
- State.ERRORED,
- _brokerImpl.getState());
+ State.ERRORED,
+ _brokerImpl.getState());
+
assertEquals("Unexpected buffer size",
- Broker.DEFAULT_NETWORK_BUFFER_SIZE,
- _brokerImpl.getNetworkBufferSize());
+ (long) Broker.DEFAULT_NETWORK_BUFFER_SIZE,
+ (long) _brokerImpl.getNetworkBufferSize());
+
}
+ @Test
public void testPurgeUser() throws Exception
{
final String testUsername = "testUser";
@@ -205,16 +217,26 @@ public class BrokerImplTest extends QpidTestCase
// test pre-conditions
Collection<Preference> preferencesBeforePurge = getPreferencesAs(testUserSubject);
- assertEquals("Unexpected number of preferences before userPurge", 1, preferencesBeforePurge.size());
- assertEquals("Unexpected preference before userPurge", preferenceId, preferencesBeforePurge.iterator().next().getId());
- assertTrue("User was not valid before userPurge", authenticationProvider.getUsers().containsKey(testUsername));
+ assertEquals("Unexpected number of preferences before userPurge",
+ (long) 1,
+ (long) preferencesBeforePurge.size());
+ assertEquals("Unexpected preference before userPurge",
+ preferenceId,
+ preferencesBeforePurge.iterator().next().getId());
+
+ assertTrue("User was not valid before userPurge",
+ authenticationProvider.getUsers().containsKey(testUsername));
_brokerImpl.purgeUser(authenticationProvider, testUsername);
// test post-conditions
Collection<Preference> preferencesAfterPurge = getPreferencesAs(testUserSubject);
- assertEquals("Preferences were not deleted during userPurge", Collections.EMPTY_SET, preferencesAfterPurge);
- assertEquals("User was not deleted from authentication Provider", Collections.EMPTY_MAP, authenticationProvider.getUsers());
+ assertEquals("Preferences were not deleted during userPurge",
+ Collections.EMPTY_SET,
+ preferencesAfterPurge);
+ assertEquals("User was not deleted from authentication Provider",
+ Collections.EMPTY_MAP,
+ authenticationProvider.getUsers());
verify(_preferenceStore).replace(Collections.singleton(preferenceId), Collections.EMPTY_SET);
}
@@ -270,7 +292,8 @@ public class BrokerImplTest extends QpidTestCase
long diff = Math.abs(flowToDiskThreshold - totalAssignedTargetSize);
long tolerance = _brokerImpl.getVirtualHostNodes().size() * 2;
- assertTrue(String.format("Assigned target size not within expected tolerance. Diff %d Tolerance %d", diff, tolerance), diff < tolerance);
+ assertTrue(String.format("Assigned target size not within expected tolerance. Diff %d Tolerance %d", diff, tolerance),
+ diff < tolerance);
}
private void createVhnWithVh(final BrokerImpl brokerImpl, int nameSuffix, final long totalQueueSize)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org