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:09 UTC

[02/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/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregatorTest.java
----------------------------------------------------------------------
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregatorTest.java b/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregatorTest.java
index cdfece0..da251b9 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregatorTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregatorTest.java
@@ -22,13 +22,31 @@ package org.apache.qpid.disttest.results.aggregation;
 import java.util.Date;
 import java.util.List;
 
+import org.junit.Assert;
+
 import org.apache.qpid.disttest.controller.TestResult;
 import org.apache.qpid.disttest.message.ConsumerParticipantResult;
 import org.apache.qpid.disttest.message.ParticipantResult;
 import org.apache.qpid.disttest.message.ProducerParticipantResult;
-import org.apache.qpid.test.utils.QpidTestCase;
 
-public class TestResultAggregatorTest extends QpidTestCase
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class TestResultAggregatorTest extends UnitTestBase
 {
     private static final String TEST1_NAME = "TEST1_NAME";
     private static final int TEST1_ITERATION_NUMBER = 1;
@@ -64,6 +82,7 @@ public class TestResultAggregatorTest extends QpidTestCase
 
     private TestResultAggregator _aggregator = new TestResultAggregator();
 
+    @Test
     public void testAggregateResultsForTwoConsumerAndOneProducer() throws Exception
     {
         TestResult originalTestResult = createResultsFromTest();
@@ -74,7 +93,7 @@ public class TestResultAggregatorTest extends QpidTestCase
         AggregatedTestResult aggregatedTestResult = _aggregator.aggregateTestResult(originalTestResult);
 
         aggregatedTestResult.getAllConsumerParticipantResult().getTotalPayloadProcessed();
-        assertEquals(expectedNumberOfResults, aggregatedTestResult.getParticipantResults().size());
+        assertEquals((long) expectedNumberOfResults, (long) aggregatedTestResult.getParticipantResults().size());
 
         assertMinimalAggregatedResults(
                 aggregatedTestResult.getAllConsumerParticipantResult(),
@@ -95,6 +114,7 @@ public class TestResultAggregatorTest extends QpidTestCase
                 PROVIDER_VERSION, PROTOCOL_VERSION);
     }
 
+    @Test
     public void testAggregateResultsWhenParticipantErrored()
     {
         ParticipantResult failedParticipantResult = new ParticipantResult();
@@ -104,9 +124,12 @@ public class TestResultAggregatorTest extends QpidTestCase
         result.addParticipantResult(failedParticipantResult);
 
         AggregatedTestResult aggregatedTestResult = _aggregator.aggregateTestResult(result);
-        assertEquals(TestResultAggregator.AGGREGATED_ERROR_MESSAGE, aggregatedTestResult.getAllParticipantResult().getErrorMessage());
+        assertEquals(TestResultAggregator.AGGREGATED_ERROR_MESSAGE,
+                            aggregatedTestResult.getAllParticipantResult().getErrorMessage());
+
     }
 
+    @Test
     public void testAggregateResultsForConsumerWithLatencyResults() throws Exception
     {
         TestResult originalTestResult = createResultsFromTest();
@@ -126,7 +149,7 @@ public class TestResultAggregatorTest extends QpidTestCase
         AggregatedTestResult aggregatedTestResult = _aggregator.aggregateTestResult(originalTestResult);
 
         aggregatedTestResult.getAllConsumerParticipantResult().getTotalPayloadProcessed();
-        assertEquals(expectedNumberOfResults, aggregatedTestResult.getParticipantResults().size());
+        assertEquals((long) expectedNumberOfResults, (long) aggregatedTestResult.getParticipantResults().size());
 
         assertMinimalAggregatedResults(
                 aggregatedTestResult.getAllConsumerParticipantResult(),
@@ -153,30 +176,51 @@ public class TestResultAggregatorTest extends QpidTestCase
 
         int expectedThroughtput = (int)Math.round(NUMBER_OF_MESSAGES_PRODUCED * 1000.0d /(CONSUMER2_ENDDATE - PRODUCER_STARTDATE));
         ParticipantResult result = aggregatedTestResult.getAllParticipantResult();
-        assertEquals("Unexpected message throughput", expectedThroughtput, result.getMessageThroughput());
+        assertEquals("Unexpected message throughput",
+                            (long) expectedThroughtput,
+                            (long) result.getMessageThroughput());
+
     }
 
     private void assertLatencyAggregatedResults(ParticipantResult allConsumerParticipantResult)
     {
-        assertTrue("Unexpected result", allConsumerParticipantResult instanceof ConsumerParticipantResult);
+        final boolean condition = allConsumerParticipantResult instanceof ConsumerParticipantResult;
+        assertTrue("Unexpected result", condition);
         ConsumerParticipantResult results = (ConsumerParticipantResult)allConsumerParticipantResult;
         assertEquals("Unexpected average", 5.0, results.getAverageLatency(), 0.01);
-        assertEquals("Unexpected min", 2, results.getMinLatency());
-        assertEquals("Unexpected max", 9, results.getMaxLatency());
+        assertEquals("Unexpected min", (long) 2, results.getMinLatency());
+        assertEquals("Unexpected max", (long) 9, results.getMaxLatency());
         assertEquals("Unexpected standard deviation", 2.0, results.getLatencyStandardDeviation(), 0.01);
     }
 
     private void assertMinimalAggregatedResults(ParticipantResult result, String expectedTestName, int expectedIterationNumber, int expectedBatchSize, long expectedNumberOfMessagesProcessed, int expectedTotalNumberOfConsumers, int expectedTotalNumberOfProducers,
                                                 String expectedProviderVersion, String expectedProtocolVersion)
     {
-        assertEquals("Unexpected test name in " + result.getParticipantName(), expectedTestName, result.getTestName());
-        assertEquals("Unexpected iteration number in " + result.getParticipantName(), expectedIterationNumber, result.getIterationNumber());
-        assertEquals("Unexpected batch size " + result.getParticipantName(), expectedBatchSize, result.getBatchSize());
-        assertEquals("Unexpected number of messages processed in " + result.getParticipantName(), expectedNumberOfMessagesProcessed, result.getNumberOfMessagesProcessed());
-        assertEquals("Unexpected total number of consumers " + result.getParticipantName(), expectedTotalNumberOfConsumers, result.getTotalNumberOfConsumers());
-        assertEquals("Unexpected total number of producers " + result.getParticipantName(), expectedTotalNumberOfProducers, result.getTotalNumberOfProducers());
-        assertEquals("Unexpected provider version" + result.getProviderVersion(), expectedProviderVersion, result.getProviderVersion());
-        assertEquals("Unexpected protocol version" + result.getProtocolVersion(), expectedProtocolVersion, result.getProtocolVersion());
+        assertEquals("Unexpected test name in " + result.getParticipantName(),
+                            expectedTestName,
+                            result.getTestName());
+
+        assertEquals("Unexpected iteration number in " + result.getParticipantName(),
+                            (long) expectedIterationNumber,
+                            (long) result.getIterationNumber());
+        assertEquals("Unexpected batch size " + result.getParticipantName(),
+                            (long) expectedBatchSize,
+                            (long) result.getBatchSize());
+        assertEquals("Unexpected number of messages processed in " + result.getParticipantName(),
+                            expectedNumberOfMessagesProcessed,
+                            result.getNumberOfMessagesProcessed());
+        assertEquals("Unexpected total number of consumers " + result.getParticipantName(),
+                            (long) expectedTotalNumberOfConsumers,
+                            (long) result.getTotalNumberOfConsumers());
+        assertEquals("Unexpected total number of producers " + result.getParticipantName(),
+                            (long) expectedTotalNumberOfProducers,
+                            (long) result.getTotalNumberOfProducers());
+        assertEquals("Unexpected provider version" + result.getProviderVersion(),
+                            expectedProviderVersion,
+                            result.getProviderVersion());
+        assertEquals("Unexpected protocol version" + result.getProtocolVersion(),
+                            expectedProtocolVersion,
+                            result.getProtocolVersion());
     }
 
     private TestResult createResultsFromTest()

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormatterTest.java
----------------------------------------------------------------------
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormatterTest.java b/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormatterTest.java
index a38dcca..ac4eaff 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormatterTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormatterTest.java
@@ -22,14 +22,33 @@ import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
+import org.junit.Assert;
+
 import org.apache.qpid.disttest.controller.ResultsForAllTests;
 import org.apache.qpid.disttest.results.ResultsTestFixture;
-import org.apache.qpid.test.utils.QpidTestCase;
 
-public class CSVFormatterTest extends QpidTestCase
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class CSVFormatterTest extends UnitTestBase
 {
     private CSVFormatter _formatter = new CSVFormatter();
 
+    @Test
     public void testResultsFileWithWithOneRow() throws Exception
     {
         ResultsTestFixture resultsTestFixture = new ResultsTestFixture();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparatorTest.java
----------------------------------------------------------------------
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparatorTest.java b/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparatorTest.java
index ed109a2..85f4ac7 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparatorTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparatorTest.java
@@ -19,16 +19,35 @@
 package org.apache.qpid.disttest.results.formatting;
 
 
+import org.junit.Assert;
+
 import org.apache.qpid.disttest.message.ConsumerParticipantResult;
 import org.apache.qpid.disttest.message.ParticipantResult;
 import org.apache.qpid.disttest.message.ProducerParticipantResult;
 import org.apache.qpid.disttest.results.aggregation.TestResultAggregator;
-import org.apache.qpid.test.utils.QpidTestCase;
 
-public class CSVOrderParticipantResultComparatorTest extends QpidTestCase
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class CSVOrderParticipantResultComparatorTest extends UnitTestBase
 {
     CSVOrderParticipantResultComparator _comparator = new CSVOrderParticipantResultComparator();
 
+    @Test
     public void testOrderedConsumerParticipants() throws Exception
     {
         assertCompare(
@@ -36,6 +55,7 @@ public class CSVOrderParticipantResultComparatorTest extends QpidTestCase
                 new ConsumerParticipantResult("banana"));
 
     }
+    @Test
     public void testProducerPrecedesConsumerParticipants() throws Exception
     {
         assertCompare(
@@ -43,6 +63,7 @@ public class CSVOrderParticipantResultComparatorTest extends QpidTestCase
                 new ConsumerParticipantResult());
     }
 
+    @Test
     public void testProducerPrecedesAllProducersResult()
     {
         assertCompare(
@@ -50,6 +71,7 @@ public class CSVOrderParticipantResultComparatorTest extends QpidTestCase
                 new ParticipantResult(TestResultAggregator.ALL_PRODUCER_PARTICIPANTS_NAME));
     }
 
+    @Test
     public void testConsumerPrecedesAllConsumersResult()
     {
         assertCompare(
@@ -57,6 +79,7 @@ public class CSVOrderParticipantResultComparatorTest extends QpidTestCase
                 new ParticipantResult(TestResultAggregator.ALL_CONSUMER_PARTICIPANTS_NAME));
     }
 
+    @Test
     public void testAllParticipantsPrecedesAllConsumersResult()
     {
         assertCompare(
@@ -64,6 +87,7 @@ public class CSVOrderParticipantResultComparatorTest extends QpidTestCase
                 new ParticipantResult(TestResultAggregator.ALL_CONSUMER_PARTICIPANTS_NAME));
     }
 
+    @Test
     public void testAllParticipantsPrecedesAllProducersResult()
     {
         assertCompare(
@@ -74,8 +98,9 @@ public class CSVOrderParticipantResultComparatorTest extends QpidTestCase
     private void assertCompare(ParticipantResult smaller, ParticipantResult bigger)
     {
         assertEquals("Expected " + smaller + " to 'equal' itself",
-                0,
-                _comparator.compare(smaller, smaller));
+                            (long) 0,
+                            (long) _comparator.compare(smaller, smaller));
+
 
         String failureMsg = "Expected " + smaller + " to be smaller than " + bigger;
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilderTest.java
----------------------------------------------------------------------
diff --git a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilderTest.java b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilderTest.java
index c8a98aa..6d0c7da 100644
--- a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilderTest.java
+++ b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilderTest.java
@@ -29,15 +29,33 @@ import org.apache.qpid.disttest.charting.definition.ChartingDefinition;
 import org.apache.qpid.disttest.charting.definition.SeriesDefinition;
 import org.apache.qpid.disttest.charting.seriesbuilder.DatasetHolder;
 import org.apache.qpid.disttest.charting.seriesbuilder.SeriesBuilder;
-import org.apache.qpid.test.utils.QpidTestCase;
+
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.plot.CategoryPlot;
 import org.jfree.chart.plot.Plot;
 import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.title.TextTitle;
 import org.jfree.data.general.Dataset;
+import org.junit.Assert;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
 
-public class BaseChartBuilderTest extends QpidTestCase
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class BaseChartBuilderTest extends UnitTestBase
 {
     private static final String CHART_TITLE = "CHART_TITLE";
     private static final String CHART_SUB_TITLE = "CHART_SUB_TITLE";
@@ -56,10 +74,9 @@ public class BaseChartBuilderTest extends QpidTestCase
 
     private JFreeChart _jFreeChart;
 
-    @Override
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
-        super.setUp();
 
         Plot plot = new CategoryPlot();
         _jFreeChart = new JFreeChart(plot);
@@ -71,6 +88,7 @@ public class BaseChartBuilderTest extends QpidTestCase
         when(_chartingDefinition.getSeriesDefinitions()).thenReturn(_seriesDefinitions );
     }
 
+    @Test
     public void testBuildChart()
     {
         BaseChartBuilder chartBuilder = new ChartBuilder(_seriesBuilder, _strokeAndPaintApplier, _datasetHolder)
@@ -89,8 +107,11 @@ public class BaseChartBuilderTest extends QpidTestCase
         JFreeChart chart = chartBuilder.buildChart(_chartingDefinition);
 
         assertEquals(BaseChartBuilder.BLUE_GRADIENT, chart.getBackgroundPaint());
-        assertEquals("The *second* subtitle of the generated chart should have the text from the chart definition",
-                CHART_SUB_TITLE, ((TextTitle)chart.getSubtitle(1)).getText());
+        assertEquals(
+                "The *second* subtitle of the generated chart should have the text from the chart definition",
+                CHART_SUB_TITLE,
+                ((TextTitle)chart.getSubtitle(1)).getText());
+
         verify(_seriesPainter).applySeriesAppearance(_jFreeChart, _seriesDefinitions, _strokeAndPaintApplier);
     }
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilderFactoryTest.java
----------------------------------------------------------------------
diff --git a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilderFactoryTest.java b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilderFactoryTest.java
index 14f8156..ef47863 100644
--- a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilderFactoryTest.java
+++ b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilderFactoryTest.java
@@ -21,47 +21,77 @@ package org.apache.qpid.disttest.charting.chartbuilder;
 
 import static org.mockito.Mockito.mock;
 
+import org.junit.Assert;
+
 import org.apache.qpid.disttest.charting.ChartType;
 import org.apache.qpid.disttest.charting.seriesbuilder.SeriesBuilder;
-import org.apache.qpid.test.utils.QpidTestCase;
 
-public class ChartBuilderFactoryTest extends QpidTestCase
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class ChartBuilderFactoryTest extends UnitTestBase
 {
     private SeriesBuilder _seriesBuilder = mock(SeriesBuilder.class);
 
+    @Test
     public void testLineChart()
     {
         ChartBuilder builder = ChartBuilderFactory.createChartBuilder(ChartType.LINE, _seriesBuilder);
-        assertTrue(builder instanceof LineChartBuilder);
+        final boolean condition = builder instanceof LineChartBuilder;
+        assertTrue(condition);
     }
 
+    @Test
     public void testLineChart3D()
     {
         ChartBuilder builder = ChartBuilderFactory.createChartBuilder(ChartType.LINE3D, _seriesBuilder);
-        assertTrue(builder instanceof LineChart3DBuilder);
+        final boolean condition = builder instanceof LineChart3DBuilder;
+        assertTrue(condition);
     }
 
+    @Test
     public void testBarChart()
     {
         ChartBuilder builder = ChartBuilderFactory.createChartBuilder(ChartType.BAR, _seriesBuilder);
-        assertTrue(builder instanceof BarChartBuilder);
+        final boolean condition = builder instanceof BarChartBuilder;
+        assertTrue(condition);
     }
 
+    @Test
     public void testBarChart3D()
     {
         ChartBuilder builder = ChartBuilderFactory.createChartBuilder(ChartType.BAR3D, _seriesBuilder);
-        assertTrue(builder instanceof BarChart3DBuilder);
+        final boolean condition = builder instanceof BarChart3DBuilder;
+        assertTrue(condition);
     }
 
+    @Test
     public void testXYLineChart()
     {
         ChartBuilder builder = ChartBuilderFactory.createChartBuilder(ChartType.XYLINE, _seriesBuilder);
-        assertTrue(builder instanceof XYLineChartBuilder);
+        final boolean condition = builder instanceof XYLineChartBuilder;
+        assertTrue(condition);
     }
 
+    @Test
     public void testTimeSeriesLineChart()
     {
         ChartBuilder builder = ChartBuilderFactory.createChartBuilder(ChartType.TIMELINE, _seriesBuilder);
-        assertTrue(builder instanceof TimeSeriesLineChartBuilder);
+        final boolean condition = builder instanceof TimeSeriesLineChartBuilder;
+        assertTrue(condition);
     }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
----------------------------------------------------------------------
diff --git a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
index 7ebf483..a5d115c 100644
--- a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
+++ b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
@@ -32,6 +32,7 @@ import org.jfree.chart.JFreeChart;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.title.ShortTextTitle;
 import org.jfree.data.general.Dataset;
+import org.junit.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,7 +43,6 @@ import org.apache.qpid.disttest.charting.seriesbuilder.DatasetHolder;
 import org.apache.qpid.disttest.charting.seriesbuilder.SeriesBuilder;
 import org.apache.qpid.disttest.charting.seriesbuilder.SeriesRow;
 import org.apache.qpid.disttest.charting.writer.ChartWriter;
-import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.test.utils.TestFileUtils;
 
 /**
@@ -50,7 +50,24 @@ import org.apache.qpid.test.utils.TestFileUtils;
  * verify the generated output, set the system property {@link #RETAIN_TEST_CHARTS}
  * to prevent the automatic deletion of the test chart directory.
  */
-public class ChartProductionTest extends QpidTestCase
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class ChartProductionTest extends UnitTestBase
 {
     private static final Logger LOGGER = LoggerFactory.getLogger(ChartProductionTest.class);
     private static final String TEST_CHARTTITLE = "TEST_CHARTTITLE";
@@ -76,16 +93,15 @@ public class ChartProductionTest extends QpidTestCase
     private ChartingDefinition _chartingDefinition = mock(ChartingDefinition.class);
     private ChartWriter _writer = new ChartWriter();
 
-    @Override
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
-        super.setUp();
 
         when(_seriesDefinition.getSeriesLegend()).thenReturn(TEST_SERIESLEGEND);
         when(_seriesDefinition.getStrokeWidth()).thenReturn(null);
         when(_seriesDefinition.getSeriesColourName()).thenReturn("blue");
 
-        when(_chartingDefinition.getChartStemName()).thenReturn(getName());
+        when(_chartingDefinition.getChartStemName()).thenReturn(getTestName());
         when(_chartingDefinition.getChartTitle()).thenReturn(TEST_CHARTTITLE);
         when(_chartingDefinition.getChartSubtitle()).thenReturn(TEST_CHARTSUBTITLE);
         when(_chartingDefinition.getXAxisTitle()).thenReturn(TEST_XAXIS);
@@ -105,36 +121,42 @@ public class ChartProductionTest extends QpidTestCase
         _writer.setOutputDirectory(chartDir);
     }
 
+    @Test
     public void testBarChart() throws Exception
     {
         ChartBuilder builder = ChartBuilderFactory.createChartBuilder(ChartType.BAR, new SampleSeriesBuilder(SIMPLE_SERIES_ROWS));
         assertChartTitlesAndWriteToFile(builder);
     }
 
+    @Test
     public void testBar3DChart() throws Exception
     {
         ChartBuilder builder = ChartBuilderFactory.createChartBuilder(ChartType.BAR3D, new SampleSeriesBuilder());
         assertChartTitlesAndWriteToFile(builder);
     }
 
+    @Test
     public void testLineChart() throws Exception
     {
         ChartBuilder builder = ChartBuilderFactory.createChartBuilder(ChartType.LINE, new SampleSeriesBuilder());
         assertChartTitlesAndWriteToFile(builder);
     }
 
+    @Test
     public void testLine3DChart() throws Exception
     {
         ChartBuilder builder = ChartBuilderFactory.createChartBuilder(ChartType.LINE3D, new SampleSeriesBuilder());
         assertChartTitlesAndWriteToFile(builder);
     }
 
+    @Test
     public void testXYLineChart() throws Exception
     {
         ChartBuilder builder = ChartBuilderFactory.createChartBuilder(ChartType.XYLINE, new SampleSeriesBuilder());
         assertChartTitlesAndWriteToFile(builder);
     }
 
+    @Test
     public void testXYLineChartWithColourAndWidth() throws Exception
     {
         when(_seriesDefinition.getStrokeWidth()).thenReturn(3);
@@ -144,6 +166,7 @@ public class ChartProductionTest extends QpidTestCase
         assertChartTitlesAndWriteToFile(builder);
     }
 
+    @Test
     public void testXYLineChartWithYAxisBounds() throws Exception
     {
         when(_chartingDefinition.getYAxisLowerBound()).thenReturn(-10);
@@ -153,6 +176,7 @@ public class ChartProductionTest extends QpidTestCase
         assertChartTitlesAndWriteToFile(builder);
     }
 
+    @Test
     public void testTimeSeriesLineChart() throws Exception
     {
         when(_seriesDefinition.getShape()).thenReturn("cross");
@@ -174,6 +198,7 @@ public class ChartProductionTest extends QpidTestCase
         assertChartTitlesAndWriteToFile(builder);
     }
 
+    @Test
     public void testStatisticalBarChart() throws Exception
     {
         SeriesRow[] statisticalSeriesRows = new SeriesRow[]
@@ -201,11 +226,11 @@ public class ChartProductionTest extends QpidTestCase
 
         if (chart.getPlot() instanceof XYPlot)
         {
-            assertEquals(1, chart.getXYPlot().getDatasetCount());
+            assertEquals((long) 1, (long) chart.getXYPlot().getDatasetCount());
         }
         else
         {
-            assertEquals(1, chart.getCategoryPlot().getDatasetCount());
+            assertEquals((long) 1, (long) chart.getCategoryPlot().getDatasetCount());
         }
 
         _writer.writeChartToFileSystem(chart, _chartingDefinition);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactoryTest.java
----------------------------------------------------------------------
diff --git a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactoryTest.java b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactoryTest.java
index 2656c78..91e8742 100644
--- a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactoryTest.java
+++ b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactoryTest.java
@@ -21,10 +21,28 @@ package org.apache.qpid.disttest.charting.chartbuilder;
 
 import java.awt.Color;
 
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.junit.Assert;
 
-public class ColorFactoryTest extends QpidTestCase
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class ColorFactoryTest extends UnitTestBase
 {
+    @Test
     public void testBlue()
     {
         assertEquals(Color.blue, ColorFactory.toColour("blue"));
@@ -32,6 +50,7 @@ public class ColorFactoryTest extends QpidTestCase
         assertEquals(Color.blue, ColorFactory.toColour("Blue"));
     }
 
+    @Test
     public void testDarkBlue()
     {
         assertEquals(Color.blue.darker(), ColorFactory.toColour("dark_blue"));

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesBuilderCallbackTest.java
----------------------------------------------------------------------
diff --git a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesBuilderCallbackTest.java b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesBuilderCallbackTest.java
index 88e76e6..82ba02e 100644
--- a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesBuilderCallbackTest.java
+++ b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/TimeSeriesBuilderCallbackTest.java
@@ -28,12 +28,30 @@ import java.util.TimeZone;
 
 import org.apache.qpid.disttest.charting.definition.SeriesDefinition;
 import org.apache.qpid.disttest.charting.seriesbuilder.SeriesRow;
-import org.apache.qpid.test.utils.QpidTestCase;
+
 import org.jfree.data.time.TimeSeries;
 import org.jfree.data.time.TimeSeriesCollection;
 import org.jfree.data.time.TimeSeriesDataItem;
+import org.junit.Assert;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
-public class TimeSeriesBuilderCallbackTest extends QpidTestCase
+public class TimeSeriesBuilderCallbackTest extends UnitTestBase
 {
     private static final String SERIES_LEGEND = "mySeriesLegend";
 
@@ -42,10 +60,9 @@ public class TimeSeriesBuilderCallbackTest extends QpidTestCase
     private Date[] _dates;
     private double[] _values;
 
-    @Override
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
-        super.setUp();
         Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT+00:00"));
 
         calendar.set(2013, Calendar.JANUARY, 1);
@@ -62,6 +79,7 @@ public class TimeSeriesBuilderCallbackTest extends QpidTestCase
     }
 
 
+    @Test
     public void testAddPointToSeries()
     {
         TimeSeriesHolder timeSeriesHolder = new TimeSeriesHolder();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java
----------------------------------------------------------------------
diff --git a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java
index 47eee43..10c3d94 100644
--- a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java
+++ b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java
@@ -32,11 +32,29 @@ import java.io.FileWriter;
 import java.util.List;
 import java.util.Properties;
 
+import org.junit.Assert;
+
 import org.apache.qpid.disttest.charting.ChartType;
 import org.apache.qpid.disttest.charting.ChartingException;
-import org.apache.qpid.test.utils.QpidTestCase;
 
-public class ChartingDefinitionCreatorTest extends QpidTestCase
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class ChartingDefinitionCreatorTest extends UnitTestBase
 {
     private static final String TEST_CHART_TITLE = "CHART_TITLE ${ChartingDefinitionSysProp}";
     private static final String TEST_CHART_SUBTITLE = "CHART_SUBTITLE";
@@ -52,40 +70,43 @@ public class ChartingDefinitionCreatorTest extends QpidTestCase
     private ChartingDefinitionCreator _chartingDefinitionLoader = new ChartingDefinitionCreator();
     private File _testTempDir;
 
-    @Override
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
-        super.setUp();
         _testTempDir = createTestTemporaryDirectory();
     }
 
+    @Test
     public void testLoadTwoDefinitionsFromDirectory() throws Exception
     {
         createTestDefinitionWithin(_testTempDir);
         createTestDefinitionWithin(_testTempDir);
 
         List<ChartingDefinition> definitions = _chartingDefinitionLoader.createFromFileOrDirectory(_testTempDir.getAbsolutePath());
-        assertEquals(2, definitions.size());
+
+        assertEquals((long) 2, (long) definitions.size());
     }
 
+    @Test
     public void testLoadOneDefinitionFromFile() throws Exception
     {
         File testDefFile = createTestDefinitionWithin(_testTempDir);
 
         List<ChartingDefinition> definitions = _chartingDefinitionLoader.createFromFileOrDirectory(testDefFile.getAbsolutePath());
-        assertEquals(1, definitions.size());
+        assertEquals((long) 1, (long) definitions.size());
 
         ChartingDefinition definition1 = definitions.get(0);
         assertEquals(TEST_CHART_TITLE, definition1.getChartTitle());
     }
 
+    @Test
     public void testDefinitionsProperties() throws Exception
     {
         setTestSystemProperty(SYSTEM_PROPERTY_NAME, "propValue");
         File testDefFile = createTestDefinitionWithin(_testTempDir);
 
         List<ChartingDefinition> definitions = _chartingDefinitionLoader.createFromFileOrDirectory(testDefFile.getAbsolutePath());
-        assertEquals(1, definitions.size());
+        assertEquals((long) 1, (long) definitions.size());
 
         ChartingDefinition definition1 = definitions.get(0);
         assertEquals("CHART_TITLE propValue", definition1.getChartTitle());
@@ -99,11 +120,12 @@ public class ChartingDefinitionCreatorTest extends QpidTestCase
         assertEquals(stemOnly, definition1.getChartStemName());
 
         final List<SeriesDefinition> seriesDefinitions = definition1.getSeriesDefinitions();
-        assertEquals(1, seriesDefinitions.size());
+        assertEquals((long) 1, (long) seriesDefinitions.size());
         SeriesDefinition seriesDefinition = seriesDefinitions.get(0);
         assertEquals(TEST_SERIES_SELECT_STATEMENT, seriesDefinition.getSeriesStatement());
     }
 
+    @Test
     public void testDefinitionFileNotFound() throws Exception
     {
         File notFound = new File(_testTempDir,"notfound.chartdef");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java
----------------------------------------------------------------------
diff --git a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java
index e937e80..935c4f6 100644
--- a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java
+++ b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java
@@ -28,9 +28,26 @@ import static org.apache.qpid.disttest.charting.definition.SeriesDefinitionCreat
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.junit.Assert;
 
-public class SeriesDefinitionCreatorTest extends QpidTestCase
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class SeriesDefinitionCreatorTest extends UnitTestBase
 {
     private static final String SYSTEM_PROPERTY_NAME = "SeriesDefinitionProp";
     private static final String TEST_SERIES_1_SELECT_STATEMENT = "SERIES_1_SELECT_STATEMENT";
@@ -50,18 +67,18 @@ public class SeriesDefinitionCreatorTest extends QpidTestCase
 
     private SeriesDefinitionCreator _seriesDefinitionLoader = new SeriesDefinitionCreator();
 
-    @Override
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
-        super.setUp();
     }
 
+    @Test
     public void testOneSeriesDefinition() throws Exception
     {
         createTestProperties(1, TEST_SERIES_1_SELECT_STATEMENT, TEST_SERIES_1_LEGEND, TEST_SERIES_1_DIR, TEST_SERIES_1_COLOUR_NAME, TEST_SERIES_1_STROKE_WIDTH);
 
         List<SeriesDefinition> definitions = _seriesDefinitionLoader.createFromProperties(_properties);
-        assertEquals(1, definitions.size());
+        assertEquals((long) 1, (long) definitions.size());
 
         SeriesDefinition definition = definitions.get(0);
         assertEquals(TEST_SERIES_1_SELECT_STATEMENT, definition.getSeriesStatement());
@@ -71,13 +88,14 @@ public class SeriesDefinitionCreatorTest extends QpidTestCase
         assertEquals(TEST_SERIES_1_STROKE_WIDTH, definition.getStrokeWidth());
     }
 
+    @Test
     public void testTwoSeriesDefinitions() throws Exception
     {
         createTestProperties(1, TEST_SERIES_1_SELECT_STATEMENT, TEST_SERIES_1_LEGEND, TEST_SERIES_1_DIR, TEST_SERIES_1_COLOUR_NAME, TEST_SERIES_1_STROKE_WIDTH);
         createTestProperties(2, TEST_SERIES_2_SELECT_STATEMENT, TEST_SERIES_2_LEGEND, TEST_SERIES_2_DIR, null, null);
 
         List<SeriesDefinition> definitions = _seriesDefinitionLoader.createFromProperties(_properties);
-        assertEquals(2, definitions.size());
+        assertEquals((long) 2, (long) definitions.size());
 
         SeriesDefinition seriesDefinition1 = definitions.get(0);
         assertEquals(TEST_SERIES_1_SELECT_STATEMENT, seriesDefinition1.getSeriesStatement());
@@ -90,22 +108,24 @@ public class SeriesDefinitionCreatorTest extends QpidTestCase
         assertEquals(TEST_SERIES_2_DIR, seriesDefinition2.getSeriesDirectory());
     }
 
+    @Test
     public void testNonSequentialSeriesDefinitionsIgnored() throws Exception
     {
         createTestProperties(1, TEST_SERIES_1_SELECT_STATEMENT, TEST_SERIES_1_LEGEND, TEST_SERIES_1_DIR, TEST_SERIES_1_COLOUR_NAME, TEST_SERIES_1_STROKE_WIDTH);
         createTestProperties(3, TEST_SERIES_2_SELECT_STATEMENT, TEST_SERIES_2_LEGEND, TEST_SERIES_2_DIR, null, null);
 
         List<SeriesDefinition> definitions = _seriesDefinitionLoader.createFromProperties(_properties);
-        assertEquals(1, definitions.size());
+        assertEquals((long) 1, (long) definitions.size());
     }
 
+    @Test
     public void testSeriesDirectoryAndNameSubstitution() throws Exception
     {
         setTestSystemProperty(SYSTEM_PROPERTY_NAME, "propValue");
         createTestProperties(1, TEST_SERIES_1_SELECT_STATEMENT, TEST_SERIES_1_LEGEND_WITH_SYSPROP, TEST_SERIES_1_DIR_WITH_SYSPROP, null, null);
 
         List<SeriesDefinition> definitions = _seriesDefinitionLoader.createFromProperties(_properties);
-        assertEquals(1, definitions.size());
+        assertEquals((long) 1, (long) definitions.size());
 
         SeriesDefinition seriesDefinition1 = definitions.get(0);
         assertEquals("propValue/mydir", seriesDefinition1.getSeriesDirectory());

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilderTest.java
----------------------------------------------------------------------
diff --git a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilderTest.java b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilderTest.java
index 1d0adb9..2d94759 100644
--- a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilderTest.java
+++ b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilderTest.java
@@ -30,9 +30,25 @@ import java.io.PrintWriter;
 import java.util.Collections;
 
 import org.apache.qpid.disttest.charting.definition.SeriesDefinition;
-import org.apache.qpid.test.utils.QpidTestCase;
 
-public class JdbcSeriesBuilderTest extends QpidTestCase
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class JdbcSeriesBuilderTest extends UnitTestBase
 {
     private static final String TEST_SERIES_1_SELECT_STATEMENT = "SELECT A, B FROM test";
     private static final String TEST_SERIES_1_LEGEND = "SERIES_1_LEGEND";
@@ -44,15 +60,15 @@ public class JdbcSeriesBuilderTest extends QpidTestCase
 
     private File _testTempDir;
 
-    @Override
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
-        super.setUp();
         when(_seriesWalkerCallback.getNumberOfDimensions()).thenReturn(2);
         _testTempDir = createTestTemporaryDirectory();
         createTestCsvIn(_testTempDir);
     }
 
+    @Test
     public void testBuildOneSeries() throws Exception
     {
         SeriesDefinition seriesDefinition = createTestSeriesDefinition();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGeneratorTest.java
----------------------------------------------------------------------
diff --git a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGeneratorTest.java b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGeneratorTest.java
index d53d0cc..fb5bcec 100644
--- a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGeneratorTest.java
+++ b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGeneratorTest.java
@@ -21,11 +21,30 @@ package org.apache.qpid.disttest.charting.seriesbuilder;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.junit.Assert;
+
 import org.apache.qpid.disttest.charting.definition.SeriesDefinition;
-import org.apache.qpid.test.utils.QpidTestCase;
 
-public class JdbcUrlGeneratorTest extends QpidTestCase
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class JdbcUrlGeneratorTest extends UnitTestBase
 {
+    @Test
     public void testGetJdbcUrlWithoutProvidingAUrlReturnsCsvUrlWithCorrectDirectory()
     {
         JdbcUrlGenerator jdbcUrlGenerator = new JdbcUrlGenerator(null);
@@ -37,6 +56,7 @@ public class JdbcUrlGeneratorTest extends QpidTestCase
         assertEquals("jdbc:relique:csv:mydir", jdbcUrl);
     }
 
+    @Test
     public void testGetJdbcUrlReturnsProvidedUrl()
     {
         String urlTemplate = "urlTemplate";
@@ -48,6 +68,7 @@ public class JdbcUrlGeneratorTest extends QpidTestCase
         assertEquals(urlTemplate, jdbcUrl);
     }
 
+    @Test
     public void testGetJdbcUrlThrowsExceptionIfUrlProvidedAndSeriesDirectorySpecified()
     {
         String urlTemplate = "urlTemplate";
@@ -66,6 +87,7 @@ public class JdbcUrlGeneratorTest extends QpidTestCase
         }
     }
 
+    @Test
     public void testGetJdbcUrlThrowsExceptionWithoutAProvidedUrlOrSeriesDirectory()
     {
         JdbcUrlGenerator jdbcUrlGenerator = new JdbcUrlGenerator(null);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRowTest.java
----------------------------------------------------------------------
diff --git a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRowTest.java b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRowTest.java
index 064971a..5b0403a 100644
--- a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRowTest.java
+++ b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRowTest.java
@@ -18,17 +18,36 @@
  */
 package org.apache.qpid.disttest.charting.seriesbuilder;
 
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.junit.Assert;
 
-public class SeriesRowTest extends QpidTestCase
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class SeriesRowTest extends UnitTestBase
 {
     private static final Integer[] PAIR = new Integer[] {10, 11};
 
+    @Test
     public void testValidSeriesRow()
     {
         assertEquals(11, SeriesRow.createValidSeriesRow(2, PAIR).dimension(1));
     }
 
+    @Test
     public void testValidSeriesRowThrowsExceptionIfArrayTooSmall()
     {
         try
@@ -42,6 +61,7 @@ public class SeriesRowTest extends QpidTestCase
         }
     }
 
+    @Test
     public void testDimension()
     {
         SeriesRow seriesRow = new SeriesRow(10, 11);
@@ -49,12 +69,14 @@ public class SeriesRowTest extends QpidTestCase
         assertEquals(11, seriesRow.dimension(1));
     }
 
+    @Test
     public void testDimensionAsString()
     {
         SeriesRow seriesRow = new SeriesRow(10);
         assertEquals("10", seriesRow.dimensionAsString(0));
     }
 
+    @Test
     public void testDimensionAsDouble()
     {
         SeriesRow seriesRow = new SeriesRow(10.1);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java
----------------------------------------------------------------------
diff --git a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java
index 80dff10..eea07ee 100644
--- a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java
+++ b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java
@@ -29,14 +29,32 @@ import java.io.InputStream;
 import java.util.Scanner;
 
 import org.apache.qpid.disttest.charting.definition.ChartingDefinition;
-import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.test.utils.TestFileUtils;
 import org.apache.qpid.server.util.FileUtils;
+
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
 import org.jfree.data.general.DefaultPieDataset;
+import org.junit.Assert;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
 
-public class ChartWriterTest extends QpidTestCase
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class ChartWriterTest extends UnitTestBase
 {
     private JFreeChart _chart1;
     private JFreeChart _chart2;
@@ -44,10 +62,9 @@ public class ChartWriterTest extends QpidTestCase
     private File _chartDir;
     private ChartWriter _writer;
 
-    @Override
+    @Before
     public void setUp() throws Exception
     {
-        super.setUp();
         DefaultPieDataset dataset = new DefaultPieDataset();
         dataset.setValue("a", 1);
         dataset.setValue("b", 2);
@@ -61,6 +78,7 @@ public class ChartWriterTest extends QpidTestCase
         _writer.setOutputDirectory(_chartDir);
     }
 
+    @Test
     public void testWriteChartToFileSystem()
     {
         ChartingDefinition chartDef1 = mock(ChartingDefinition.class);
@@ -74,6 +92,7 @@ public class ChartWriterTest extends QpidTestCase
         assertTrue("chart1 png does not exist", chart1File.exists());
     }
 
+    @Test
     public void testWriteHtmlSummaryToFileSystemOverwritingExistingFile() throws Exception
     {
         ChartingDefinition chartDef1 = mock(ChartingDefinition.class);
@@ -99,6 +118,7 @@ public class ChartWriterTest extends QpidTestCase
         assertEquals("HTML summary file has unexpected content", expectedSummaryContent, actualSummaryContent);
     }
 
+    @Test
     public void testWriteHtmlSummaryToFileSystemDoesNothingIfLessThanTwoCharts()
     {
         ChartingDefinition chartDef1 = mock(ChartingDefinition.class);
@@ -111,8 +131,8 @@ public class ChartWriterTest extends QpidTestCase
 
         _writer.writeHtmlSummaryToFileSystem("Performance Charts");
 
-        assertFalse("Only one chart generated so no summary file should have been written",
-                summaryFile.exists());
+        assertFalse("Only one chart generated so no summary file should have been written", summaryFile.exists());
+
     }
 
     private void writeDummyContentToSummaryFileToEnsureItGetsOverwritten(File summaryFile) throws Exception

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/qpid-test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-test-utils/pom.xml b/qpid-test-utils/pom.xml
index ad04437..341e159 100644
--- a/qpid-test-utils/pom.xml
+++ b/qpid-test-utils/pom.xml
@@ -50,6 +50,11 @@
       <artifactId>geronimo-jms_1.1_spec</artifactId>
       <scope>provided</scope>
     </dependency>
+
+    <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+    </dependency>
   </dependencies>
 
 </project>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/JvmVendor.java
----------------------------------------------------------------------
diff --git a/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/JvmVendor.java b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/JvmVendor.java
new file mode 100644
index 0000000..bd176d7
--- /dev/null
+++ b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/JvmVendor.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.test.utils;
+
+public enum JvmVendor
+{
+    ORACLE,
+    IBM,
+    OPENJDK,
+    UNKNOWN
+}

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidUnitTestRunner.java
----------------------------------------------------------------------
diff --git a/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidUnitTestRunner.java b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidUnitTestRunner.java
new file mode 100644
index 0000000..1a3a82e
--- /dev/null
+++ b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidUnitTestRunner.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.test.utils;
+
+import ch.qos.logback.classic.LoggerContext;
+import org.junit.runner.notification.RunNotifier;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class QpidUnitTestRunner extends BlockJUnit4ClassRunner
+{
+    private static final Logger LOGGER = LoggerFactory.getLogger(QpidUnitTestRunner.class);
+
+    private final Class<?> _testClass;
+
+    public QpidUnitTestRunner(final Class<?> klass) throws InitializationError
+    {
+        super(klass);
+        _testClass = klass;
+    }
+
+    @Override
+    public void run(final RunNotifier notifier)
+    {
+        setClassQualifiedTestName(_testClass.getName());
+        try
+        {
+            super.run(notifier);
+        }
+        finally
+        {
+            setClassQualifiedTestName(null);
+        }
+    }
+
+    @Override
+    protected void runChild(final FrameworkMethod method, final RunNotifier notifier)
+    {
+        LOGGER.info("========================= executing test : {}", _testClass.getSimpleName() + "#" + method.getName());
+        setClassQualifiedTestName(_testClass.getName() + "." + method.getName());
+        LOGGER.info("========================= start executing test : {}", _testClass.getSimpleName() + "#" + method.getName());
+
+        try
+        {
+            super.runChild(method, notifier);
+        }
+        finally
+        {
+            LOGGER.info("========================= stop executing test : {} ", _testClass.getSimpleName() + "#" + method.getName());
+            setClassQualifiedTestName(_testClass.getName());
+            LOGGER.info("========================= cleaning up test environment for test : {}", _testClass.getSimpleName() + "#" + method.getName());
+        }
+    }
+
+    private void setClassQualifiedTestName(final String name)
+    {
+        final LoggerContext loggerContext = ((ch.qos.logback.classic.Logger) LOGGER).getLoggerContext();
+        loggerContext.putProperty(LogbackPropertyValueDiscriminator.CLASS_QUALIFIED_TEST_NAME, name);
+    }
+
+
+
+}

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
----------------------------------------------------------------------
diff --git a/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
index eeda839..9371850 100644
--- a/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
+++ b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
@@ -72,6 +72,11 @@ public class TestFileUtils
         return createTempFile(testcase, SUFFIX);
     }
 
+    public static File createTempFile(UnitTestBase testcase)
+    {
+        return createTempFile(testcase, SUFFIX);
+    }
+
     public static File createTempFile(TestCase testcase, String suffix)
     {
         String prefix = testcase.getClass().getSimpleName() + "-" + testcase.getName();
@@ -94,6 +99,28 @@ public class TestFileUtils
         return tmpFile;
     }
 
+    public static File createTempFile(UnitTestBase testcase, String suffix)
+    {
+        String prefix = testcase.getClass().getSimpleName() + "-" + testcase.getTestName();
+
+        File tmpFile;
+        try
+        {
+            tmpFile = File.createTempFile(prefix, suffix);
+            tmpFile.deleteOnExit();
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException(String.format(
+                    "Cannot create temporary file with prefix '%s' and suffix '%s'. ${java.io.tmpdir}='%s'",
+                    prefix,
+                    suffix,
+                    System.getProperty("java.io.tmpdir")), e);
+        }
+
+        return tmpFile;
+    }
+
     /**
      * Creates a temporary file from the resource name given, using the resource name as the file suffix.
      *
@@ -116,6 +143,23 @@ public class TestFileUtils
         return dst;
     }
 
+    public static File createTempFileFromResource(UnitTestBase testCase, String resourceName)
+    {
+        File dst = createTempFile(testCase, resourceName);
+        InputStream in = testCase.getClass().getResourceAsStream(resourceName);
+        try
+        {
+            copy(in, dst);
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("Cannot copy resource " + resourceName +
+                                       " to temp file " + dst.getAbsolutePath(), e);
+        }
+        dst.deleteOnExit();
+        return dst;
+    }
+
     /**
      * Creates a temporary file for given test with given suffix in file name.
      * The given content is stored in the file using UTF-8 encoding.
@@ -130,6 +174,20 @@ public class TestFileUtils
         return file;
     }
 
+    /**
+     * Creates a temporary file for given test with given suffix in file name.
+     * The given content is stored in the file using UTF-8 encoding.
+     */
+    public static File createTempFile(UnitTestBase testcase, String suffix, String content)
+    {
+        File file = createTempFile(testcase, suffix);
+        if (content != null)
+        {
+            saveTextContentInFile(content, file);
+        }
+        return file;
+    }
+
     public static void saveTextContentInFile(String content, File file)
     {
         FileOutputStream fos =  null;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/UnitTestBase.java
----------------------------------------------------------------------
diff --git a/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/UnitTestBase.java b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/UnitTestBase.java
new file mode 100644
index 0000000..752885b
--- /dev/null
+++ b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/UnitTestBase.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.test.utils;
+
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.google.common.base.StandardSystemProperty;
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.junit.runner.RunWith;
+
+@RunWith(QpidUnitTestRunner.class)
+public class UnitTestBase
+{
+    public static final String TMP_FOLDER = System.getProperty("java.io.tmpdir");
+    private static final String PROFILE_VIRTUALHOSTNODE_TYPE = "virtualhostnode.type";
+
+    @Rule
+    public final TestName _testName = new TestName();
+
+    private final Map<String, String> _propertiesSetForTest = new HashMap<>();
+    private final Set<Runnable> _tearDownRegistry = new LinkedHashSet<>();
+
+    @After
+    public void cleanupPostTest()
+    {
+        revertSysProps();
+
+        _tearDownRegistry.forEach(Runnable::run);
+    }
+
+    private void revertSysProps()
+    {
+        _propertiesSetForTest.forEach((key, value) -> {
+            if (value != null)
+            {
+                System.setProperty(key, value);
+            }
+            else
+            {
+                System.clearProperty(key);
+            }
+        });
+    }
+
+    public String getTestName()
+    {
+        return _testName.getMethodName();
+    }
+
+    public void setTestSystemProperty(final String property, final String value)
+    {
+        if (!_propertiesSetForTest.containsKey(property))
+        {
+            _propertiesSetForTest.put(property, System.getProperty(property));
+        }
+
+        if (value == null)
+        {
+            System.clearProperty(property);
+        }
+        else
+        {
+            System.setProperty(property, value);
+        }
+    }
+
+    public int findFreePort()
+    {
+        return new PortHelper().getNextAvailable();
+    }
+
+    public int getNextAvailable(int fromPort)
+    {
+        return new PortHelper().getNextAvailable(fromPort);
+    }
+
+
+    public void registerTearDown(Runnable runnable)
+    {
+        _tearDownRegistry.add(runnable);
+    }
+
+    public JvmVendor getJvmVendor()
+    {
+        final String property = String.valueOf(System.getProperty(StandardSystemProperty.JAVA_VENDOR.key())).toUpperCase();
+        if (property.contains("IBM"))
+        {
+            return JvmVendor.IBM;
+        }
+        else if (property.contains("ORACLE"))
+        {
+            return JvmVendor.ORACLE;
+        }
+        else if (property.contains("OPENJDK"))
+        {
+            return JvmVendor.OPENJDK;
+        }
+        else
+        {
+            return JvmVendor.UNKNOWN;
+        }
+    }
+
+    public VirtualHostNodeStoreType getVirtualHostNodeStoreType()
+    {
+        final String type = System.getProperty(PROFILE_VIRTUALHOSTNODE_TYPE, VirtualHostNodeStoreType.MEMORY.name()).toUpperCase();
+        return VirtualHostNodeStoreType.valueOf(type);
+    }
+}

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/VirtualHostNodeStoreType.java
----------------------------------------------------------------------
diff --git a/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/VirtualHostNodeStoreType.java b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/VirtualHostNodeStoreType.java
new file mode 100644
index 0000000..1ebb904
--- /dev/null
+++ b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/VirtualHostNodeStoreType.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.test.utils;
+
+public enum VirtualHostNodeStoreType
+{
+    DERBY(true),
+    BDB(true),
+    JSON(true),
+    MEMORY(false);
+
+    private final boolean _persistent;
+
+    VirtualHostNodeStoreType(final boolean persistent)
+    {
+        _persistent = persistent;
+    }
+
+    public boolean isPersistent()
+    {
+        return _persistent;
+    }
+}

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/test-profiles/JavaJsonExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/JavaJsonExcludes b/test-profiles/JavaJsonExcludes
index 7620403..9fbd871 100644
--- a/test-profiles/JavaJsonExcludes
+++ b/test-profiles/JavaJsonExcludes
@@ -19,5 +19,3 @@
 
 org.apache.qpid.server.store.berkeleydb.*
 org.apache.qpid.server.store.berkeleydb.replication.*
-org.apache.qpid.systest.rest.acl.VirtualHostACLTest#*
-org.apache.qpid.server.BrokerStartupTest#testStartupWithNoConfig

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/test-profiles/JavaTransientExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/JavaTransientExcludes b/test-profiles/JavaTransientExcludes
index d08df5c..436053a 100644
--- a/test-profiles/JavaTransientExcludes
+++ b/test-profiles/JavaTransientExcludes
@@ -17,14 +17,8 @@
 // under the License.
 //
 
-//These tests require a persistent store
-org.apache.qpid.server.logging.AlertingTest#testAlertingReallyWorksWithRestart
-org.apache.qpid.server.logging.AlertingTest#testAlertingReallyWorksWithChanges
-
 org.apache.qpid.server.store.berkeleydb.*
 org.apache.qpid.server.store.berkeleydb.replication.*
 org.apache.qpid.server.store.berkeleydb.upgrade.*
 org.apache.qpid.server.virtualhostnode.berkeleydb.*
 
-org.apache.qpid.systest.rest.VirtualHostNodeRestTest#testCreateAndDeleteVirtualHostNode
-


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org