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:32 UTC
[25/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/model/adapter/FileBasedGroupProviderImplTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImplTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImplTest.java
index 4e25ae0..d046937 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImplTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImplTest.java
@@ -24,7 +24,10 @@ import static org.apache.qpid.server.model.adapter.FileBasedGroupProviderImpl.GR
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.when;
import java.io.File;
@@ -39,6 +42,9 @@ import java.util.Set;
import java.util.stream.Collectors;
import com.google.common.collect.Sets;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.Broker;
@@ -47,25 +53,24 @@ import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.Group;
import org.apache.qpid.server.model.GroupMember;
import org.apache.qpid.server.model.GroupProvider;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class FileBasedGroupProviderImplTest extends QpidTestCase
+public class FileBasedGroupProviderImplTest extends UnitTestBase
{
private Broker<?> _broker;
private File _groupFile;
private ConfiguredObjectFactory _objectFactory;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_broker = BrokerTestHelper.createBrokerMock();
_objectFactory = _broker.getObjectFactory();
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -77,10 +82,10 @@ public class FileBasedGroupProviderImplTest extends QpidTestCase
}
finally
{
- super.tearDown();
}
}
+ @Test
public void testValidationOnCreateWithInvalidPath()
{
Map<String,Object> attributes = new HashMap<>();
@@ -98,10 +103,14 @@ public class FileBasedGroupProviderImplTest extends QpidTestCase
fail("Exception is expected on validation of groups provider with invalid path");
} catch (IllegalConfigurationException e)
{
- assertEquals("Unexpected exception message:" + e.getMessage(), String.format("Cannot create groups file at '%s'", groupsFile), e.getMessage());
+ assertEquals("Unexpected exception message:" + e.getMessage(),
+ String.format("Cannot create groups file at '%s'", groupsFile),
+ e.getMessage());
+
}
}
+ @Test
public void testValidationOnCreateWithInvalidGroups()
{
_groupFile = TestFileUtils.createTempFile(this, "groups", "=blah");
@@ -118,10 +127,13 @@ public class FileBasedGroupProviderImplTest extends QpidTestCase
}
catch (IllegalConfigurationException e)
{
- assertEquals("Unexpected exception message:" + e.getMessage(), String.format("Cannot load groups from '%s'", groupsFile), e.getMessage());
+ assertEquals("Unexpected exception message:" + e.getMessage(),
+ String.format("Cannot load groups from '%s'", groupsFile),
+ e.getMessage());
}
}
+ @Test
public void testExistingGroupFile() throws Exception
{
Map<String, Set<String>> input = new HashMap<>();
@@ -154,6 +166,7 @@ public class FileBasedGroupProviderImplTest extends QpidTestCase
assertThat(rootMember.getName(), is(equalTo("root")));
}
+ @Test
public void testAddGroupAndMember() throws Exception
{
_groupFile = createTemporaryGroupFile(Collections.emptyMap());
@@ -178,6 +191,7 @@ public class FileBasedGroupProviderImplTest extends QpidTestCase
assertThat(rootMember.getName(), is(equalTo("root")));
}
+ @Test
public void testRemoveGroupAndMember() throws Exception
{
Map<String, Set<String>> input = new HashMap<>();
@@ -209,6 +223,7 @@ public class FileBasedGroupProviderImplTest extends QpidTestCase
assertThat(provider.getChildren(Group.class).size(), is(equalTo(1)));
}
+ @Test
public void testGroupAndMemberDurability() throws Exception
{
_groupFile = createTemporaryGroupFile(Collections.emptyMap());
@@ -264,6 +279,7 @@ public class FileBasedGroupProviderImplTest extends QpidTestCase
}
}
+ @Test
public void testProvideDelete() throws Exception
{
_groupFile = createTemporaryGroupFile(Collections.emptyMap());
@@ -281,6 +297,7 @@ public class FileBasedGroupProviderImplTest extends QpidTestCase
assertThat(_groupFile.exists(), is(equalTo(false)));
}
+ @Test
public void testSharingUnderlyingFileDisallowed() throws Exception
{
_groupFile = createTemporaryGroupFile(Collections.emptyMap());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
index e3ee8e2..6653f6c 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
@@ -20,6 +20,11 @@
*/
package org.apache.qpid.server.model.adapter;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -33,6 +38,10 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
@@ -53,9 +62,9 @@ import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.model.port.AmqpPort;
import org.apache.qpid.server.model.port.PortFactory;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class PortFactoryTest extends QpidTestCase
+public class PortFactoryTest extends UnitTestBase
{
private UUID _portId = UUID.randomUUID();
private int _portNumber;
@@ -75,10 +84,9 @@ public class PortFactoryTest extends QpidTestCase
private Port<?> _port;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
SystemConfig systemConfig = mock(SystemConfig.class);
_portNumber = findFreePort();
TaskExecutor executor = CurrentThreadTaskExecutor.newStartedInstance();
@@ -112,7 +120,7 @@ public class PortFactoryTest extends QpidTestCase
_factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
_attributes.put(Port.ID, _portId);
- _attributes.put(Port.NAME, getName());
+ _attributes.put(Port.NAME, getTestName());
_attributes.put(Port.PORT, _portNumber);
_attributes.put(Port.TRANSPORTS, _tcpStringSet);
_attributes.put(Port.AUTHENTICATION_PROVIDER, _authProviderName);
@@ -120,7 +128,7 @@ public class PortFactoryTest extends QpidTestCase
_attributes.put(Port.BINDING_ADDRESS, "127.0.0.1");
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -132,37 +140,49 @@ public class PortFactoryTest extends QpidTestCase
}
finally
{
- super.tearDown();
}
}
+ @Test
public void testCreatePortWithMinimumAttributes()
{
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(Port.PORT, _portNumber);
- attributes.put(Port.NAME, getName());
+ attributes.put(Port.NAME, getTestName());
attributes.put(Port.AUTHENTICATION_PROVIDER, _authProviderName);
attributes.put(Port.DESIRED_STATE, State.QUIESCED);
_port = _factory.create(Port.class, attributes, _broker);
assertNotNull(_port);
- assertTrue(_port instanceof AmqpPort);
- assertEquals("Unexpected _port", _portNumber, _port.getPort());
- assertEquals("Unexpected transports", Collections.singleton(PortFactory.DEFAULT_TRANSPORT), _port.getTransports());
- assertEquals("Unexpected need client auth", PortFactory.DEFAULT_AMQP_NEED_CLIENT_AUTH,
- _port.getAttribute(Port.NEED_CLIENT_AUTH));
- assertEquals("Unexpected want client auth", PortFactory.DEFAULT_AMQP_WANT_CLIENT_AUTH,
- _port.getAttribute(Port.WANT_CLIENT_AUTH));
- assertEquals("Unexpected tcp no delay", PortFactory.DEFAULT_AMQP_TCP_NO_DELAY, _port.getAttribute(Port.TCP_NO_DELAY));
- assertEquals("Unexpected binding", PortFactory.DEFAULT_AMQP_BINDING, _port.getAttribute(Port.BINDING_ADDRESS));
+ final boolean condition = _port instanceof AmqpPort;
+ assertTrue(condition);
+ assertEquals("Unexpected _port", (long) _portNumber, (long) _port.getPort());
+ assertEquals("Unexpected transports",
+ Collections.singleton(PortFactory.DEFAULT_TRANSPORT),
+ _port.getTransports());
+
+ assertEquals("Unexpected need client auth",
+ PortFactory.DEFAULT_AMQP_NEED_CLIENT_AUTH,
+ _port.getAttribute(Port.NEED_CLIENT_AUTH));
+ assertEquals("Unexpected want client auth",
+ PortFactory.DEFAULT_AMQP_WANT_CLIENT_AUTH,
+ _port.getAttribute(Port.WANT_CLIENT_AUTH));
+ assertEquals("Unexpected tcp no delay",
+ PortFactory.DEFAULT_AMQP_TCP_NO_DELAY,
+ _port.getAttribute(Port.TCP_NO_DELAY));
+ assertEquals("Unexpected binding",
+ PortFactory.DEFAULT_AMQP_BINDING,
+ _port.getAttribute(Port.BINDING_ADDRESS));
}
+ @Test
public void testCreateAmqpPort()
{
createAmqpPortTestImpl(false, false, false, null, null);
}
+ @Test
public void testCreateAmqpPortUsingSslFailsWithoutKeyStore()
{
try
@@ -176,6 +196,7 @@ public class PortFactoryTest extends QpidTestCase
}
}
+ @Test
public void testCreateAmqpPortUsingSslSucceedsWithKeyStore()
{
String keyStoreName = "myKeyStore";
@@ -185,6 +206,7 @@ public class PortFactoryTest extends QpidTestCase
createAmqpPortTestImpl(true, false, false, keyStoreName, null);
}
+ @Test
public void testCreateAmqpPortNeedingClientAuthFailsWithoutTrustStore()
{
String keyStoreName = "myKeyStore";
@@ -202,6 +224,7 @@ public class PortFactoryTest extends QpidTestCase
}
}
+ @Test
public void testCreateAmqpPortNeedingClientAuthSucceedsWithTrustStore()
{
String keyStoreName = "myKeyStore";
@@ -215,6 +238,7 @@ public class PortFactoryTest extends QpidTestCase
createAmqpPortTestImpl(true, true, false, keyStoreName, new String[]{trustStoreName});
}
+ @Test
public void testCreateAmqpPortWantingClientAuthFailsWithoutTrustStore()
{
String keyStoreName = "myKeyStore";
@@ -232,6 +256,7 @@ public class PortFactoryTest extends QpidTestCase
}
}
+ @Test
public void testCreateAmqpPortWantingClientAuthSucceedsWithTrustStore()
{
String keyStoreName = "myKeyStore";
@@ -282,9 +307,10 @@ public class PortFactoryTest extends QpidTestCase
_port = _factory.create(Port.class, _attributes, _broker);
assertNotNull(_port);
- assertTrue(_port instanceof AmqpPort);
+ final boolean condition = _port instanceof AmqpPort;
+ assertTrue(condition);
assertEquals(_portId, _port.getId());
- assertEquals(_portNumber, _port.getPort());
+ assertEquals((long) _portNumber, (long) _port.getPort());
if(useSslTransport)
{
assertEquals(_sslTransports, _port.getTransports());
@@ -300,6 +326,7 @@ public class PortFactoryTest extends QpidTestCase
assertEquals("Unexpected binding", "127.0.0.1", _port.getAttribute(Port.BINDING_ADDRESS));
}
+ @Test
public void testCreateHttpPort()
{
Set<Protocol> httpProtocolSet = Collections.singleton(Protocol.HTTP);
@@ -309,19 +336,21 @@ public class PortFactoryTest extends QpidTestCase
_attributes.put(Port.AUTHENTICATION_PROVIDER, _authProviderName);
_attributes.put(Port.PORT, _portNumber);
_attributes.put(Port.TRANSPORTS, _tcpStringSet);
- _attributes.put(Port.NAME, getName());
+ _attributes.put(Port.NAME, getTestName());
_attributes.put(Port.ID, _portId);
_port = _factory.create(Port.class, _attributes, _broker);
assertNotNull(_port);
- assertFalse("Port should not be an AMQP-specific subclass", _port instanceof AmqpPort);
+ final boolean condition = _port instanceof AmqpPort;
+ assertFalse("Port should not be an AMQP-specific subclass", condition);
assertEquals(_portId, _port.getId());
- assertEquals(_portNumber, _port.getPort());
+ assertEquals((long) _portNumber, (long) _port.getPort());
assertEquals(_tcpTransports, _port.getTransports());
assertEquals(httpProtocolSet, _port.getProtocols());
}
+ @Test
public void testCreateHttpPortWithPartiallySetAttributes()
{
Set<Protocol> httpProtocolSet = Collections.singleton(Protocol.HTTP);
@@ -330,20 +359,21 @@ public class PortFactoryTest extends QpidTestCase
_attributes.put(Port.PROTOCOLS, httpStringSet);
_attributes.put(Port.AUTHENTICATION_PROVIDER, _authProviderName);
_attributes.put(Port.PORT, _portNumber);
- _attributes.put(Port.NAME, getName());
+ _attributes.put(Port.NAME, getTestName());
_attributes.put(Port.ID, _portId);
_port = _factory.create(Port.class, _attributes, _broker);
assertNotNull(_port);
- assertFalse("Port not be an AMQP-specific _port subclass", _port instanceof AmqpPort);
+ final boolean condition = _port instanceof AmqpPort;
+ assertFalse("Port not be an AMQP-specific _port subclass", condition);
assertEquals(_portId, _port.getId());
- assertEquals(_portNumber, _port.getPort());
+ assertEquals((long) _portNumber, (long) _port.getPort());
assertEquals(Collections.singleton(PortFactory.DEFAULT_TRANSPORT), _port.getTransports());
assertEquals(httpProtocolSet, _port.getProtocols());
-
}
+ @Test
public void testCreateMixedAmqpAndNonAmqpThrowsException()
{
Set<String> mixedProtocolSet = new HashSet<>(Arrays.asList(Protocol.AMQP_0_10.name(), Protocol.HTTP.name()));
@@ -360,6 +390,7 @@ public class PortFactoryTest extends QpidTestCase
}
}
+ @Test
public void testCreatePortWithoutAuthenticationMechanism()
{
when(_authProvider.getDisabledMechanisms()).thenReturn(Arrays.asList("PLAIN"));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/port/AmqpPortImplTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/port/AmqpPortImplTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/port/AmqpPortImplTest.java
index 8c9654d..d17aa5c 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/port/AmqpPortImplTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/port/AmqpPortImplTest.java
@@ -19,6 +19,10 @@
package org.apache.qpid.server.model.port;
+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 static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -36,6 +40,10 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
@@ -52,9 +60,9 @@ import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.model.TrustStore;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AmqpPortImplTest extends QpidTestCase
+public class AmqpPortImplTest extends UnitTestBase
{
private static final String AUTHENTICATION_PROVIDER_NAME = "test";
private static final String KEYSTORE_NAME = "keystore";
@@ -63,10 +71,9 @@ public class AmqpPortImplTest extends QpidTestCase
private Broker _broker;
private AmqpPortImpl _port;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_taskExecutor = CurrentThreadTaskExecutor.newStartedInstance();
Model model = BrokerModel.getInstance();
SystemConfig systemConfig = mock(SystemConfig.class);
@@ -98,7 +105,7 @@ public class AmqpPortImplTest extends QpidTestCase
when(_broker.getChildByName(AuthenticationProvider.class, AUTHENTICATION_PROVIDER_NAME)).thenReturn(authProvider);
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -115,10 +122,10 @@ public class AmqpPortImplTest extends QpidTestCase
}
_port.close();
}
- super.tearDown();
}
}
+ @Test
public void testPortAlreadyBound() throws Exception
{
try (ServerSocket socket = openSocket())
@@ -132,12 +139,14 @@ public class AmqpPortImplTest extends QpidTestCase
catch (IllegalConfigurationException e)
{
assertEquals("Unexpected exception message",
- String.format("Cannot bind to port %d and binding address '%s'. Port is already is use.",
- socket.getLocalPort(), "*"), e.getMessage());
+ String.format("Cannot bind to port %d and binding address '%s'. Port is already is use.",
+ socket.getLocalPort(), "*"),
+ e.getMessage());
}
}
}
+ @Test
public void testCreateTls()
{
Map<String, Object> attributes = new HashMap<>();
@@ -146,6 +155,7 @@ public class AmqpPortImplTest extends QpidTestCase
_port = createPort(getTestName(), attributes);
}
+ @Test
public void testCreateTlsClientAuth()
{
Map<String, Object> attributes = new HashMap<>();
@@ -155,11 +165,13 @@ public class AmqpPortImplTest extends QpidTestCase
_port = createPort(getTestName(), attributes);
}
+ @Test
public void testTlsWithoutKeyStore()
{
try
{
- createPort(getTestName(), Collections.singletonMap(Port.TRANSPORTS, Collections.singletonList(Transport.SSL)));
+ createPort(getTestName(), Collections.singletonMap(Port.TRANSPORTS, Collections.singletonList(Transport
+ .SSL)));
fail("Exception not thrown");
}
catch (IllegalConfigurationException e)
@@ -178,6 +190,7 @@ public class AmqpPortImplTest extends QpidTestCase
}
}
+ @Test
public void testTlsWantNeedWithoutTrustStores()
{
Map<String, Object> base = new HashMap<>();
@@ -210,6 +223,7 @@ public class AmqpPortImplTest extends QpidTestCase
}
}
+ @Test
public void testOnCreateValidation()
{
try
@@ -243,6 +257,7 @@ public class AmqpPortImplTest extends QpidTestCase
}
}
+ @Test
public void testOnChangeThreadPoolValidation()
{
_port = createPort(getTestName());
@@ -276,6 +291,7 @@ public class AmqpPortImplTest extends QpidTestCase
}
}
+ @Test
public void testConnectionCounting()
{
Map<String, Object> attributes = new HashMap<>();
@@ -294,18 +310,18 @@ public class AmqpPortImplTest extends QpidTestCase
{
assertTrue(_port.canAcceptNewConnection(new InetSocketAddress("example.org", 0)));
_port.incrementConnectionCount();
- assertEquals(i + 1, _port.getConnectionCount());
+ assertEquals((long) (i + 1), (long) _port.getConnectionCount());
verify(mockLogger, never()).message(any(LogSubject.class), any(LogMessage.class));
}
assertTrue(_port.canAcceptNewConnection(new InetSocketAddress("example.org", 0)));
_port.incrementConnectionCount();
- assertEquals(9, _port.getConnectionCount());
+ assertEquals((long) 9, (long) _port.getConnectionCount());
verify(mockLogger, times(1)).message(any(LogSubject.class), any(LogMessage.class));
assertTrue(_port.canAcceptNewConnection(new InetSocketAddress("example.org", 0)));
_port.incrementConnectionCount();
- assertEquals(10, _port.getConnectionCount());
+ assertEquals((long) 10, (long) _port.getConnectionCount());
verify(mockLogger, times(1)).message(any(LogSubject.class), any(LogMessage.class));
assertFalse(_port.canAcceptNewConnection(new InetSocketAddress("example.org", 0)));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/port/HttpPortImplTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/port/HttpPortImplTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/port/HttpPortImplTest.java
index 42fcd87..63f1c98 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/port/HttpPortImplTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/port/HttpPortImplTest.java
@@ -20,6 +20,8 @@
package org.apache.qpid.server.model.port;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -28,6 +30,9 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
@@ -37,19 +42,18 @@ import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.SystemConfig;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class HttpPortImplTest extends QpidTestCase
+public class HttpPortImplTest extends UnitTestBase
{
private static final String AUTHENTICATION_PROVIDER_NAME = "test";
private TaskExecutor _taskExecutor;
private Broker _broker;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_taskExecutor = CurrentThreadTaskExecutor.newStartedInstance();
Model model = BrokerModel.getInstance();
SystemConfig systemConfig = mock(SystemConfig.class);
@@ -71,6 +75,7 @@ public class HttpPortImplTest extends QpidTestCase
}
+ @Test
public void testCreateWithIllegalThreadPoolValues() throws Exception
{
int threadPoolMinimumSize = 37;
@@ -95,6 +100,7 @@ public class HttpPortImplTest extends QpidTestCase
}
}
+ @Test
public void testIllegalChangeWithMaxThreadPoolSizeSmallerThanMinThreadPoolSize() throws Exception
{
int threadPoolMinimumSize = 37;
@@ -122,6 +128,7 @@ public class HttpPortImplTest extends QpidTestCase
}
}
+ @Test
public void testIllegalChangeWithNegativeThreadPoolSize() throws Exception
{
int illegalThreadPoolMinimumSize = -1;
@@ -149,6 +156,7 @@ public class HttpPortImplTest extends QpidTestCase
}
}
+ @Test
public void testChangeWithLegalThreadPoolValues() throws Exception
{
int threadPoolMinimumSize = 37;
@@ -166,8 +174,13 @@ public class HttpPortImplTest extends QpidTestCase
updates.put(HttpPort.THREAD_POOL_MINIMUM, threadPoolMinimumSize);
updates.put(HttpPort.THREAD_POOL_MAXIMUM, threadPoolMaximumSize);
port.setAttributes(updates);
- assertEquals("Port did not pickup changes to minimum thread pool size", port.getThreadPoolMinimum(), threadPoolMinimumSize);
- assertEquals("Port did not pickup changes to maximum thread pool size", port.getThreadPoolMaximum(), threadPoolMaximumSize);
+ assertEquals("Port did not pickup changes to minimum thread pool size",
+ (long) port.getThreadPoolMinimum(),
+ (long) threadPoolMinimumSize);
+
+ assertEquals("Port did not pickup changes to maximum thread pool size",
+ (long) port.getThreadPoolMaximum(),
+ (long) threadPoolMaximumSize);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/preferences/GenericPrincipalTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/preferences/GenericPrincipalTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/preferences/GenericPrincipalTest.java
index 7282a9b..14e85e1 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/preferences/GenericPrincipalTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/preferences/GenericPrincipalTest.java
@@ -19,27 +19,33 @@
package org.apache.qpid.server.model.preferences;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
-public class GenericPrincipalTest extends QpidTestCase
+public class GenericPrincipalTest extends UnitTestBase
{
private static final String UTF8 = StandardCharsets.UTF_8.name();
private String _username;
private String _originType;
private String _originName;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_username = "testuser";
_originType = "authType";
_originName = "authName";
}
+ @Test
public void testParseSimple() throws Exception
{
GenericPrincipal p = new GenericPrincipal(String.format("%s@%s('%s')", _username, _originType, _originName));
@@ -48,6 +54,7 @@ public class GenericPrincipalTest extends QpidTestCase
assertEquals("unexpected origin name", _originName, p.getOriginName());
}
+ @Test
public void testNoOriginInfo() throws Exception
{
try
@@ -61,6 +68,7 @@ public class GenericPrincipalTest extends QpidTestCase
}
}
+ @Test
public void testParseWithDash() throws Exception
{
String username = "user-name";
@@ -72,6 +80,7 @@ public class GenericPrincipalTest extends QpidTestCase
assertEquals("unexpected origin name", originName, p.getOriginName());
}
+ @Test
public void testRejectQuotes() throws Exception
{
final String usernameWithQuote = "_username'withQuote";
@@ -107,6 +116,7 @@ public class GenericPrincipalTest extends QpidTestCase
}
+ @Test
public void testRejectParenthesis() throws Exception
{
final String usernameWithParenthesis = "username(withParenthesis";
@@ -142,6 +152,7 @@ public class GenericPrincipalTest extends QpidTestCase
}
+ @Test
public void testRejectAtSign() throws Exception
{
final String _usernameWithAtSign = "_username@withAtSign";
@@ -176,6 +187,7 @@ public class GenericPrincipalTest extends QpidTestCase
}
}
+ @Test
public void testUrlEncoded() throws Exception
{
final String username = "testuser@withFunky%";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/preferences/PreferenceFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/preferences/PreferenceFactoryTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/preferences/PreferenceFactoryTest.java
index c278d01..953059a 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/preferences/PreferenceFactoryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/preferences/PreferenceFactoryTest.java
@@ -20,32 +20,35 @@
package org.apache.qpid.server.model.preferences;
import static org.apache.qpid.server.model.preferences.PreferenceTestHelper.createPreferenceAttributes;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.mock;
import java.util.Collections;
import java.util.Map;
import java.util.UUID;
-import javax.security.auth.Subject;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.security.auth.TestPrincipalUtils;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class PreferenceFactoryTest extends QpidTestCase
+public class PreferenceFactoryTest extends UnitTestBase
{
private static final String TEST_USERNAME = "testUser";
private static final String TEST_PRINCIPAL_SERIALIZATION =
TestPrincipalUtils.getTestPrincipalSerialization(TEST_USERNAME);
private ConfiguredObject<?> _testObject;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_testObject = mock(ConfiguredObject.class);
}
+ @Test
public void testCreatePreferenceFromAttributes()
{
final Map<String, Object> prefValueMap = Collections.<String, Object>singletonMap("myprefkey", "myprefvalue");
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java
index 1924640..634e087 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java
@@ -36,9 +36,11 @@ import java.util.UUID;
import javax.security.auth.Subject;
-import com.google.common.collect.ObjectArrays;
import com.google.common.collect.Sets;
import org.hamcrest.Description;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.ArgumentMatcher;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
@@ -50,9 +52,9 @@ import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.security.group.GroupPrincipal;
import org.apache.qpid.server.store.preferences.PreferenceRecord;
import org.apache.qpid.server.store.preferences.PreferenceStore;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class UserPreferencesTest extends QpidTestCase
+public class UserPreferencesTest extends UnitTestBase
{
private static final String MYGROUP = "mygroup";
@@ -67,10 +69,9 @@ public class UserPreferencesTest extends QpidTestCase
private AuthenticatedPrincipal _owner;
private TaskExecutor _preferenceTaskExecutor;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_configuredObject = mock(ConfiguredObject.class);
_preferenceStore = mock(PreferenceStore.class);
_preferenceTaskExecutor = new CurrentThreadTaskExecutor();
@@ -88,13 +89,13 @@ public class UserPreferencesTest extends QpidTestCase
_testId = UUID.randomUUID();
}
- @Override
+ @After
public void tearDown() throws Exception
{
_preferenceTaskExecutor.stop();
- super.tearDown();
}
+ @Test
public void testUpdateOrAppend() throws Exception
{
final Preference preference = createPreference(_testId,
@@ -116,6 +117,7 @@ public class UserPreferencesTest extends QpidTestCase
}
+ @Test
public void testReplace() throws Exception
{
final Preference preference = createPreference(_testId,
@@ -138,6 +140,7 @@ public class UserPreferencesTest extends QpidTestCase
}
+ @Test
public void testReplaceByType() throws Exception
{
final UUID queryUUID = UUID.randomUUID();
@@ -166,6 +169,7 @@ public class UserPreferencesTest extends QpidTestCase
argThat(new PreferenceRecordMatcher(newQueryPreference)));
}
+ @Test
public void testReplaceByTypeAndName() throws Exception
{
final UUID query1UUID = UUID.randomUUID();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/AbstractConfiguredObjectTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/AbstractConfiguredObjectTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/AbstractConfiguredObjectTest.java
index c42b705..2d60242 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/AbstractConfiguredObjectTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/AbstractConfiguredObjectTest.java
@@ -19,6 +19,13 @@
package org.apache.qpid.server.model.testmodels.hierarchy;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -32,6 +39,7 @@ import java.util.concurrent.ExecutionException;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
+import org.junit.Test;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.AbstractConfigurationChangeListener;
@@ -42,16 +50,18 @@ import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.store.ConfiguredObjectRecord;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
+
/**
* Tests behaviour of AbstractConfiguredObjects when hierarchies of objects are used together.
* Responsibilities to include adding/removing of children and correct firing of listeners.
*/
-public class AbstractConfiguredObjectTest extends QpidTestCase
+public class AbstractConfiguredObjectTest extends UnitTestBase
{
private final Model _model = TestModel.getInstance();
+ @Test
public void testCreateCategoryDefault()
{
final String objectName = "testCreateCategoryDefault";
@@ -61,9 +71,11 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals(objectName, object.getName());
assertEquals(TestStandardCarImpl.TEST_STANDARD_CAR_TYPE, object.getType());
- assertTrue(object instanceof TestStandardCar);
+ final boolean condition = object instanceof TestStandardCar;
+ assertTrue(condition);
}
+ @Test
public void testCreateUnrecognisedType()
{
final String objectName = "testCreateCategoryDefault";
@@ -82,6 +94,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
}
}
+ @Test
public void testCreateCarWithEngine()
{
final String carName = "myCar";
@@ -93,7 +106,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals(carName, car.getName());
- assertEquals(0, car.getChildren(TestEngine.class).size());
+ assertEquals((long) 0, (long) car.getChildren(TestEngine.class).size());
String engineName = "myEngine";
@@ -103,13 +116,13 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
TestEngine engine = (TestEngine) car.createChild(TestEngine.class, engineAttributes);
- assertEquals(1, car.getChildren(TestEngine.class).size());
+ assertEquals((long) 1, (long) car.getChildren(TestEngine.class).size());
assertEquals(engineName, engine.getName());
assertEquals(TestElecEngineImpl.TEST_ELEC_ENGINE_TYPE, engine.getType());
-
}
+ @Test
public void testGetChildren_NewChild()
{
TestCar car = _model.getObjectFactory().create(TestCar.class, Collections.<String, Object>singletonMap(ConfiguredObject.NAME, "myCar"), null);
@@ -122,7 +135,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
// Check we can observe the new child from the parent
- assertEquals(1, car.getChildren(TestEngine.class).size());
+ assertEquals((long) 1, (long) car.getChildren(TestEngine.class).size());
assertEquals(engine, car.getChildById(TestEngine.class, engine.getId()));
assertEquals(engine, car.getChildByName(TestEngine.class, engine.getName()));
@@ -131,12 +144,13 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertTrue("Engine should have already attained state", attainedChild.isDone());
}
+ @Test
public void testGetChildren_RecoveredChild() throws Exception
{
final TestCar car = recoverParentAndChild();
// Check we can observe the recovered child from the parent
- assertEquals(1, car.getChildren(TestEngine.class).size());
+ assertEquals((long) 1, (long) car.getChildren(TestEngine.class).size());
TestEngine engine = (TestEngine) car.getChildren(TestEngine.class).iterator().next();
assertEquals(engine, car.getChildById(TestEngine.class, engine.getId()));
@@ -152,6 +166,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals(engine, attainedChild.get());
}
+ @Test
public void testOpenAwaitsChildToAttainState() throws Exception
{
SettableFuture<Void> engineStateChangeControllingFuture = SettableFuture.create();
@@ -159,7 +174,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
final TestCar car = recoverParentAndChild();
// Check we can observe the recovered child from the parent
- assertEquals(1, car.getChildren(TestEngine.class).size());
+ assertEquals((long) 1, (long) car.getChildren(TestEngine.class).size());
TestEngine engine = (TestEngine) car.getChildren(TestEngine.class).iterator().next();
engine.setStateChangeFuture(engineStateChangeControllingFuture);
@@ -172,6 +187,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
carFuture.get();
}
+ @Test
public void testOpenAwaitsChildToAttainState_ChildStateChangeAsyncErrors() throws Exception
{
SettableFuture<Void> engineStateChangeControllingFuture = SettableFuture.create();
@@ -179,7 +195,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
final TestCar car = recoverParentAndChild();
// Check we can observe the recovered child from the parent
- assertEquals(1, car.getChildren(TestEngine.class).size());
+ assertEquals((long) 1, (long) car.getChildren(TestEngine.class).size());
TestEngine engine = (TestEngine) car.getChildren(TestEngine.class).iterator().next();
engine.setStateChangeFuture(engineStateChangeControllingFuture);
@@ -194,12 +210,13 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals(State.ERRORED, engine.getState());
}
+ @Test
public void testOpenAwaitsChildToAttainState_ChildStateChangeSyncErrors() throws Exception
{
final TestCar car = recoverParentAndChild();
// Check we can observe the recovered child from the parent
- assertEquals(1, car.getChildren(TestEngine.class).size());
+ assertEquals((long) 1, (long) car.getChildren(TestEngine.class).size());
TestEngine engine = (TestEngine) car.getChildren(TestEngine.class).iterator().next();
engine.setStateChangeException(new RuntimeException("child attain state exception"));
@@ -212,6 +229,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals(State.ERRORED, engine.getState());
}
+ @Test
public void testCreateAwaitsAttainState()
{
SettableFuture<Void> stateChangeFuture = SettableFuture.create();
@@ -230,6 +248,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertTrue("create child has not completed", engine.isDone());
}
+ @Test
public void testCreateAwaitsAttainState_StateChangeAsyncErrors() throws Exception
{
SettableFuture stateChangeFuture = SettableFuture.create();
@@ -257,9 +276,13 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertSame(stateChangeException, ee.getCause());
}
- assertEquals("Failed engine should not be registered with parent", 0, car.getChildren(TestEngine.class).size());
+ assertEquals("Failed engine should not be registered with parent",
+ (long) 0,
+ (long) car.getChildren(TestEngine.class).size());
+
}
+ @Test
public void testCreateAwaitsAttainState_StateChangeSyncErrors() throws Exception
{
RuntimeException stateChangeException = new RuntimeException("state change error");
@@ -283,10 +306,12 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertSame(stateChangeException, ee.getCause());
}
- assertEquals("Failed engine should not be registered with parent", 0, car.getChildren(TestEngine.class).size());
-
+ assertEquals("Failed engine should not be registered with parent",
+ (long) 0,
+ (long) car.getChildren(TestEngine.class).size());
}
+ @Test
public void testCloseAwaitsChildCloseCompletion()
{
SettableFuture<Void> engineCloseControllingFuture = SettableFuture.create();
@@ -304,7 +329,10 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
ListenableFuture carListenableFuture = car.closeAsync();
assertFalse("car close future has completed before engine closed", carListenableFuture.isDone());
- assertSame("engine deregistered from car too early", engine, car.getChildById(TestEngine.class, engine.getId()));
+ assertSame("engine deregistered from car too early",
+ engine,
+ car.getChildById(TestEngine.class, engine.getId()));
+
engineCloseControllingFuture.set(null);
@@ -312,6 +340,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertNull("engine not deregistered", car.getChildById(TestEngine.class, engine.getId()));
}
+ @Test
public void testGlobalContextDefault()
{
final String carName = "myCar";
@@ -321,13 +350,16 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
TestCar car = _model.getObjectFactory().create(TestCar.class, carAttributes, null);
- assertTrue("context var not in contextKeys",
- car.getContextKeys(true).contains(TestCar.TEST_CONTEXT_VAR));
+ assertTrue("context var not in contextKeys", car.getContextKeys(true).contains(TestCar.TEST_CONTEXT_VAR));
String expected = "a value";
- assertEquals("Context variable has unexpected value", expected, car.getContextValue(String.class, TestCar.TEST_CONTEXT_VAR));
+ assertEquals("Context variable has unexpected value",
+ expected,
+ car.getContextValue(String.class, TestCar.TEST_CONTEXT_VAR));
+
}
+ @Test
public void testGlobalContextDefaultWithThisRef()
{
final String carName = "myCar";
@@ -337,7 +369,9 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
TestCar car = _model.getObjectFactory().create(TestCar.class, carAttributes, null);
- assertEquals("Context variable has unexpected value", "a value myCar", car.getContextValue(String.class, TestCar.TEST_CONTEXT_VAR_WITH_THIS_REF));
+ assertEquals("Context variable has unexpected value",
+ "a value myCar",
+ car.getContextValue(String.class, TestCar.TEST_CONTEXT_VAR_WITH_THIS_REF));
String engineName = "myEngine";
Map<String, Object> engineAttributes = new HashMap<>();
@@ -347,9 +381,12 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
TestEngine engine = (TestEngine) car.createChild(TestEngine.class, engineAttributes);
- assertEquals("Context variable has unexpected value", "a value myEngine", engine.getContextValue(String.class, TestCar.TEST_CONTEXT_VAR_WITH_THIS_REF));
+ assertEquals("Context variable has unexpected value",
+ "a value myEngine",
+ engine.getContextValue(String.class, TestCar.TEST_CONTEXT_VAR_WITH_THIS_REF));
}
+ @Test
public void testHierarchyContextVariableWithThisRef()
{
final String contentVarName = "contentVar";
@@ -361,7 +398,9 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
TestCar car = _model.getObjectFactory().create(TestCar.class, carAttributes, null);
- assertEquals("Context variable has unexpected value", "name myCar", car.getContextValue(String.class, contentVarName));
+ assertEquals("Context variable has unexpected value",
+ "name myCar",
+ car.getContextValue(String.class, contentVarName));
String engineName = "myEngine";
Map<String, Object> engineAttributes = new HashMap<>();
@@ -371,9 +410,12 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
TestEngine engine = (TestEngine) car.createChild(TestEngine.class, engineAttributes);
// TODO: we have different behaviour depending on whether the variable is a global context default or hierarchy context variable.
- assertEquals("Context variable has unexpected value", "name myCar", engine.getContextValue(String.class, contentVarName));
+ assertEquals("Context variable has unexpected value",
+ "name myCar",
+ engine.getContextValue(String.class, contentVarName));
}
+ @Test
public void testGlobalContextDefaultWithAncestorRef()
{
final String carName = "myCar";
@@ -384,7 +426,9 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
TestCar car = _model.getObjectFactory().create(TestCar.class, carAttributes, null);
String expected = "a value " + carName;
- assertEquals("Context variable has unexpected value", expected, car.getContextValue(String.class, TestCar.TEST_CONTEXT_VAR_WITH_ANCESTOR_REF));
+ assertEquals("Context variable has unexpected value",
+ expected,
+ car.getContextValue(String.class, TestCar.TEST_CONTEXT_VAR_WITH_ANCESTOR_REF));
String engineName = "myEngine";
Map<String, Object> engineAttributes = new HashMap<>();
@@ -393,9 +437,12 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
TestEngine engine = (TestEngine) car.createChild(TestEngine.class, engineAttributes);
- assertEquals("Context variable has unexpected value", expected, engine.getContextValue(String.class, TestCar.TEST_CONTEXT_VAR_WITH_ANCESTOR_REF));
+ assertEquals("Context variable has unexpected value",
+ expected,
+ engine.getContextValue(String.class, TestCar.TEST_CONTEXT_VAR_WITH_ANCESTOR_REF));
}
+ @Test
public void testHierarchyContextVariableWithAncestorRef()
{
final String contentVarName = "contentVar";
@@ -407,7 +454,9 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
TestCar car = _model.getObjectFactory().create(TestCar.class, carAttributes, null);
- assertEquals("Context variable has unexpected value", "name myCar", car.getContextValue(String.class, contentVarName));
+ assertEquals("Context variable has unexpected value",
+ "name myCar",
+ car.getContextValue(String.class, contentVarName));
String engineName = "myEngine";
Map<String, Object> engineAttributes = new HashMap<>();
@@ -416,9 +465,12 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
TestEngine engine = (TestEngine) car.createChild(TestEngine.class, engineAttributes);
- assertEquals("Context variable has unexpected value", "name myCar", engine.getContextValue(String.class, contentVarName));
+ assertEquals("Context variable has unexpected value",
+ "name myCar",
+ engine.getContextValue(String.class, contentVarName));
}
+ @Test
public void testUserPreferencesCreatedOnEngineCreation()
{
Map<String, Object> carAttributes = new HashMap<>();
@@ -436,16 +488,19 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertNotNull("Unexpected user preferences", engine.getUserPreferences());
}
+ @Test
public void testDuplicateChildRejected_Name()
{
doDuplicateChildCheck(ConfiguredObject.NAME);
}
+ @Test
public void testDuplicateChildRejected_Id()
{
doDuplicateChildCheck(ConfiguredObject.ID);
}
+ @Test
public void testParentDeletePropagatesToChild()
{
TestCar car = _model.getObjectFactory().create(TestCar.class,
@@ -463,10 +518,11 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals("Unexpected child state after parent delete", State.DELETED, engine.getState());
final List<State> newStates = listener.getNewStates();
- assertEquals("Child heard an unexpected number of state chagnes", 1, newStates.size());
+ assertEquals("Child heard an unexpected number of state chagnes", (long) 1, (long) newStates.size());
assertEquals("Child heard listener has unexpected state", State.DELETED, newStates.get(0));
}
+ @Test
public void testParentDeleteValidationFailureLeavesChildreIntact()
{
TestCar car = _model.getObjectFactory().create(TestCar.class,
@@ -493,9 +549,10 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals("Unexpected child state after failed parent deletion", State.ACTIVE, engine.getState());
final List<State> newStates = listener.getNewStates();
- assertEquals("Child heard an unexpected number of state changes", 0, newStates.size());
+ assertEquals("Child heard an unexpected number of state changes", (long) 0, (long) newStates.size());
}
+ @Test
public void testDeleteConfiguredObjectReferredFromAttribute()
{
Map<String, Object> carAttributes = new HashMap<>();
@@ -530,6 +587,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
}
}
+ @Test
public void testDeleteConfiguredObjectReferredFromCollection()
{
Map<String, Object> carAttributes = new HashMap<>();
@@ -569,6 +627,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
}
}
+ @Test
public void testDeleteConfiguredObject()
{
Map<String, Object> carAttributes = new HashMap<>();
@@ -586,13 +645,18 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
sensorAttributes.put(ConfiguredObject.TYPE, TestTemperatureSensorImpl.TEST_TEMPERATURE_SENSOR_TYPE);
TestSensor sensor1 = (TestSensor) instrumentPanel.createChild(TestSensor.class, sensorAttributes);
- assertEquals("Unexpected number of sensors after creation", 1, instrumentPanel.getChildren(TestSensor.class).size());
+ assertEquals("Unexpected number of sensors after creation",
+ (long) 1,
+ (long) instrumentPanel.getChildren(TestSensor.class).size());
sensor1.delete();
- assertEquals("Unexpected number of sensors after deletion", 0, instrumentPanel.getChildren(TestSensor.class).size());
+ assertEquals("Unexpected number of sensors after deletion",
+ (long) 0,
+ (long) instrumentPanel.getChildren(TestSensor.class).size());
}
+ @Test
public void testDeleteConfiguredObjectWithReferredChildren()
{
Map<String, Object> carAttributes = new HashMap<>();
@@ -627,6 +691,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
}
}
+ @Test
public void testDeleteConfiguredObjectWithChildrenReferringEachOther()
{
Map<String, Object> carAttributes = new HashMap<>();
@@ -665,7 +730,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
carAttributes.put(ConfiguredObject.TYPE, TestKitCarImpl.TEST_KITCAR_TYPE);
TestCar car = _model.getObjectFactory().create(TestCar.class, carAttributes, null);
- assertEquals(0, car.getChildren(TestEngine.class).size());
+ assertEquals((long) 0, (long) car.getChildren(TestEngine.class).size());
String engineName = "myEngine";
Map<String, Object> engineAttributes = new HashMap<>();
@@ -673,8 +738,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
engineAttributes.put(ConfiguredObject.TYPE, TestElecEngineImpl.TEST_ELEC_ENGINE_TYPE);
TestEngine engine = (TestEngine) car.createChild(TestEngine.class, engineAttributes);
- assertEquals(1, car.getChildren(TestEngine.class).size());
-
+ assertEquals((long) 1, (long) car.getChildren(TestEngine.class).size());
Map<String, Object> secondEngineNameAttribute = new HashMap<>();
secondEngineNameAttribute.put(ConfiguredObject.TYPE, TestPetrolEngineImpl.TEST_PETROL_ENGINE_TYPE);
@@ -705,10 +769,11 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
{
// PASS
assertEquals(ConfiguredObject.ID, attrToDuplicate);
-
}
- assertEquals("Unexpected number of children after rejected duplicate", 1, car.getChildren(TestEngine.class).size());
+ assertEquals("Unexpected number of children after rejected duplicate",
+ (long) 1,
+ (long) car.getChildren(TestEngine.class).size());
assertSame(engine, car.getChildById(TestEngine.class, engine.getId()));
assertSame(engine, car.getChildByName(TestEngine.class, engine.getName()));
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/AncestorAttributeResolverTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/AncestorAttributeResolverTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/AncestorAttributeResolverTest.java
index 9acad34..1f90bad 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/AncestorAttributeResolverTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/AncestorAttributeResolverTest.java
@@ -21,17 +21,22 @@
package org.apache.qpid.server.model.testmodels.hierarchy;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
import java.util.HashMap;
import java.util.Map;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.model.AncestorAttributeResolver;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Model;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AncestorAttributeResolverTest extends QpidTestCase
+public class AncestorAttributeResolverTest extends UnitTestBase
{
public static final String CAR_NAME = "myCar";
@@ -41,10 +46,9 @@ public class AncestorAttributeResolverTest extends QpidTestCase
private TestCar _car;
private TestEngine _engine;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
Map<String, Object> carAttributes = new HashMap<>();
carAttributes.put(ConfiguredObject.NAME, CAR_NAME);
@@ -66,6 +70,7 @@ public class AncestorAttributeResolverTest extends QpidTestCase
}
+ @Test
public void testResolveToParent() throws Exception
{
_ancestorAttributeResolver = new AncestorAttributeResolver(_engine);
@@ -73,6 +78,7 @@ public class AncestorAttributeResolverTest extends QpidTestCase
assertEquals(CAR_NAME, actual);
}
+ @Test
public void testResolveToSelf() throws Exception
{
_ancestorAttributeResolver = new AncestorAttributeResolver(_car);
@@ -80,6 +86,7 @@ public class AncestorAttributeResolverTest extends QpidTestCase
assertEquals(CAR_NAME, actual);
}
+ @Test
public void testUnrecognisedCategoryName() throws Exception
{
_ancestorAttributeResolver = new AncestorAttributeResolver(_car);
@@ -87,6 +94,7 @@ public class AncestorAttributeResolverTest extends QpidTestCase
assertNull(actual);
}
+ @Test
public void testUnrecognisedAttributeName() throws Exception
{
_ancestorAttributeResolver = new AncestorAttributeResolver(_car);
@@ -94,6 +102,7 @@ public class AncestorAttributeResolverTest extends QpidTestCase
assertNull(actual);
}
+ @Test
public void testBadAncestorRef() throws Exception
{
_ancestorAttributeResolver = new AncestorAttributeResolver(_car);
@@ -101,6 +110,7 @@ public class AncestorAttributeResolverTest extends QpidTestCase
assertNull(actual);
}
+ @Test
public void testResolveAncestorAttributeOfTypeMap() throws Exception
{
Map<String, Object> carAttributes = new HashMap<>();
@@ -121,6 +131,7 @@ public class AncestorAttributeResolverTest extends QpidTestCase
assertEquals("Unexpected resolved ancestor attribute of type Map", parameters, data);
}
+ @Test
public void testResolveAncestorAttributeOfTypeConfiguredObject() throws Exception
{
Map<String, Object> carAttributes = new HashMap<>();
@@ -133,7 +144,10 @@ public class AncestorAttributeResolverTest extends QpidTestCase
_ancestorAttributeResolver = new AncestorAttributeResolver(_car);
String actual = _ancestorAttributeResolver.resolve("ancestor:testcar:alternateEngine", null);
- assertEquals("Unexpected resolved ancestor attribute of type ConfiguredObject" , _engine.getId().toString(), actual);
+ assertEquals("Unexpected resolved ancestor attribute of type ConfiguredObject",
+ _engine.getId().toString(),
+ actual);
+
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java
index a36ad76..6ef47b1 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java
@@ -22,7 +22,11 @@ package org.apache.qpid.server.model.testmodels.hierarchy;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Collection;
import java.util.Collections;
@@ -31,6 +35,7 @@ import java.util.Map;
import java.util.Set;
import com.google.common.collect.Lists;
+import org.junit.Test;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectAttribute;
@@ -38,22 +43,28 @@ import org.apache.qpid.server.model.ConfiguredObjectOperation;
import org.apache.qpid.server.model.ConfiguredObjectTypeRegistry;
import org.apache.qpid.server.model.ConfiguredSettableAttribute;
import org.apache.qpid.server.model.ManagedInterface;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class ConfiguredObjectTypeRegistryTest extends QpidTestCase
+public class ConfiguredObjectTypeRegistryTest extends UnitTestBase
{
private ConfiguredObjectTypeRegistry _typeRegistry = TestModel.getInstance().getTypeRegistry();
+ @Test
public void testTypeSpecialisations()
{
Collection<Class<? extends ConfiguredObject>> types = _typeRegistry.getTypeSpecialisations(TestEngine.class);
- assertEquals("Unexpected number of specialisations for " + TestEngine.class + " Found : " + types, 3, types.size());
+ assertEquals("Unexpected number of specialisations for " + TestEngine.class + " Found : " + types,
+ (long) 3,
+ (long) types.size());
+
+
assertTrue(types.contains(TestPetrolEngineImpl.class));
assertTrue(types.contains(TestHybridEngineImpl.class));
assertTrue(types.contains(TestElecEngineImpl.class));
}
+ @Test
public void testGetValidChildTypes()
{
// The standard car restricts its engine type
@@ -67,6 +78,7 @@ public class ConfiguredObjectTypeRegistryTest extends QpidTestCase
assertNull(kitCarValidEngineTypes);
}
+ @Test
public void testManagedInterfaces()
{
// The electric engine is rechargable
@@ -79,6 +91,7 @@ public class ConfiguredObjectTypeRegistryTest extends QpidTestCase
assertThat(stdCarIntfcs.size(), is(0));
}
+ @Test
public void testOperations()
{
final String objectName = "testKitCar";
@@ -125,6 +138,7 @@ public class ConfiguredObjectTypeRegistryTest extends QpidTestCase
}
}
+ @Test
public void testOperationWithMandatoryParameter_RejectsNullParameter()
{
final String objectName = "testKitCar";
@@ -158,23 +172,27 @@ public class ConfiguredObjectTypeRegistryTest extends QpidTestCase
}
}
+ @Test
public void testEnumValidValues_UnrestrictedSet() throws Exception
{
Map<String, ConfiguredObjectAttribute<?, ?>> attributeTypes = _typeRegistry.getAttributeTypes(TestCar.class);
ConfiguredSettableAttribute<?, ?> attribute = (ConfiguredSettableAttribute<?, ?>) attributeTypes.get("bodyColour");
+
assertEquals("The attribute's valid values should match the set of the enum",
- Lists.newArrayList("BLACK", "RED", "BLUE", "GREY"),
- attribute.validValues());
+ Lists.newArrayList("BLACK", "RED", "BLUE", "GREY"),
+ attribute.validValues());
}
+ @Test
public void testEnumValidValues_RestrictedSet() throws Exception
{
Map<String, ConfiguredObjectAttribute<?, ?>> attributeTypes = _typeRegistry.getAttributeTypes(TestCar.class);
ConfiguredSettableAttribute<?, ?> attribute = (ConfiguredSettableAttribute<?, ?>) attributeTypes.get("interiorColour");
- assertEquals("The attribute's valid values should match the restricted set defined on the attribute itself",
- Lists.newArrayList("GREY", "BLACK"),
- attribute.validValues());
+ assertEquals(
+ "The attribute's valid values should match the restricted set defined on the attribute itself",
+ Lists.newArrayList("GREY", "BLACK"),
+ attribute.validValues());
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/InjectedAttributeTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/InjectedAttributeTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/InjectedAttributeTest.java
index 4f2c010..90ce83e 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/InjectedAttributeTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/InjectedAttributeTest.java
@@ -20,6 +20,10 @@
*/
package org.apache.qpid.server.model.testmodels.hierarchy;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
@@ -30,14 +34,28 @@ import java.util.List;
import java.util.Map;
import com.google.common.collect.Lists;
+import org.junit.Test;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.model.*;
+import org.apache.qpid.server.model.ConfiguredDerivedInjectedAttribute;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.ConfiguredObjectInjectedAttribute;
+import org.apache.qpid.server.model.ConfiguredObjectInjectedOperation;
+import org.apache.qpid.server.model.ConfiguredObjectInjectedStatistic;
+import org.apache.qpid.server.model.ConfiguredObjectOperation;
+import org.apache.qpid.server.model.ConfiguredSettableInjectedAttribute;
+import org.apache.qpid.server.model.Initialization;
+import org.apache.qpid.server.model.InjectedAttributeOrStatistic;
+import org.apache.qpid.server.model.InjectedAttributeStatisticOrOperation;
+import org.apache.qpid.server.model.OperationParameter;
+import org.apache.qpid.server.model.OperationParameterFromInjection;
+import org.apache.qpid.server.model.StatisticType;
+import org.apache.qpid.server.model.StatisticUnit;
import org.apache.qpid.server.model.testmodels.hierarchy.TestCar.Colour;
import org.apache.qpid.server.plugin.ConfiguredObjectAttributeInjector;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class InjectedAttributeTest extends QpidTestCase
+public class InjectedAttributeTest extends UnitTestBase
{
private static final InjectedAttributeStatisticOrOperation.TypeValidator TYPE_VALIDATOR =
@@ -112,6 +130,7 @@ public class InjectedAttributeTest extends QpidTestCase
}
}
+ @Test
public void testInjectedSettableAttributeWithDefault()
{
final ConfiguredSettableInjectedAttribute<?, ?> attrInjector =
@@ -145,10 +164,10 @@ public class InjectedAttributeTest extends QpidTestCase
testCar.setAttributes(Collections.<String,Object>singletonMap("meaningOfLife", "${varieties}"));
assertEquals("incorrect attribute value", Integer.valueOf(57), testCar.getAttribute("meaningOfLife"));
-
}
+ @Test
public void testInjectedSettableAttributeValidValues()
{
final ConfiguredSettableInjectedAttribute<?, ?> attrInjector =
@@ -174,7 +193,6 @@ public class InjectedAttributeTest extends QpidTestCase
testCar.setAttributes(Collections.<String,Object>singletonMap("meaningOfLife", 49));
-
assertEquals("incorrect attribute value", Integer.valueOf(49), testCar.getAttribute("meaningOfLife"));
try
@@ -188,6 +206,7 @@ public class InjectedAttributeTest extends QpidTestCase
}
}
+ @Test
public void testInjectedSettableAttributeEnumValidValues_Unrestricted()
{
final ConfiguredSettableInjectedAttribute<?, ?> attribute =
@@ -207,10 +226,11 @@ public class InjectedAttributeTest extends QpidTestCase
null, Initialization.none);
assertEquals("The attribute's valid values should match the set of the enum",
- Lists.newArrayList("BLACK", "RED", "BLUE", "GREY"),
- attribute.validValues());
+ Lists.newArrayList("BLACK", "RED", "BLUE", "GREY"),
+ attribute.validValues());
}
+ @Test
public void testInjectedSettableAttributeEnumValidValues_RestrictedSet()
{
final ConfiguredSettableInjectedAttribute<?, ?> attribute =
@@ -229,11 +249,13 @@ public class InjectedAttributeTest extends QpidTestCase
"",
null, Initialization.none);
- assertEquals("The attribute's valid values should match the restricted set defined on the attribute itself",
- Lists.newArrayList("GREY", "BLACK"),
- attribute.validValues());
+ assertEquals(
+ "The attribute's valid values should match the restricted set defined on the attribute itself",
+ Lists.newArrayList("GREY", "BLACK"),
+ attribute.validValues());
}
+ @Test
public void testInjectedDerivedAttribute() throws Exception
{
Method method = InjectedAttributeTest.class.getDeclaredMethod("getMeaningOfLife", TestCar.class);
@@ -253,12 +275,11 @@ public class InjectedAttributeTest extends QpidTestCase
TestCar<?> testCar = new TestStandardCarImpl(Collections.<String,Object>singletonMap("name", "Arthur"), model);
-
assertEquals("incorrect attribute value", Integer.valueOf(42), testCar.getAttribute("meaningOfLife"));
-
}
+ @Test
public void testInjectedStatistic() throws Exception
{
@@ -278,11 +299,12 @@ public class InjectedAttributeTest extends QpidTestCase
TestCar<?> testCar = new TestStandardCarImpl(Collections.<String,Object>singletonMap("name", "Arthur"), model);
final Map<String, Object> statistics = testCar.getStatistics();
- assertEquals("incorrect number of statistics", 1, statistics.size());
+ assertEquals("incorrect number of statistics", (long) 1, (long) statistics.size());
assertEquals("incorrect statistic value", 42, statistics.get("meaningOfLife"));
}
+ @Test
public void testInjectedStatisticWithParameters() throws Exception
{
@@ -309,12 +331,13 @@ public class InjectedAttributeTest extends QpidTestCase
TestCar<?> testCar = new TestStandardCarImpl(Collections.<String,Object>singletonMap("name", "Arthur"), model);
final Map<String, Object> statistics = testCar.getStatistics();
- assertEquals("incorrect number of statistics", 2, statistics.size());
+ assertEquals("incorrect number of statistics", (long) 2, (long) statistics.size());
assertEquals("incorrect statistic value", 1, statistics.get("whatISent1"));
assertEquals("incorrect statistic value", 2, statistics.get("whatISent2"));
}
+ @Test
public void testInjectedOperation() throws Exception
{
Method method = InjectedAttributeTest.class.getDeclaredMethod("fly", TestCar.class, Integer.TYPE);
@@ -347,6 +370,7 @@ public class InjectedAttributeTest extends QpidTestCase
assertEquals("Car should not be able to fly at 5000m", Boolean.FALSE, result);
}
+ @Test
public void testInjectedOperationWithStaticParams() throws Exception
{
@@ -392,6 +416,7 @@ public class InjectedAttributeTest extends QpidTestCase
assertEquals("Car say 'Goodbye' once", Collections.singletonList("Goodbye"), result);
}
+ @Test
public void testOperationWithMandatoryParameter_RejectsNullParameter() throws Exception
{
Method method = InjectedAttributeTest.class.getDeclaredMethod("ping", TestCar.class, String.class);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/AbstractConfiguredObjectTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/AbstractConfiguredObjectTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/AbstractConfiguredObjectTest.java
index 3fc2761..7483a37 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/AbstractConfiguredObjectTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/AbstractConfiguredObjectTest.java
@@ -18,6 +18,12 @@
*/
package org.apache.qpid.server.model.testmodels.lifecycle;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -25,6 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import com.google.common.util.concurrent.ListenableFuture;
+import org.junit.Test;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.AbstractConfigurationChangeListener;
@@ -33,14 +40,15 @@ import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.IllegalStateTransitionException;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AbstractConfiguredObjectTest extends QpidTestCase
+public class AbstractConfiguredObjectTest extends UnitTestBase
{
+ @Test
public void testOpeningResultsInErroredStateWhenResolutionFails() throws Exception
{
- TestConfiguredObject object = new TestConfiguredObject(getName());
+ TestConfiguredObject object = new TestConfiguredObject(getTestName());
object.setThrowExceptionOnPostResolve(true);
object.open();
assertFalse("Unexpected opened", object.isOpened());
@@ -52,9 +60,10 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals("Unexpected state", State.ACTIVE, object.getState());
}
+ @Test
public void testOpeningResultsInErroredStateWhenActivationFails() throws Exception
{
- TestConfiguredObject object = new TestConfiguredObject(getName());
+ TestConfiguredObject object = new TestConfiguredObject(getTestName());
object.setThrowExceptionOnActivate(true);
object.open();
assertEquals("Unexpected state", State.ERRORED, object.getState());
@@ -64,9 +73,10 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals("Unexpected state", State.ACTIVE, object.getState());
}
+ @Test
public void testOpeningInERROREDStateAfterFailedOpenOnDesiredStateChangeToActive() throws Exception
{
- TestConfiguredObject object = new TestConfiguredObject(getName());
+ TestConfiguredObject object = new TestConfiguredObject(getTestName());
object.setThrowExceptionOnOpen(true);
object.open();
assertFalse("Unexpected opened", object.isOpened());
@@ -78,9 +88,10 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals("Unexpected state", State.ACTIVE, object.getState());
}
+ @Test
public void testOpeningInERROREDStateAfterFailedOpenOnStart() throws Exception
{
- TestConfiguredObject object = new TestConfiguredObject(getName());
+ TestConfiguredObject object = new TestConfiguredObject(getTestName());
object.setThrowExceptionOnOpen(true);
object.open();
assertFalse("Unexpected opened", object.isOpened());
@@ -92,9 +103,10 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals("Unexpected state", State.ACTIVE, object.getState());
}
+ @Test
public void testDeletionERROREDStateAfterFailedOpenOnDelete() throws Exception
{
- TestConfiguredObject object = new TestConfiguredObject(getName());
+ TestConfiguredObject object = new TestConfiguredObject(getTestName());
object.setThrowExceptionOnOpen(true);
object.open();
assertFalse("Unexpected opened", object.isOpened());
@@ -105,9 +117,10 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals("Unexpected state", State.DELETED, object.getState());
}
+ @Test
public void testDeletionInERROREDStateAfterFailedOpenOnDesiredStateChangeToDelete() throws Exception
{
- TestConfiguredObject object = new TestConfiguredObject(getName());
+ TestConfiguredObject object = new TestConfiguredObject(getTestName());
object.setThrowExceptionOnOpen(true);
object.open();
assertFalse("Unexpected opened", object.isOpened());
@@ -119,9 +132,10 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
}
+ @Test
public void testCreationWithExceptionThrownFromValidationOnCreate() throws Exception
{
- TestConfiguredObject object = new TestConfiguredObject(getName());
+ TestConfiguredObject object = new TestConfiguredObject(getTestName());
object.setThrowExceptionOnValidationOnCreate(true);
try
{
@@ -135,18 +149,20 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertFalse("Unexpected opened", object.isOpened());
}
+ @Test
public void testCreationWithoutExceptionThrownFromValidationOnCreate() throws Exception
{
- TestConfiguredObject object = new TestConfiguredObject(getName());
+ TestConfiguredObject object = new TestConfiguredObject(getTestName());
object.setThrowExceptionOnValidationOnCreate(false);
object.create();
assertTrue("Unexpected opened", object.isOpened());
assertEquals("Unexpected state", State.ACTIVE, object.getState());
}
+ @Test
public void testCreationWithExceptionThrownFromOnOpen() throws Exception
{
- TestConfiguredObject object = new TestConfiguredObject(getName());
+ TestConfiguredObject object = new TestConfiguredObject(getTestName());
object.setThrowExceptionOnOpen(true);
try
{
@@ -162,9 +178,10 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals("Unexpected state", State.DELETED, object.getState());
}
+ @Test
public void testCreationWithExceptionThrownFromOnCreate() throws Exception
{
- TestConfiguredObject object = new TestConfiguredObject(getName());
+ TestConfiguredObject object = new TestConfiguredObject(getTestName());
object.setThrowExceptionOnCreate(true);
try
{
@@ -180,9 +197,10 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals("Unexpected state", State.DELETED, object.getState());
}
+ @Test
public void testCreationWithExceptionThrownFromActivate() throws Exception
{
- TestConfiguredObject object = new TestConfiguredObject(getName());
+ TestConfiguredObject object = new TestConfiguredObject(getTestName());
object.setThrowExceptionOnActivate(true);
try
{
@@ -197,6 +215,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals("Unexpected state", State.DELETED, object.getState());
}
+ @Test
public void testUnresolvedChildInERROREDStateIsNotValidatedOrOpenedOrAttainedDesiredStateOnParentOpen() throws Exception
{
TestConfiguredObject parent = new TestConfiguredObject("parent");
@@ -225,6 +244,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals("Unexpected child1 state", State.ERRORED, child1.getState());
}
+ @Test
public void testUnvalidatedChildInERROREDStateIsNotOpenedOrAttainedDesiredStateOnParentOpen() throws Exception
{
TestConfiguredObject parent = new TestConfiguredObject("parent");
@@ -253,6 +273,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
assertEquals("Unexpected child1 state", State.ERRORED, child1.getState());
}
+ @Test
public void testSuccessfulStateTransitionInvokesListener() throws Exception
{
TestConfiguredObject parent = new TestConfiguredObject("parent");
@@ -273,7 +294,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
parent.delete();
assertEquals(State.DELETED, newState.get());
- assertEquals(1, callCounter.get());
+ assertEquals((long) 1, (long) callCounter.get());
}
// TODO - not sure if I want to keep the state transition methods on delete
@@ -318,12 +339,13 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
{
assertSame("State transition threw unexpected exception.", expectedException, e);
}
- assertEquals(0, callCounter.get());
+ assertEquals((long) 0, (long) callCounter.get());
assertEquals(State.ACTIVE, parent.getDesiredState());
assertEquals(State.ACTIVE, parent.getState());
}
+ @Test
public void testSuccessfulDeletion() throws Exception
{
TestConfiguredObject configuredObject = new TestConfiguredObject("configuredObject");
@@ -346,18 +368,21 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
});
configuredObject.delete();
- assertEquals(2, events.size());
+ assertEquals((long) 2, (long) events.size());
assertEquals(State.DELETED, configuredObject.getDesiredState());
assertEquals(State.DELETED, configuredObject.getState());
- assertEquals("Unexpected events number", 2, events.size());
+ assertEquals("Unexpected events number", (long) 2, (long) events.size());
ChangeEvent event0 = events.get(0);
ChangeEvent event1 = events.get(1);
assertEquals("Unexpected first event: " + event0,
- new ChangeEvent(EventType.STATE_CHANGED, configuredObject, Exchange.DESIRED_STATE, State.ACTIVE, State.DELETED), event0 );
+ new ChangeEvent(EventType.STATE_CHANGED, configuredObject, Exchange.DESIRED_STATE, State.ACTIVE, State.DELETED),
+ event0);
+
assertEquals("Unexpected second event: " + event1,
- new ChangeEvent(EventType.ATTRIBUTE_SET, configuredObject, Exchange.DESIRED_STATE, State.ACTIVE, State.DELETED), event1 );
+ new ChangeEvent(EventType.ATTRIBUTE_SET, configuredObject, Exchange.DESIRED_STATE, State.ACTIVE, State.DELETED),
+ event1);
}
private enum EventType
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org