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:14 UTC
[07/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-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java b/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java
index 3e6e214..375bf1e 100644
--- a/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java
+++ b/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java
@@ -20,6 +20,11 @@
package org.apache.qpid.server.store.derby;
import static org.apache.qpid.server.model.preferences.PreferenceTestHelper.assertRecords;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeThat;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -39,6 +44,9 @@ import java.util.Map;
import java.util.UUID;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,9 +57,10 @@ import org.apache.qpid.server.store.jdbc.AbstractJDBCPreferenceStore;
import org.apache.qpid.server.store.preferences.PreferenceRecord;
import org.apache.qpid.server.store.preferences.PreferenceRecordImpl;
import org.apache.qpid.server.store.preferences.PreferenceStoreUpdater;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
+import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
-public class DerbyPreferenceStoreTest extends QpidTestCase
+public class DerbyPreferenceStoreTest extends UnitTestBase
{
private PreferenceStoreUpdater _updater;
private DerbyTestPreferenceStore _preferenceStore;
@@ -59,10 +68,10 @@ public class DerbyPreferenceStoreTest extends QpidTestCase
private String _connectionUrl;
private Connection _testConnection;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
+ assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.DERBY)));
_updater = mock(PreferenceStoreUpdater.class);
when(_updater.getLatestVersion()).thenReturn(BrokerModel.MODEL_VERSION);
@@ -79,7 +88,7 @@ public class DerbyPreferenceStoreTest extends QpidTestCase
new PreferenceRecordImpl(UUID.randomUUID(), Collections.<String, Object>singletonMap("name", "test1")));
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -88,15 +97,21 @@ public class DerbyPreferenceStoreTest extends QpidTestCase
{
_testConnection.close();
}
- _preferenceStore.close();
- shutdownDerby();
+ if (_preferenceStore != null)
+ {
+ _preferenceStore.close();
+ }
}
finally
{
- super.tearDown();
+ if (_connectionUrl != null)
+ {
+ DerbyUtils.shutdownDatabase(_connectionUrl);
+ }
}
}
+ @Test
public void testVersionAfterUpgrade() throws Exception
{
ModelVersion storeVersion =
@@ -121,10 +136,11 @@ public class DerbyPreferenceStoreTest extends QpidTestCase
assertEquals("Unexpected version", BrokerModel.MODEL_VERSION, storedVersion.toString());
}
+ @Test
public void testOpenAndLoadEmptyStore() throws Exception
{
Collection<PreferenceRecord> records = _preferenceStore.openAndLoad(_updater);
- assertEquals("Unexpected number of records", 0, records.size());
+ assertEquals("Unexpected number of records", (long) 0, (long) records.size());
_testConnection = DriverManager.getConnection(_connectionUrl);
@@ -144,10 +160,11 @@ public class DerbyPreferenceStoreTest extends QpidTestCase
}
}
- assertEquals("Unexpected versions size", 1, versions.size());
+ assertEquals("Unexpected versions size", (long) 1, (long) versions.size());
assertEquals("Unexpected version", BrokerModel.MODEL_VERSION, versions.get(0));
}
+ @Test
public void testOpenAndLoadNonEmptyStore() throws Exception
{
populateTestData();
@@ -156,6 +173,7 @@ public class DerbyPreferenceStoreTest extends QpidTestCase
assertRecords(_testRecords, records);
}
+ @Test
public void testClose() throws Exception
{
_preferenceStore.openAndLoad(_updater);
@@ -172,6 +190,7 @@ public class DerbyPreferenceStoreTest extends QpidTestCase
}
}
+ @Test
public void testUpdateOrCreate() throws Exception
{
_preferenceStore.openAndLoad(_updater);
@@ -183,6 +202,7 @@ public class DerbyPreferenceStoreTest extends QpidTestCase
assertRecords(_testRecords, records);
}
+ @Test
public void testReplace() throws Exception
{
populateTestData();
@@ -201,6 +221,7 @@ public class DerbyPreferenceStoreTest extends QpidTestCase
assertRecords(testRecords, records);
}
+ @Test
public void testUpdateFailIfNotOpened() throws Exception
{
populateTestData();
@@ -216,6 +237,7 @@ public class DerbyPreferenceStoreTest extends QpidTestCase
}
}
+ @Test
public void testReplaceFailIfNotOpened() throws Exception
{
populateTestData();
@@ -265,33 +287,6 @@ public class DerbyPreferenceStoreTest extends QpidTestCase
return records;
}
- private void shutdownDerby() throws SQLException
- {
- Connection connection = null;
- try
- {
- connection = DriverManager.getConnection("jdbc:derby:memory:/" + getTestName() + ";shutdown=true");
- }
- catch (SQLException e)
- {
- if (e.getSQLState().equalsIgnoreCase("08006"))
- {
- //expected and represents a clean shutdown of this database only, do nothing.
- }
- else
- {
- throw e;
- }
- }
- finally
- {
- if (connection != null)
- {
- connection.close();
- }
- }
- }
-
private static class DerbyTestPreferenceStore extends AbstractJDBCPreferenceStore
{
private static final Logger LOGGER = LoggerFactory.getLogger(DerbyTestPreferenceStore.class);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNodeTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNodeTest.java b/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNodeTest.java
index 9238658..4b31923 100644
--- a/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNodeTest.java
+++ b/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNodeTest.java
@@ -20,6 +20,11 @@
*/
package org.apache.qpid.server.virtualhostnode.derby;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -31,30 +36,36 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.BrokerImpl;
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.model.VirtualHostNode;
-import org.apache.qpid.server.model.BrokerImpl;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
+import org.apache.qpid.test.utils.UnitTestBase;
+import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
-public class DerbyVirtualHostNodeTest extends QpidTestCase
+public class DerbyVirtualHostNodeTest extends UnitTestBase
{
private TaskExecutor _taskExecutor;
private File _workDir;
private Broker<BrokerImpl> _broker;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
+ assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.DERBY)));
+
_taskExecutor = new TaskExecutorImpl();
_taskExecutor.start();
_workDir = TestFileUtils.createTestDirectory("qpid.work_dir", true);
@@ -62,21 +73,30 @@ public class DerbyVirtualHostNodeTest extends QpidTestCase
_broker = createBroker();
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
{
- _broker.close();
+ if (_broker != null)
+ {
+ _broker.close();
+ }
}
finally
{
- _taskExecutor.stop();
- TestFileUtils.delete(_workDir, true);
- super.tearDown();
+ if (_taskExecutor != null)
+ {
+ _taskExecutor.stop();
+ }
+ if (_workDir != null)
+ {
+ TestFileUtils.delete(_workDir, true);
+ }
}
}
+ @Test
public void testCreateAndCloseVirtualHostNode() throws Exception
{
String nodeName = getTestName();
@@ -90,6 +110,7 @@ public class DerbyVirtualHostNodeTest extends QpidTestCase
}
+ @Test
public void testCreateDuplicateVirtualHostNodeAndClose() throws Exception
{
@@ -107,11 +128,15 @@ public class DerbyVirtualHostNodeTest extends QpidTestCase
}
catch(Exception e)
{
- assertEquals("Unexpected message", "Child of type " + virtualHostNode.getClass().getSimpleName() + " already exists with name of " + getTestName(), e.getMessage());
+ assertEquals("Unexpected message",
+ "Child of type " + virtualHostNode.getClass().getSimpleName() + " already exists with name of " + getTestName(),
+ e.getMessage());
+
}
virtualHostNode.close();
}
+ @Test
public void testOnCreateValidationForFileStorePath() throws Exception
{
File file = new File(_workDir, getTestName());
@@ -135,6 +160,7 @@ public class DerbyVirtualHostNodeTest extends QpidTestCase
}
+ @Test
public void testOnCreateValidationForNonWritableStorePath() throws Exception
{
if (Files.getFileAttributeView(_workDir.toPath(), PosixFileAttributeView.class) != null)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/jdbc-provider-bone/pom.xml
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-provider-bone/pom.xml b/broker-plugins/jdbc-provider-bone/pom.xml
index d65381b..fc5c917 100644
--- a/broker-plugins/jdbc-provider-bone/pom.xml
+++ b/broker-plugins/jdbc-provider-bone/pom.xml
@@ -59,6 +59,12 @@
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-test-utils</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/jdbc-provider-bone/src/test/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-provider-bone/src/test/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactoryTest.java b/broker-plugins/jdbc-provider-bone/src/test/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactoryTest.java
index f250f7c..894c2b3 100644
--- a/broker-plugins/jdbc-provider-bone/src/test/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactoryTest.java
+++ b/broker-plugins/jdbc-provider-bone/src/test/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactoryTest.java
@@ -23,14 +23,19 @@ package org.apache.qpid.server.store.jdbc.bonecp;
import static org.apache.qpid.server.store.jdbc.bonecp.BoneCPConnectionProviderFactory.MAX_CONNECTIONS_PER_PARTITION;
import static org.apache.qpid.server.store.jdbc.bonecp.BoneCPConnectionProviderFactory.MIN_CONNECTIONS_PER_PARTITION;
import static org.apache.qpid.server.store.jdbc.bonecp.BoneCPConnectionProviderFactory.PARTITION_COUNT;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.util.Set;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class BoneCPConnectionProviderFactoryTest extends TestCase
+import org.apache.qpid.test.utils.UnitTestBase;
+
+public class BoneCPConnectionProviderFactoryTest extends UnitTestBase
{
- public void testGetProviderAttributeNames() throws Exception
+ @Test
+ public void testGetProviderAttributeNames()
{
BoneCPConnectionProviderFactory factory = new BoneCPConnectionProviderFactory();
Set<String> supported = factory.getProviderAttributeNames();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/jdbc-provider-bone/src/test/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-provider-bone/src/test/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderTest.java b/broker-plugins/jdbc-provider-bone/src/test/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderTest.java
index 6669974..58fe790 100644
--- a/broker-plugins/jdbc-provider-bone/src/test/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderTest.java
+++ b/broker-plugins/jdbc-provider-bone/src/test/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderTest.java
@@ -22,17 +22,20 @@ package org.apache.qpid.server.store.jdbc.bonecp;
import static org.apache.qpid.server.store.jdbc.bonecp.BoneCPConnectionProvider.DEFAULT_MAX_CONNECTIONS_PER_PARTITION;
import static org.apache.qpid.server.store.jdbc.bonecp.BoneCPConnectionProvider.DEFAULT_MIN_CONNECTIONS_PER_PARTITION;
-import static org.apache.qpid.server.store.jdbc.bonecp.BoneCPConnectionProvider.DEFAULT_PARTITION_COUNT;
+import static org.junit.Assert.assertEquals;
import java.util.HashMap;
import java.util.Map;
import com.jolbox.bonecp.BoneCPConfig;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class BoneCPConnectionProviderTest extends TestCase
+import org.apache.qpid.test.utils.UnitTestBase;
+
+public class BoneCPConnectionProviderTest extends UnitTestBase
{
- public void testCreateBoneCPConfig() throws Exception
+ @Test
+ public void testCreateBoneCPConfig()
{
final Map<String, String> attributes = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStoreTest.java b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStoreTest.java
index aca3d9c..b55acc3 100644
--- a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStoreTest.java
+++ b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStoreTest.java
@@ -23,6 +23,7 @@ package org.apache.qpid.server.store.jdbc;
import static org.apache.qpid.server.store.jdbc.TestJdbcUtils.assertTablesExistence;
import static org.apache.qpid.server.store.jdbc.TestJdbcUtils.getTableNames;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -32,6 +33,8 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.Test;
+
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
@@ -60,6 +63,7 @@ public class GenericJDBCConfigurationStoreTest extends AbstractDurableConfigurat
}
}
+ @Test
public void testOnDelete() throws Exception
{
try(Connection connection = openConnection())
@@ -75,6 +79,7 @@ public class GenericJDBCConfigurationStoreTest extends AbstractDurableConfigurat
}
}
+ @Test
public void testDeleteAction()
{
GenericJDBCConfigurationStore store = (GenericJDBCConfigurationStore) getConfigurationStore();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCDetailsTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCDetailsTest.java b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCDetailsTest.java
index 5e82b76..df31fe0 100644
--- a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCDetailsTest.java
+++ b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCDetailsTest.java
@@ -19,14 +19,21 @@
package org.apache.qpid.server.store.jdbc;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+
-public class JDBCDetailsTest extends QpidTestCase
-{
+public class JDBCDetailsTest extends UnitTestBase{
+ @Test
public void testDerby()
{
JDBCDetails derbyDetails = JDBCDetails.getJdbcDetails("derby", Collections.emptyMap());
@@ -40,6 +47,7 @@ public class JDBCDetailsTest extends QpidTestCase
assertFalse(derbyDetails.isOverridden());
}
+ @Test
public void testUnknownVendor_UsesFallbackDetails()
{
JDBCDetails details = JDBCDetails.getJdbcDetails("homedb", Collections.emptyMap());
@@ -52,6 +60,7 @@ public class JDBCDetailsTest extends QpidTestCase
assertFalse(details.isKnownVendor());
}
+ @Test
public void testDerbyWithOverride()
{
@@ -72,6 +81,7 @@ public class JDBCDetailsTest extends QpidTestCase
+ @Test
public void testRecognisedDriver_AllDetailsProvidedByContext()
{
Map<String, String> contextMap = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
index e392109..8be3376 100644
--- a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
+++ b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
@@ -22,6 +22,9 @@ package org.apache.qpid.server.store.jdbc;
import static org.apache.qpid.server.store.jdbc.TestJdbcUtils.assertTablesExistence;
import static org.apache.qpid.server.store.jdbc.TestJdbcUtils.getTableNames;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -33,6 +36,9 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import com.google.common.util.concurrent.ListenableFuture;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.message.AMQMessageHeader;
@@ -55,7 +61,7 @@ public class JDBCMessageStoreTest extends MessageStoreTestCase
private static final double SPARSITY_FRACTION = 1.0;
- @Override
+ @Before
public void setUp() throws Exception
{
super.setUp();
@@ -63,7 +69,7 @@ public class JDBCMessageStoreTest extends MessageStoreTestCase
QpidByteBuffer.initialisePool(BUFFER_SIZE, POOL_SIZE, SPARSITY_FRACTION);
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -80,6 +86,7 @@ public class JDBCMessageStoreTest extends MessageStoreTestCase
}
}
+ @Test
public void testTablePrefix() throws Exception
{
Collection<String> expectedTables = ((GenericJDBCMessageStore)getStore()).getTableNames();
@@ -93,6 +100,7 @@ public class JDBCMessageStoreTest extends MessageStoreTestCase
}
}
+ @Test
public void testOnDelete() throws Exception
{
try(Connection connection = openConnection())
@@ -107,6 +115,7 @@ public class JDBCMessageStoreTest extends MessageStoreTestCase
}
}
+ @Test
public void testEnqueueTransactionCommitAsync() throws Exception
{
final String queueName = getTestName();
@@ -127,6 +136,7 @@ public class JDBCMessageStoreTest extends MessageStoreTestCase
future.get(1000, TimeUnit.MILLISECONDS);
}
+ @Test
public void testDequeueTransactionCommitAsync() throws Exception
{
final String queueName = getTestName();
@@ -147,6 +157,7 @@ public class JDBCMessageStoreTest extends MessageStoreTestCase
future.get(1000, TimeUnit.MILLISECONDS);
}
+ @Test
public void testDeleteAction()
{
GenericJDBCMessageStore store = (GenericJDBCMessageStore) getStore();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigTest.java b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigTest.java
index a27b45c..2c42015 100644
--- a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigTest.java
+++ b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigTest.java
@@ -19,6 +19,7 @@
package org.apache.qpid.server.store.jdbc;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import java.security.Principal;
@@ -26,14 +27,17 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+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;
import org.apache.qpid.server.logging.EventLogger;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class JDBCSystemConfigTest extends QpidTestCase
+public class JDBCSystemConfigTest extends UnitTestBase
{
+ @Test
public void testInvalidTableNamePrefix() throws Exception
{
final TaskExecutor taskExecutor = new CurrentThreadTaskExecutor();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java
index 3ceda39..3b69808 100644
--- a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java
+++ b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java
@@ -19,6 +19,8 @@
package org.apache.qpid.server.virtualhost.jdbc;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -29,6 +31,10 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
+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.logging.EventLogger;
@@ -42,25 +48,23 @@ import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.store.jdbc.JDBCContainer;
import org.apache.qpid.server.store.jdbc.TestJdbcUtils;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class JDBCVirtualHostTest extends QpidTestCase
+public class JDBCVirtualHostTest extends UnitTestBase
{
private CurrentThreadTaskExecutor _taskExecutor;
private String _connectionURL;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_taskExecutor = new CurrentThreadTaskExecutor();
_taskExecutor.start();
}
- @Override
+ @After
public void tearDown() throws Exception
{
- super.tearDown();
_taskExecutor.stopImmediately();
if (_connectionURL != null)
{
@@ -68,6 +72,7 @@ public class JDBCVirtualHostTest extends QpidTestCase
}
}
+ @Test
public void testInvalidTableNamePrefix() throws Exception
{
final VirtualHostNode vhn = mock(VirtualHostNode.class);
@@ -119,6 +124,7 @@ public class JDBCVirtualHostTest extends QpidTestCase
}
}
+ @Test
public void testDeleteAction()
{
_connectionURL = "jdbc:derby:memory:/" + getTestName();
@@ -127,7 +133,7 @@ public class JDBCVirtualHostTest extends QpidTestCase
attributes.put(ConfiguredObject.TYPE, JDBCVirtualHostImpl.VIRTUAL_HOST_TYPE);
attributes.put("connectionUrl", _connectionURL + ";create=true");
- final VirtualHost vh = BrokerTestHelper.createVirtualHost(attributes);
+ final VirtualHost vh = BrokerTestHelper.createVirtualHost(attributes, this);
AtomicBoolean deleted = new AtomicBoolean();
((JDBCContainer)vh).addDeleteAction(object -> deleted.set(true));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeTest.java b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeTest.java
index b911a51..0b622cc 100644
--- a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeTest.java
+++ b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeTest.java
@@ -19,6 +19,8 @@
package org.apache.qpid.server.virtualhostnode.jdbc;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -29,6 +31,10 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
+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.model.Broker;
@@ -40,17 +46,16 @@ import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.store.jdbc.JDBCContainer;
import org.apache.qpid.server.store.jdbc.TestJdbcUtils;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class JDBCVirtualHostNodeTest extends QpidTestCase
+public class JDBCVirtualHostNodeTest extends UnitTestBase
{
private CurrentThreadTaskExecutor _taskExecutor;
private String _connectionURL;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_taskExecutor = new CurrentThreadTaskExecutor();
_taskExecutor.start();
if (_connectionURL != null)
@@ -59,13 +64,13 @@ public class JDBCVirtualHostNodeTest extends QpidTestCase
}
}
- @Override
+ @After
public void tearDown() throws Exception
{
- super.tearDown();
_taskExecutor.stopImmediately();
}
+ @Test
public void testInvalidTableNamePrefix() throws Exception
{
SystemConfig systemConfig = mock(SystemConfig.class);
@@ -111,6 +116,7 @@ public class JDBCVirtualHostNodeTest extends QpidTestCase
}
}
+ @Test
public void testDeleteAction()
{
_connectionURL = "jdbc:derby:memory:/" + getTestName();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
index 798d11a..3fe9c57 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
@@ -20,7 +20,9 @@
*/
package org.apache.qpid.server.logging.logback;
-import static org.junit.Assume.assumeTrue;
+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.when;
@@ -38,13 +40,16 @@ import ch.qos.logback.core.rolling.RollingPolicy;
import ch.qos.logback.core.rolling.TimeBasedRollingPolicy;
import ch.qos.logback.core.rolling.TriggeringPolicy;
import ch.qos.logback.core.rolling.helper.CompressionMode;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AppenderUtilsTest extends QpidTestCase
+public class AppenderUtilsTest extends UnitTestBase
{
private static final Logger LOGGER = LoggerFactory.getLogger(AppenderUtilsTest.class);
@@ -56,10 +61,9 @@ public class AppenderUtilsTest extends QpidTestCase
private File _testLogFile;
private String _testLogFileName;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_testLogFile = File.createTempFile(getTestName(), ".log");
_testLogFileName = _testLogFile.getAbsolutePath();
_settings = mock(FileLoggerSettings.class);
@@ -73,13 +77,13 @@ public class AppenderUtilsTest extends QpidTestCase
when(_settings.getExecutorService()).thenReturn(mock(ScheduledExecutorService.class));
}
- @Override
- protected void tearDown() throws Exception
+ @After
+ public void tearDown() throws Exception
{
- super.tearDown();
_testLogFile.delete();
}
+ @Test
public void testCreateRollingFileAppenderDailyRolling()
{
final RollingFileAppender<ILoggingEvent> appender = new RollingFileAppender<>();
@@ -88,23 +92,31 @@ public class AppenderUtilsTest extends QpidTestCase
assertEquals("Unexpected appender file name", _testLogFileName, appender.getFile());
RollingPolicy rollingPolicy = appender.getRollingPolicy();
- assertTrue("Unexpected rolling policy", rollingPolicy instanceof RollingPolicyDecorator);
+ final boolean condition2 = rollingPolicy instanceof RollingPolicyDecorator;
+ assertTrue("Unexpected rolling policy", condition2);
rollingPolicy = ((RollingPolicyDecorator)rollingPolicy).getDecorated();
- assertTrue("Unexpected decorated rolling policy", rollingPolicy instanceof TimeBasedRollingPolicy);
- assertEquals("Unexpected max history", MAX_HISTORY, ((TimeBasedRollingPolicy) rollingPolicy).getMaxHistory());
+ final boolean condition1 = rollingPolicy instanceof TimeBasedRollingPolicy;
+ assertTrue("Unexpected decorated rolling policy", condition1);
+ assertEquals("Unexpected max history",
+ (long) MAX_HISTORY,
+ (long) ((TimeBasedRollingPolicy) rollingPolicy).getMaxHistory());
+
assertEquals("Unexpected file name pattern",
- _testLogFileName + ".%d{yyyy-MM-dd}.%i.gz",
- ((TimeBasedRollingPolicy) rollingPolicy).getFileNamePattern());
+ _testLogFileName + ".%d{yyyy-MM-dd}.%i.gz",
+ ((TimeBasedRollingPolicy) rollingPolicy).getFileNamePattern());
+
assertEquals("Unexpected compression mode", CompressionMode.GZ, rollingPolicy.getCompressionMode());
TriggeringPolicy triggeringPolicy = ((TimeBasedRollingPolicy) rollingPolicy).getTimeBasedFileNamingAndTriggeringPolicy();
- assertTrue("Unexpected triggering policy", triggeringPolicy instanceof AppenderUtils.DailyTriggeringPolicy);
+ final boolean condition = triggeringPolicy instanceof AppenderUtils.DailyTriggeringPolicy;
+ assertTrue("Unexpected triggering policy", condition);
assertEquals("Unexpected triggering policy",
- String.valueOf(MAX_FILE_SIZE) + " MB",
- ((AppenderUtils.DailyTriggeringPolicy) triggeringPolicy).getMaxFileSize().toString());
+ String.valueOf(MAX_FILE_SIZE) + " MB",
+ ((AppenderUtils.DailyTriggeringPolicy) triggeringPolicy).getMaxFileSize().toString());
assertEquals("Unexpected layout", LAYOUT, ((PatternLayoutEncoder) appender.getEncoder()).getPattern());
}
+ @Test
public void testCreateRollingFileAppenderNonDailyRolling()
{
when(_settings.isRollDaily()).thenReturn(Boolean.FALSE);
@@ -116,24 +128,31 @@ public class AppenderUtilsTest extends QpidTestCase
assertEquals("Unexpected appender file name", _testLogFileName, appender.getFile());
RollingPolicy rollingPolicy = appender.getRollingPolicy();
- assertTrue("Unexpected rolling policy", rollingPolicy instanceof RollingPolicyDecorator);
+ final boolean condition2 = rollingPolicy instanceof RollingPolicyDecorator;
+ assertTrue("Unexpected rolling policy", condition2);
rollingPolicy = ((RollingPolicyDecorator)rollingPolicy).getDecorated();
- assertTrue("Unexpected decorated rolling policy", rollingPolicy instanceof AppenderUtils.SimpleRollingPolicy);
- assertEquals("Unexpected max history", MAX_HISTORY, ((AppenderUtils.SimpleRollingPolicy) rollingPolicy).getMaxIndex());
- assertEquals("Unexpected file name pattern", _testLogFileName + ".%i", ((AppenderUtils.SimpleRollingPolicy) rollingPolicy).getFileNamePattern());
+ final boolean condition1 = rollingPolicy instanceof AppenderUtils.SimpleRollingPolicy;
+ assertTrue("Unexpected decorated rolling policy", condition1);
+ assertEquals("Unexpected max history",
+ (long) MAX_HISTORY,
+ (long) ((AppenderUtils.SimpleRollingPolicy) rollingPolicy).getMaxIndex());
+ assertEquals("Unexpected file name pattern",
+ _testLogFileName + ".%i",
+ ((AppenderUtils.SimpleRollingPolicy) rollingPolicy).getFileNamePattern());
assertEquals("Unexpected compression mode", CompressionMode.NONE, rollingPolicy.getCompressionMode());
TriggeringPolicy triggeringPolicy = appender.getTriggeringPolicy();
assertEquals("Unexpected triggering policy",
- String.valueOf(MAX_FILE_SIZE) + " MB",
- ((AppenderUtils.SizeTriggeringPolicy) triggeringPolicy).getMaxFileSize().toString());
+ String.valueOf(MAX_FILE_SIZE) + " MB",
+ ((AppenderUtils.SizeTriggeringPolicy) triggeringPolicy).getMaxFileSize().toString());
Encoder encoder = appender.getEncoder();
- assertTrue("Unexpected encoder", encoder instanceof PatternLayoutEncoder);
+ final boolean condition = encoder instanceof PatternLayoutEncoder;
+ assertTrue("Unexpected encoder", condition);
assertEquals("Unexpected layout pattern", LAYOUT, ((PatternLayoutEncoder)encoder).getPattern());
-
}
+ @Test
public void testMaxFileSizeLimit() throws Exception
{
try
@@ -147,6 +166,7 @@ public class AppenderUtilsTest extends QpidTestCase
}
}
+ @Test
public void testUnwritableLogFileTarget() throws Exception
{
File unwriteableFile = File.createTempFile(getTestName(), null);
@@ -162,6 +182,7 @@ public class AppenderUtilsTest extends QpidTestCase
}
}
+ @Test
public void testUnwritableLogDirectoryTarget() throws Exception
{
Path unwriteableLogTargetPath = Files.createTempDirectory(getTestName());
@@ -184,6 +205,7 @@ public class AppenderUtilsTest extends QpidTestCase
}
}
+ @Test
public void testDirectoryLogTarget() throws Exception
{
Path unwriteableLogTargetPath = Files.createTempDirectory(getTestName());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerStatusListenerTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerStatusListenerTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerStatusListenerTest.java
index 97420b2..6645fcb 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerStatusListenerTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerStatusListenerTest.java
@@ -30,23 +30,22 @@ import java.io.IOError;
import java.io.IOException;
import ch.qos.logback.core.status.Status;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.logging.EventLogger;
-import org.apache.qpid.server.logging.logback.BrokerFileLogger;
-import org.apache.qpid.server.logging.logback.BrokerFileLoggerImpl;
import org.apache.qpid.server.model.SystemConfig;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class BrokerFileLoggerStatusListenerTest extends QpidTestCase
+public class BrokerFileLoggerStatusListenerTest extends UnitTestBase
{
private BrokerFileLoggerImpl.BrokerFileLoggerStatusListener _statusListener;
private BrokerFileLogger<?> _fileLogger;
private SystemConfig<?> _systemConfig;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_fileLogger = mock(BrokerFileLogger.class);
_systemConfig = mock(SystemConfig.class);
EventLogger eventLogger = mock(EventLogger.class);
@@ -55,6 +54,7 @@ public class BrokerFileLoggerStatusListenerTest extends QpidTestCase
when(_fileLogger.getContextValue(Boolean.class, BrokerFileLogger.BROKER_FAIL_ON_LOGGER_IO_ERROR)).thenReturn(true);
}
+ @Test
public void testAddStatusEventForIOError() throws Exception
{
Status event = createEvent(new IOError(new IOException("Mocked: No disk space left")), Status.ERROR);
@@ -63,6 +63,7 @@ public class BrokerFileLoggerStatusListenerTest extends QpidTestCase
verify(_systemConfig).closeAsync();
}
+ @Test
public void testAddStatusEventForIOErrorWithFailOnLoggerIOErrorDisabled() throws Exception
{
Status event = createEvent(new IOError(new IOException("Mocked: No disk space left")), Status.ERROR);
@@ -72,6 +73,7 @@ public class BrokerFileLoggerStatusListenerTest extends QpidTestCase
verify(_systemConfig, never()).closeAsync();
}
+ @Test
public void testAddStatusEventForIOException() throws Exception
{
Status event = createEvent(new IOException("Mocked: No disk space left"), Status.ERROR);
@@ -80,6 +82,7 @@ public class BrokerFileLoggerStatusListenerTest extends QpidTestCase
verify(_systemConfig).closeAsync();
}
+ @Test
public void testAddStatusEventForIOExceptionReportedAsWarning() throws Exception
{
Status event = createEvent(new IOException("Mocked: No disk space left"), Status.WARN);
@@ -88,6 +91,7 @@ public class BrokerFileLoggerStatusListenerTest extends QpidTestCase
verify(_systemConfig, never()).closeAsync();
}
+ @Test
public void testAddStatusEventForNonIOException() throws Exception
{
Status event = createEvent(new RuntimeException("Mocked: No disk space left"), Status.ERROR);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java
index 6bbc097..ee50c0b 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.logging.logback;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -29,12 +31,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogFileDetails;
-import org.apache.qpid.server.logging.logback.BrokerFileLogger;
-import org.apache.qpid.server.logging.logback.BrokerFileLoggerImpl;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerLogger;
import org.apache.qpid.server.model.BrokerModel;
@@ -42,10 +46,10 @@ import org.apache.qpid.server.model.ConfiguredObject;
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.test.utils.QpidTestCase;
import org.apache.qpid.server.util.FileUtils;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class BrokerFileLoggerTest extends QpidTestCase
+public class BrokerFileLoggerTest extends UnitTestBase
{
private TaskExecutor _taskExecutor;
private File _baseFolder;
@@ -53,10 +57,9 @@ public class BrokerFileLoggerTest extends QpidTestCase
private Broker _broker;
private BrokerFileLogger<?> _logger;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_taskExecutor = new TaskExecutorImpl();
_taskExecutor.start();
@@ -84,7 +87,7 @@ public class BrokerFileLoggerTest extends QpidTestCase
}
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -102,10 +105,10 @@ public class BrokerFileLoggerTest extends QpidTestCase
}
finally
{
- super.tearDown();
}
}
+ @Test
public void testGetLogFilesOnResolutionErrors()
{
_logger = createLoggerInErroredState();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerLoggerTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerLoggerTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerLoggerTest.java
index f757f4e..eee1c43 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerLoggerTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerLoggerTest.java
@@ -21,6 +21,10 @@
package org.apache.qpid.server.logging.logback;
import static org.apache.qpid.server.util.LoggerTestHelper.assertLoggedEvent;
+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.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -34,25 +38,24 @@ import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import ch.qos.logback.core.Context;
import ch.qos.logback.core.read.ListAppender;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
import org.apache.qpid.server.logging.LogLevel;
-import org.apache.qpid.server.logging.logback.AbstractBrokerLogger;
-import org.apache.qpid.server.logging.logback.BrokerMemoryLogger;
-import org.apache.qpid.server.logging.logback.BrokerNameAndLevelLogInclusionRule;
-import org.apache.qpid.server.logging.logback.LogRecord;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerLogInclusionRule;
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.State;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class BrokerLoggerTest extends QpidTestCase
+public class BrokerLoggerTest extends UnitTestBase
{
public static final String APPENDER_NAME = "test";
@@ -61,10 +64,9 @@ public class BrokerLoggerTest extends QpidTestCase
private TaskExecutor _taskExecutor;
private Broker _broker;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_taskExecutor = new TaskExecutorImpl();
_taskExecutor.start();
@@ -97,7 +99,7 @@ public class BrokerLoggerTest extends QpidTestCase
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -107,22 +109,22 @@ public class BrokerLoggerTest extends QpidTestCase
}
finally
{
- super.tearDown();
}
}
+ @Test
public void testAddNewLogInclusionRule()
{
Map<String, Object> attributes = createBrokerNameAndLevelLogInclusionRuleAttributes("org.apache.qpid", LogLevel.INFO);
Collection<BrokerLogInclusionRule> rulesBefore = _brokerLogger.getChildren(BrokerLogInclusionRule.class);
- assertEquals("Unexpected number of rules before creation", 0, rulesBefore.size());
+ assertEquals("Unexpected number of rules before creation", (long) 0, (long) rulesBefore.size());
BrokerLogInclusionRule<?> createdRule = _brokerLogger.createChild(BrokerLogInclusionRule.class, attributes);
assertEquals("Unexpected rule name", "test", createdRule.getName());
Collection<BrokerLogInclusionRule> rulesAfter = _brokerLogger.getChildren(BrokerLogInclusionRule.class);
- assertEquals("Unexpected number of rules after creation", 1, rulesAfter.size());
+ assertEquals("Unexpected number of rules after creation", (long) 1, (long) rulesAfter.size());
BrokerLogInclusionRule filter = rulesAfter.iterator().next();
assertEquals("Unexpected rule", createdRule, filter);
@@ -135,6 +137,7 @@ public class BrokerLoggerTest extends QpidTestCase
assertLoggedEvent(_loggerAppender, true, "Test3", logger.getName(), Level.INFO);
}
+ @Test
public void testRemoveExistingRule()
{
Map<String, Object> attributes = createBrokerNameAndLevelLogInclusionRuleAttributes("org.apache.qpid", LogLevel.INFO);
@@ -150,16 +153,21 @@ public class BrokerLoggerTest extends QpidTestCase
assertLoggedEvent(_loggerAppender, false, "Test2", logger.getName(), Level.INFO);
}
+ @Test
public void testDeleteLogger()
{
ch.qos.logback.classic.Logger rootLogger =
(ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
- assertNotNull("Appender not found when it should have been created", rootLogger.getAppender(_brokerLogger.getName()));
+ assertNotNull("Appender not found when it should have been created",
+ rootLogger.getAppender(_brokerLogger.getName()));
+
_brokerLogger.delete();
assertEquals("Unexpected state after deletion", State.DELETED, _brokerLogger.getState());
- assertNull("Appender found when it should have been deleted", rootLogger.getAppender(_brokerLogger.getName()));
+ assertNull("Appender found when it should have been deleted",
+ rootLogger.getAppender(_brokerLogger.getName()));
}
+ @Test
public void testBrokerMemoryLoggerGetLogEntries()
{
Map<String, Object> attributes = new HashMap<>();
@@ -186,7 +194,9 @@ public class BrokerLoggerTest extends QpidTestCase
Collection<LogRecord> logRecords2 = logger.getLogEntries(foundRecord.getId());
for (LogRecord record: logRecords2)
{
- assertTrue("Record id " + record.getId() + " is below " + foundRecord.getId(), record.getId() > foundRecord.getId());
+ assertTrue("Record id " + record.getId() + " is below " + foundRecord.getId(),
+ record.getId() > foundRecord.getId());
+
}
LogRecord foundRecord2 = findLogRecord("test message 2", logRecords2);
@@ -199,6 +209,7 @@ public class BrokerLoggerTest extends QpidTestCase
}
}
+ @Test
public void testStatistics()
{
Map<String, Object> attributes;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java
index 1993c60..d633c74 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java
@@ -20,6 +20,11 @@
*/
package org.apache.qpid.server.logging.logback;
+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.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -29,6 +34,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.junit.Before;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,19 +51,18 @@ import org.apache.qpid.server.model.JsonSystemConfigImpl;
import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.store.ConfiguredObjectRecord;
import org.apache.qpid.server.store.GenericRecoverer;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class BrokerMemoryLoggerTest extends QpidTestCase
+public class BrokerMemoryLoggerTest extends UnitTestBase
{
private TaskExecutor _taskExecutor;
private SystemConfig<JsonSystemConfigImpl> _systemConfig;
private ConfiguredObjectRecord _brokerEntry = mock(ConfiguredObjectRecord.class);
private UUID _brokerId = UUID.randomUUID();
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_taskExecutor = new CurrentThreadTaskExecutor();
_taskExecutor.start();
_systemConfig = new JsonSystemConfigImpl(_taskExecutor,
@@ -73,7 +79,7 @@ public class BrokerMemoryLoggerTest extends QpidTestCase
when(_brokerEntry.getType()).thenReturn(Broker.class.getSimpleName());
Map<String, Object> attributesMap = new HashMap<>();
attributesMap.put(Broker.MODEL_VERSION, BrokerModel.MODEL_VERSION);
- attributesMap.put(Broker.NAME, getName());
+ attributesMap.put(Broker.NAME, getTestName());
when(_brokerEntry.getAttributes()).thenReturn(attributesMap);
when(_brokerEntry.getParents()).thenReturn(Collections.singletonMap(SystemConfig.class.getSimpleName(), _systemConfig.getId()));
@@ -81,6 +87,7 @@ public class BrokerMemoryLoggerTest extends QpidTestCase
recoverer.recover(Arrays.asList(_brokerEntry), false);
}
+ @Test
public void testCreateDeleteBrokerMemoryLogger()
{
final String brokerLoggerName = "TestBrokerLogger";
@@ -93,17 +100,21 @@ public class BrokerMemoryLoggerTest extends QpidTestCase
BrokerLogger brokerLogger = (BrokerLogger) broker.createChild(BrokerLogger.class, attributes);
assertEquals("Created BrokerLogger has unexpected name", brokerLoggerName, brokerLogger.getName());
- assertTrue("BrokerLogger has unexpected type", brokerLogger instanceof BrokerMemoryLogger);
+ final boolean condition = brokerLogger instanceof BrokerMemoryLogger;
+ assertTrue("BrokerLogger has unexpected type", condition);
assertNotNull("Appender not attached to root logger after BrokerLogger creation",
- rootLogger.getAppender(brokerLoggerName));
+ rootLogger.getAppender(brokerLoggerName));
+
brokerLogger.delete();
assertNull("Appender should be no longer attached to root logger after BrokerLogger deletion",
- rootLogger.getAppender(brokerLoggerName));
+ rootLogger.getAppender(brokerLoggerName));
+
}
+ @Test
public void testBrokerMemoryLoggerRestrictsBufferSize()
{
doMemoryLoggerLimitsTest(BrokerMemoryLogger.MAX_RECORD_LIMIT + 1, BrokerMemoryLogger.MAX_RECORD_LIMIT);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleTest.java
index d3baf7c..b04445e 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleTest.java
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.logging.logback;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -31,29 +34,29 @@ import java.util.Map;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.filter.Filter;
+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.TaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
import org.apache.qpid.server.logging.LogLevel;
-import org.apache.qpid.server.logging.logback.BrokerNameAndLevelLogInclusionRule;
-import org.apache.qpid.server.logging.logback.BrokerNameAndLevelLogInclusionRuleImpl;
-import org.apache.qpid.server.logging.logback.LoggerNameAndLevelFilter;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerLogger;
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.Model;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class BrokerNameAndLevelLogInclusionRuleTest extends QpidTestCase
+public class BrokerNameAndLevelLogInclusionRuleTest extends UnitTestBase
{
private BrokerLogger<?> _brokerLogger;
private TaskExecutor _taskExecutor;
private final Broker<?> _broker = mock(Broker.class);
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_taskExecutor = new TaskExecutorImpl();
_taskExecutor.start();
@@ -70,7 +73,7 @@ public class BrokerNameAndLevelLogInclusionRuleTest extends QpidTestCase
doReturn(BrokerLogger.class).when(_brokerLogger).getCategoryClass();
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -79,24 +82,26 @@ public class BrokerNameAndLevelLogInclusionRuleTest extends QpidTestCase
}
finally
{
- super.tearDown();
}
}
+ @Test
public void testAsFilter()
{
BrokerNameAndLevelLogInclusionRule<?> rule = createRule("org.apache.qpid", LogLevel.INFO);
Filter<ILoggingEvent> filter = rule.asFilter();
- assertTrue("Unexpected filter instance", filter instanceof LoggerNameAndLevelFilter);
+ final boolean condition = filter instanceof LoggerNameAndLevelFilter;
+ assertTrue("Unexpected filter instance", condition);
LoggerNameAndLevelFilter f = (LoggerNameAndLevelFilter)filter;
assertEquals("Unexpected log level", Level.INFO, f.getLevel());
assertEquals("Unexpected logger name", "org.apache.qpid", f.getLoggerName());
}
+ @Test
public void testLevelChangeAffectsFilter()
{
BrokerNameAndLevelLogInclusionRule<?> rule = createRule("org.apache.qpid", LogLevel.INFO);
@@ -109,6 +114,7 @@ public class BrokerNameAndLevelLogInclusionRuleTest extends QpidTestCase
assertEquals("Unexpected log level attribute", Level.DEBUG, filter.getLevel());
}
+ @Test
public void testLoggerNameChangeNotAllowed()
{
BrokerNameAndLevelLogInclusionRule<?> rule = createRule("org.apache.qpid", LogLevel.INFO);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java
index 751c0d9..ac5936c 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.logging.logback;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -31,12 +32,13 @@ import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.filter.Filter;
import ch.qos.logback.core.spi.FilterReply;
+import org.junit.Test;
-import org.apache.qpid.server.logging.logback.CompositeFilter;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class CompositeFilterTest extends QpidTestCase
+public class CompositeFilterTest extends UnitTestBase
{
+ @Test
public void testDecideWithNoRule()
{
CompositeFilter compositeFilter = new CompositeFilter();
@@ -44,6 +46,7 @@ public class CompositeFilterTest extends QpidTestCase
assertEquals("Unexpected reply with no rule added", FilterReply.DENY, reply);
}
+ @Test
public void testDecideWithAcceptRule()
{
CompositeFilter compositeFilter = new CompositeFilter();
@@ -56,6 +59,7 @@ public class CompositeFilterTest extends QpidTestCase
assertEquals("Unexpected reply with ACCEPT rule added", FilterReply.ACCEPT, reply);
}
+ @Test
public void testDecideWithNeutralRule()
{
CompositeFilter compositeFilter = new CompositeFilter();
@@ -68,6 +72,7 @@ public class CompositeFilterTest extends QpidTestCase
assertEquals("Unexpected reply with NEUTRAL rule added", FilterReply.DENY, reply);
}
+ @Test
public void testDecideWithMultipleRules()
{
CompositeFilter compositeFilter = new CompositeFilter();
@@ -89,6 +94,7 @@ public class CompositeFilterTest extends QpidTestCase
verify(accept.asFilter(), never()).decide(any(ILoggingEvent.class));
}
+ @Test
public void testRemoveLogInclusionRule()
{
CompositeFilter compositeFilter = new CompositeFilter();
@@ -117,6 +123,7 @@ public class CompositeFilterTest extends QpidTestCase
verify(accept.asFilter()).decide(any(ILoggingEvent.class));
}
+ @Test
public void testAddLogInclusionRule()
{
CompositeFilter compositeFilter = new CompositeFilter();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/ConnectionAndUserPredicateTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/ConnectionAndUserPredicateTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/ConnectionAndUserPredicateTest.java
index 71d06a0..458f27c 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/ConnectionAndUserPredicateTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/ConnectionAndUserPredicateTest.java
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.logging.logback;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -30,24 +32,25 @@ import java.util.HashSet;
import javax.security.auth.Subject;
import ch.qos.logback.classic.spi.ILoggingEvent;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.connection.ConnectionPrincipal;
import org.apache.qpid.server.model.preferences.GenericPrincipal;
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.security.auth.ManagementConnectionPrincipal;
import org.apache.qpid.server.transport.AMQPConnection;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class ConnectionAndUserPredicateTest extends QpidTestCase
+public class ConnectionAndUserPredicateTest extends UnitTestBase
{
private static final String TEST_USER = "testUser@foo('bar')";
private ConnectionAndUserPredicate _predicate;
private Subject _subject;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_predicate = new ConnectionAndUserPredicate();
_subject = new Subject(false,
new HashSet<>(Collections.singleton(new AuthenticatedPrincipal(new GenericPrincipal(
@@ -57,6 +60,7 @@ public class ConnectionAndUserPredicateTest extends QpidTestCase
}
+ @Test
public void testEvaluateUsername()
{
_predicate.setUsernamePattern("testUser.*");
@@ -65,7 +69,8 @@ public class ConnectionAndUserPredicateTest extends QpidTestCase
@Override
public Void run()
{
- assertTrue("predicate unexpectedly did not match", _predicate.evaluate(mock(ILoggingEvent.class)));
+ assertTrue("predicate unexpectedly did not match",
+ _predicate.evaluate(mock(ILoggingEvent.class)));
return null;
}
});
@@ -81,6 +86,7 @@ public class ConnectionAndUserPredicateTest extends QpidTestCase
});
}
+ @Test
public void testEvaluateRemoteContainerIdAndUsername()
{
AMQPConnection connection = mock(AMQPConnection.class);
@@ -94,7 +100,8 @@ public class ConnectionAndUserPredicateTest extends QpidTestCase
@Override
public Void run()
{
- assertTrue("predicate unexpectedly did not match", _predicate.evaluate(mock(ILoggingEvent.class)));
+ assertTrue("predicate unexpectedly did not match",
+ _predicate.evaluate(mock(ILoggingEvent.class)));
return null;
}
});
@@ -122,6 +129,7 @@ public class ConnectionAndUserPredicateTest extends QpidTestCase
}
+ @Test
public void testEvaluateConnectionNameForAmqp()
{
AMQPConnection connection = mock(AMQPConnection.class);
@@ -134,7 +142,8 @@ public class ConnectionAndUserPredicateTest extends QpidTestCase
@Override
public Void run()
{
- assertTrue("predicate unexpectedly did not match", _predicate.evaluate(mock(ILoggingEvent.class)));
+ assertTrue("predicate unexpectedly did not match",
+ _predicate.evaluate(mock(ILoggingEvent.class)));
return null;
}
});
@@ -150,6 +159,7 @@ public class ConnectionAndUserPredicateTest extends QpidTestCase
});
}
+ @Test
public void testEvaluateConnectionNameForHttp()
{
ManagementConnectionPrincipal principal = mock(ManagementConnectionPrincipal.class);
@@ -161,7 +171,8 @@ public class ConnectionAndUserPredicateTest extends QpidTestCase
@Override
public Void run()
{
- assertTrue("predicate unexpectedly did not match", _predicate.evaluate(mock(ILoggingEvent.class)));
+ assertTrue("predicate unexpectedly did not match",
+ _predicate.evaluate(mock(ILoggingEvent.class)));
return null;
}
});
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilterTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilterTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilterTest.java
index 84ab2f3..064430b 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilterTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilterTest.java
@@ -20,6 +20,15 @@
package org.apache.qpid.server.logging.logback;
+import static org.apache.qpid.test.utils.JvmVendor.IBM;
+import static org.apache.qpid.test.utils.JvmVendor.OPENJDK;
+import static org.hamcrest.CoreMatchers.anyOf;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assume.assumeThat;
+
import java.util.ArrayList;
import java.util.List;
@@ -34,36 +43,44 @@ import ch.qos.logback.core.LogbackException;
import ch.qos.logback.core.filter.Filter;
import ch.qos.logback.core.spi.FilterReply;
import ch.qos.logback.core.status.Status;
+import org.junit.Before;
+import org.junit.Test;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class Logback1027WorkaroundTurboFilterTest extends QpidTestCase
+public class Logback1027WorkaroundTurboFilterTest extends UnitTestBase
{
private static final String TEST_LOG_MESSAGE = "hello";
private Logback1027WorkaroundTurboFilter _filter = new Logback1027WorkaroundTurboFilter();
private Logger _logger;
private SnoopingAppender _snoopingAppender;
+ @Before
public void setUp() throws Exception
{
- super.setUp();
LoggerContext context = new LoggerContext();
_logger = context.getLogger(Logback1027WorkaroundTurboFilterTest.class);
_snoopingAppender = new SnoopingAppender();
_logger.addAppender(_snoopingAppender);
}
+ @Test
public void testOneException()
{
Exception e = new Exception();
final FilterReply reply = doDecide(e);
assertEquals(FilterReply.NEUTRAL, reply);
- assertEquals(0, _snoopingAppender.getEvents().size());
+ assertEquals((long) 0, (long) _snoopingAppender.getEvents().size());
}
+ @Test
public void testSuppressedExceptionRecursion()
{
+ // https://www.ibm.com/developerworks/community/forums/html/topic?id=8482d948-665c-47a2-862e-457e49ac71a4&ps=25
+ assumeThat("(QPID-7955) Behaviourial difference between the IBM JDK and the Open JDK", getJvmVendor(),
+ not(anyOf(equalTo(OPENJDK), equalTo(IBM))));
+
Exception e1 = new Exception();
Exception e2 = new Exception();
e2.addSuppressed(e1);
@@ -73,7 +90,7 @@ public class Logback1027WorkaroundTurboFilterTest extends QpidTestCase
assertEquals(FilterReply.DENY, reply);
final List<ILoggingEvent> events = _snoopingAppender.getEvents();
- assertEquals(1, events.size());
+ assertEquals((long) 1, (long) events.size());
assertLoggingEvent(events.get(0));
}
@@ -87,8 +104,13 @@ public class Logback1027WorkaroundTurboFilterTest extends QpidTestCase
assertEquals(Logback1027WorkaroundTurboFilter.StringifiedException.class.getName(), thing.getClassName());
}
+ @Test
public void testInitCauseRecursion() throws Exception
{
+ // https://www.ibm.com/developerworks/community/forums/html/topic?id=8482d948-665c-47a2-862e-457e49ac71a4&ps=25
+ assumeThat("(QPID-7955) Behaviourial difference between the IBM JDK and the Open JDK", getJvmVendor(),
+ not(anyOf(equalTo(OPENJDK), equalTo(IBM))));
+
Exception e1 = new Exception();
Exception e2 = new Exception();
e2.initCause(e1);
@@ -96,9 +118,10 @@ public class Logback1027WorkaroundTurboFilterTest extends QpidTestCase
final FilterReply reply = doDecide(e1);
assertEquals(FilterReply.DENY, reply);
- assertEquals(1, _snoopingAppender.getEvents().size());
+ assertEquals((long) 1, (long) _snoopingAppender.getEvents().size());
}
+ @Test
public void testNoRecursion()
{
Exception e1 = new Exception();
@@ -111,9 +134,10 @@ public class Logback1027WorkaroundTurboFilterTest extends QpidTestCase
final FilterReply reply = doDecide(e1);
assertEquals(FilterReply.NEUTRAL, reply);
- assertEquals(0, _snoopingAppender.getEvents().size());
+ assertEquals((long) 0, (long) _snoopingAppender.getEvents().size());
}
+ @Test
public void testNoRecursion2()
{
Exception e1 = new Exception();
@@ -126,7 +150,7 @@ public class Logback1027WorkaroundTurboFilterTest extends QpidTestCase
final FilterReply reply = doDecide(e1);
assertEquals(FilterReply.NEUTRAL, reply);
- assertEquals(0, _snoopingAppender.getEvents().size());
+ assertEquals((long) 0, (long) _snoopingAppender.getEvents().size());
}
private FilterReply doDecide(final Exception e1)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilterTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilterTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilterTest.java
index 63d5cd1..73e4cca 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilterTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilterTest.java
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.logging.logback;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -27,13 +28,14 @@ import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.spi.FilterReply;
+import org.junit.Test;
-import org.apache.qpid.server.logging.logback.LoggerNameAndLevelFilter;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class LoggerNameAndLevelFilterTest extends QpidTestCase
+public class LoggerNameAndLevelFilterTest extends UnitTestBase
{
+ @Test
public void testDecideForWildcardLoggerName() throws Exception
{
LoggerNameAndLevelFilter filter = new LoggerNameAndLevelFilter("org.apache.qpid.server.*", Level.INFO);
@@ -41,16 +43,23 @@ public class LoggerNameAndLevelFilterTest extends QpidTestCase
ILoggingEvent event = mock(ILoggingEvent.class);
when(event.getLevel()).thenReturn(Level.INFO);
when(event.getLoggerName()).thenReturn("org.apache.qpid.server.foo");
- assertEquals("Unexpected reply for matching logger name and log level", FilterReply.ACCEPT, filter.decide(event));
+ assertEquals("Unexpected reply for matching logger name and log level",
+ FilterReply.ACCEPT,
+ filter.decide(event));
when(event.getLoggerName()).thenReturn("org.apache.qpid.foo");
- assertEquals("Unexpected reply for non matching logger name but matching log level", FilterReply.NEUTRAL, filter.decide(event));
+ assertEquals("Unexpected reply for non matching logger name but matching log level",
+ FilterReply.NEUTRAL,
+ filter.decide(event));
when(event.getLoggerName()).thenReturn("org.apache.qpid.server.foo");
when(event.getLevel()).thenReturn(Level.DEBUG);
- assertEquals("Unexpected reply for matching logger name but non matching log level", FilterReply.NEUTRAL, filter.decide(event));
+ assertEquals("Unexpected reply for matching logger name but non matching log level",
+ FilterReply.NEUTRAL,
+ filter.decide(event));
}
+ @Test
public void testDecideForEmptyLoggerName() throws Exception
{
LoggerNameAndLevelFilter filter = new LoggerNameAndLevelFilter("", Level.INFO);
@@ -58,15 +67,20 @@ public class LoggerNameAndLevelFilterTest extends QpidTestCase
ILoggingEvent event = mock(ILoggingEvent.class);
when(event.getLevel()).thenReturn(Level.INFO);
when(event.getLoggerName()).thenReturn("org.apache.qpid.server.foo");
- assertEquals("Unexpected reply for matching log level and arbitrary logger name", FilterReply.ACCEPT, filter.decide(event));
+ assertEquals("Unexpected reply for matching log level and arbitrary logger name",
+ FilterReply.ACCEPT,
+ filter.decide(event));
when(event.getLoggerName()).thenReturn("org.apache.qpid.foo");
- assertEquals("Unexpected reply for matching log level and arbitrary logger namel", FilterReply.ACCEPT, filter.decide(event));
+ assertEquals("Unexpected reply for matching log level and arbitrary logger namel",
+ FilterReply.ACCEPT,
+ filter.decide(event));
when(event.getLevel()).thenReturn(Level.DEBUG);
assertEquals("Unexpected reply for non matching log level", FilterReply.NEUTRAL, filter.decide(event));
}
+ @Test
public void testDecideForRootLoggerName() throws Exception
{
LoggerNameAndLevelFilter filter = new LoggerNameAndLevelFilter(Logger.ROOT_LOGGER_NAME, Level.INFO);
@@ -74,15 +88,20 @@ public class LoggerNameAndLevelFilterTest extends QpidTestCase
ILoggingEvent event = mock(ILoggingEvent.class);
when(event.getLevel()).thenReturn(Level.INFO);
when(event.getLoggerName()).thenReturn("org.apache.qpid.server.foo");
- assertEquals("Unexpected reply for matching log level and arbitrary logger name", FilterReply.ACCEPT, filter.decide(event));
+ assertEquals("Unexpected reply for matching log level and arbitrary logger name",
+ FilterReply.ACCEPT,
+ filter.decide(event));
when(event.getLoggerName()).thenReturn("org.apache.qpid.foo");
- assertEquals("Unexpected reply for matching log level and arbitrary logger name", FilterReply.ACCEPT, filter.decide(event));
+ assertEquals("Unexpected reply for matching log level and arbitrary logger name",
+ FilterReply.ACCEPT,
+ filter.decide(event));
when(event.getLevel()).thenReturn(Level.DEBUG);
assertEquals("Unexpected reply for non matching log level", FilterReply.NEUTRAL, filter.decide(event));
}
+ @Test
public void testDecideForNullLoggerName() throws Exception
{
LoggerNameAndLevelFilter filter = new LoggerNameAndLevelFilter(null, Level.INFO);
@@ -90,15 +109,20 @@ public class LoggerNameAndLevelFilterTest extends QpidTestCase
ILoggingEvent event = mock(ILoggingEvent.class);
when(event.getLevel()).thenReturn(Level.INFO);
when(event.getLoggerName()).thenReturn("org.apache.qpid.server.foo");
- assertEquals("Unexpected reply for matching log level and arbitrary logger name", FilterReply.ACCEPT, filter.decide(event));
+ assertEquals("Unexpected reply for matching log level and arbitrary logger name",
+ FilterReply.ACCEPT,
+ filter.decide(event));
when(event.getLoggerName()).thenReturn("org.apache.qpid.foo");
- assertEquals("Unexpected reply for matching log level and arbitrary logger name", FilterReply.ACCEPT, filter.decide(event));
+ assertEquals("Unexpected reply for matching log level and arbitrary logger name",
+ FilterReply.ACCEPT,
+ filter.decide(event));
when(event.getLevel()).thenReturn(Level.DEBUG);
assertEquals("Unexpected reply for non matching log level", FilterReply.NEUTRAL, filter.decide(event));
}
+ @Test
public void testDecideForNonWildCardLoggerName() throws Exception
{
LoggerNameAndLevelFilter filter = new LoggerNameAndLevelFilter("org.apache.qpid", Level.INFO);
@@ -106,13 +130,19 @@ public class LoggerNameAndLevelFilterTest extends QpidTestCase
ILoggingEvent event = mock(ILoggingEvent.class);
when(event.getLevel()).thenReturn(Level.INFO);
when(event.getLoggerName()).thenReturn("org.apache.qpid");
- assertEquals("Unexpected reply for matching log level and same logger name", FilterReply.ACCEPT, filter.decide(event));
+ assertEquals("Unexpected reply for matching log level and same logger name",
+ FilterReply.ACCEPT,
+ filter.decide(event));
when(event.getLoggerName()).thenReturn("org.apache.qpid.foo");
- assertEquals("Unexpected reply for matching log level and not same logger name", FilterReply.NEUTRAL, filter.decide(event));
+ assertEquals("Unexpected reply for matching log level and not same logger name",
+ FilterReply.NEUTRAL,
+ filter.decide(event));
when(event.getLevel()).thenReturn(Level.DEBUG);
when(event.getLoggerName()).thenReturn("org.apache.qpid");
- assertEquals("Unexpected reply for non matching log leve and same logger namel", FilterReply.NEUTRAL, filter.decide(event));
+ assertEquals("Unexpected reply for non matching log leve and same logger namel",
+ FilterReply.NEUTRAL,
+ filter.decide(event));
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilterTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilterTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilterTest.java
index fc916ef..913c10d 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilterTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilterTest.java
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.logging.logback;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import java.security.Principal;
@@ -29,11 +30,12 @@ import javax.security.auth.Subject;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.spi.FilterReply;
+import org.junit.Before;
+import org.junit.Test;
-import org.apache.qpid.server.logging.logback.PrincipalLogEventFilter;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class PrincipalLogEventFilterTest extends QpidTestCase
+public class PrincipalLogEventFilterTest extends UnitTestBase
{
private PrincipalLogEventFilter _principalLogEventFilter;
@@ -41,15 +43,15 @@ public class PrincipalLogEventFilterTest extends QpidTestCase
private Subject _subject;
private Principal _principal;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
_subject = new Subject();
_principal = mock(Principal.class);
_principalLogEventFilter = new PrincipalLogEventFilter(_principal);
}
+ @Test
public void testPrincipalMatches()
{
_subject.getPrincipals().add(_principal);
@@ -59,6 +61,7 @@ public class PrincipalLogEventFilterTest extends QpidTestCase
assertEquals(FilterReply.NEUTRAL, reply);
}
+ @Test
public void testNoPrincipal()
{
FilterReply reply = doFilter();
@@ -66,6 +69,7 @@ public class PrincipalLogEventFilterTest extends QpidTestCase
assertEquals(FilterReply.DENY, reply);
}
+ @Test
public void testWrongPrincipal()
{
_subject.getPrincipals().add(mock(Principal.class));
@@ -75,6 +79,7 @@ public class PrincipalLogEventFilterTest extends QpidTestCase
assertEquals(FilterReply.DENY, reply);
}
+ @Test
public void testNoSubject()
{
_subject.getPrincipals().add(mock(Principal.class));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org