QPID-6481: Move java source tree to top level

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1673693 13f79535-47bb-0310-9956-ffa450edef68

55 files changed, 0 insertions, 5948 deletions

diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ArgumentParserTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ArgumentParserTest.java
deleted file mode 100644
index 3be82627fe..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ArgumentParserTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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.disttest;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ArgumentParserTest extends QpidTestCase
-{
-    private static final String TEST_CONFIG_FILENAME = "ControllerRunnerTest-test-config-filename.json";
-    private static final String JNDI_CONFIG_FILENAME = "ControllerRunnerTest-jndi-config-filename.properties";
-    private static final String DISTRIBUTED_MODE = "true";
-
-    public static final String TEST_CONFIG_PROP = "test-config";
-    public static final String JNDI_CONFIG_PROP = "jndi-config";
-    public static final String DISTRIBUTED_PROP = "distributed";
-
-    public static final String TEST_CONFIG_DEFAULT = "perftests-config.json";
-    public static final String JNDI_CONFIG_DEFAULT = "perftests-jndi.properties";
-    public static final String DISTRIBUTED_DEFAULT = "false";
-
-    private Map<String,String> _options = new HashMap<String, String>();
-
-    private ArgumentParser _parser;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        _parser = new ArgumentParser();
-
-        _options.clear();
-        _options.put(TEST_CONFIG_PROP, TEST_CONFIG_DEFAULT);
-        _options.put(JNDI_CONFIG_PROP, JNDI_CONFIG_DEFAULT);
-        _options.put(DISTRIBUTED_PROP, DISTRIBUTED_DEFAULT);
-    }
-
-    public void testInvalidArguments()
-    {
-        String[] args = new String[]{"nonExistentConfigProperty" + "=" + TEST_CONFIG_FILENAME};
-
-        try
-        {
-            _parser.parseArgumentsIntoConfig(_options, args);
-            fail("expected exception to be thrown due to provision of a non existent config property");
-        }
-        catch(IllegalArgumentException e)
-        {
-            //expected
-        }
-    }
-
-    public void testDefaultConfigValues()
-    {
-        String[] args = new String[0];
-
-        _parser.parseArgumentsIntoConfig(_options, args);
-
-        assertEquals("unexpected config value", TEST_CONFIG_DEFAULT, _options.get(TEST_CONFIG_PROP));
-        assertEquals("unexpected config value", JNDI_CONFIG_DEFAULT, _options.get(JNDI_CONFIG_PROP));
-        assertEquals("unexpected config value", DISTRIBUTED_DEFAULT, _options.get(DISTRIBUTED_PROP));
-    }
-
-    public void testConfigurationParsingOverridesDefault() throws Exception
-    {
-        String[] args = new String[]{TEST_CONFIG_PROP + "=" + TEST_CONFIG_FILENAME,
-                JNDI_CONFIG_PROP + "=" + JNDI_CONFIG_FILENAME,
-                DISTRIBUTED_PROP + "=" + DISTRIBUTED_MODE};
-
-        _parser.parseArgumentsIntoConfig(_options, args);
-
-        assertEquals("unexpected config value", TEST_CONFIG_FILENAME, _options.get(TEST_CONFIG_PROP));
-        assertEquals("unexpected config value", JNDI_CONFIG_FILENAME, _options.get(JNDI_CONFIG_PROP));
-        assertEquals("unexpected config value", DISTRIBUTED_MODE, _options.get(DISTRIBUTED_PROP));
-        assertFalse("override value was the same as the default", DISTRIBUTED_MODE.equalsIgnoreCase(_options.get(DISTRIBUTED_DEFAULT)));
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelperTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelperTest.java
deleted file mode 100644
index 629442d86c..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelperTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.disttest;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.test.utils.TestFileUtils;
-
-public class ConfigFileHelperTest extends QpidTestCase
-{
-    private File _testDir;
-    private ConfigFileHelper _configFileHelper = new ConfigFileHelper();
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        _testDir = TestFileUtils.createTestDirectory();
-    }
-
-    public void testGetTestConfigFilesForDirectory() throws Exception
-    {
-        String jsFile = createFile("file1.js");
-        String jsonFile = createFile("file2.json");
-        createFile("file.txt");
-        createDir("dir.js");
-
-        String testConfigPath = _testDir.getAbsolutePath();
-
-        List<String> configFiles = _configFileHelper.getTestConfigFiles(testConfigPath);
-
-        Set<String> expectedFiles = new HashSet<String>(Arrays.asList(jsFile, jsonFile));
-        Set<String> actualFiles = new HashSet<String>(configFiles);
-
-        assertEquals(expectedFiles, actualFiles);
-    }
-
-    private void createDir(String dirName)
-    {
-        File dir = new File(_testDir, dirName);
-        dir.mkdir();
-    }
-
-    private String createFile(String fileName) throws IOException
-    {
-        File file = new File(_testDir, fileName);
-        file.createNewFile();
-        return file.getAbsolutePath();
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileTestHelper.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileTestHelper.java
deleted file mode 100644
index 71cd61db82..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileTestHelper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.disttest;
-
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
-import org.apache.qpid.disttest.controller.config.Config;
-import org.apache.qpid.disttest.controller.config.ConfigReader;
-
-public class ConfigFileTestHelper
-{
-    public static Reader getConfigFileReader(Class<?> testClass, String resourceName)
-    {
-        InputStream inputStream = testClass.getResourceAsStream(resourceName);
-        if(inputStream == null)
-        {
-            throw new RuntimeException("Can't find resource " + resourceName + " using classloader of class " + testClass);
-        }
-        Reader reader = new InputStreamReader(inputStream);
-        return reader;
-    }
-
-    public static Config getConfigFromResource(Class<?> testClass, String resourceName)
-    {
-        ConfigReader configReader = new ConfigReader();
-        Config config = configReader.readConfig(getConfigFileReader(testClass, resourceName));
-        return config;
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/PerfTestConstants.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/PerfTestConstants.java
deleted file mode 100644
index 5e56f3a89f..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/PerfTestConstants.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.disttest;
-
-public abstract class PerfTestConstants
-{
-    public static final long REGISTRATION_TIMEOUT = 20000;
-    public static final long COMMAND_RESPONSE_TIMEOUT = 30000;
-    public static final long TEST_RESULT_TIMEOUT = 20000;
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/VisitorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/VisitorTest.java
deleted file mode 100644
index 09f7da4efb..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/VisitorTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.disttest;
-
-import org.apache.qpid.disttest.message.Command;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-
-public class VisitorTest extends QpidTestCase
-{
-
-    public void testStringVisited() throws Exception
-    {
-        Object argument = new String();
-
-        TestVisitor visitor = new TestVisitor();
-        visitor.visit(argument);
-
-        assertSame(argument, visitor._string);
-    }
-
-    public void testCommandVisited() throws Exception
-    {
-        Object argument = new TestCommand();
-
-        TestVisitor visitor = new TestVisitor();
-        visitor.visit(argument);
-
-        assertSame(argument, visitor._testCommand);
-    }
-
-    public void testNoVisitIntegerImplementatiom() throws Exception
-    {
-        Integer argument = Integer.valueOf(1);
-
-        TestVisitor visitor = new TestVisitor();
-
-        try
-        {
-            visitor.visit(argument);
-            fail("Exception not thrown");
-        }
-        catch (DistributedTestException e)
-        {
-            assertNotNull(e.getCause());
-            assertEquals(NoSuchMethodException.class, e.getCause().getClass());
-        }
-    }
-
-    class TestVisitor extends Visitor
-    {
-        String _string = null;
-        TestCommand _testCommand = null;
-
-        public void visit(String string)
-        {
-            _string = string;
-        }
-
-        public void visit(TestCommand command)
-        {
-            _testCommand = command;
-        }
-    }
-
-    class TestCommand extends Command
-    {
-
-        public TestCommand()
-        {
-            super(null);
-        }
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ClientCommandVisitorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ClientCommandVisitorTest.java
deleted file mode 100644
index 2b29471558..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ClientCommandVisitorTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * 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.disttest.client;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import org.apache.qpid.disttest.jms.ClientJmsDelegate;
-import org.apache.qpid.disttest.message.CreateConnectionCommand;
-import org.apache.qpid.disttest.message.CreateConsumerCommand;
-import org.apache.qpid.disttest.message.CreateMessageProviderCommand;
-import org.apache.qpid.disttest.message.CreateProducerCommand;
-import org.apache.qpid.disttest.message.CreateSessionCommand;
-import org.apache.qpid.disttest.message.StartTestCommand;
-import org.apache.qpid.disttest.message.StopClientCommand;
-import org.apache.qpid.disttest.message.TearDownTestCommand;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ClientCommandVisitorTest extends QpidTestCase
-{
-    private Client _client;
-    private ClientCommandVisitor _visitor;
-    private ClientJmsDelegate _delegate;
-
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        _client = mock(Client.class);
-        _delegate = mock(ClientJmsDelegate.class);
-        _visitor = new ClientCommandVisitor(_client, _delegate);
-    }
-
-    public void testStopClient()
-    {
-        StopClientCommand command = new StopClientCommand();
-        _visitor.visit(command);
-        verify(_client).stop();
-    }
-
-    public void testCreateConnection() throws Exception
-    {
-        final CreateConnectionCommand command = new CreateConnectionCommand();
-        _visitor.visit(command);
-        verify(_delegate).createConnection(command);
-    }
-
-    public void testCreateSession() throws Exception
-    {
-        final CreateSessionCommand command = new CreateSessionCommand();
-        _visitor.visit(command);
-        verify(_delegate).createSession(command);
-    }
-
-    public void testCreateProducer() throws Exception
-    {
-        final CreateProducerCommand command = new CreateProducerCommand();
-        _visitor.visit(command);
-        verify(_delegate).createProducer(command);
-    }
-
-    public void testCreateConsumer() throws Exception
-    {
-        final CreateConsumerCommand command = new CreateConsumerCommand();
-        _visitor.visit(command);
-        verify(_delegate).createConsumer(command);
-    }
-
-    public void testStartTest() throws Exception
-    {
-        final StartTestCommand command = new StartTestCommand();
-        _visitor.visit(command);
-        verify(_client).startTest();
-    }
-
-    public void testStopTest() throws Exception
-    {
-        final TearDownTestCommand stopCommand = new TearDownTestCommand();
-        _visitor.visit(stopCommand);
-        verify(_client).tearDownTest();
-    }
-
-    public void testCreateMessageProvider() throws Exception
-    {
-        final CreateMessageProviderCommand command = new CreateMessageProviderCommand();
-        command.setProviderName("test");
-        _visitor.visit(command);
-        verify(_delegate).createMessageProvider(command);
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ClientTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ClientTest.java
deleted file mode 100644
index 8139961fa4..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ClientTest.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * 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.disttest.client;
-
-import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.Collections;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import org.apache.qpid.disttest.jms.ClientJmsDelegate;
-import org.apache.qpid.disttest.message.Command;
-import org.apache.qpid.disttest.message.ParticipantResult;
-import org.apache.qpid.disttest.message.Response;
-import org.apache.qpid.disttest.message.StopClientCommand;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.mockito.InOrder;
-import org.mockito.Mockito;
-
-public class ClientTest extends QpidTestCase
-{
-    private Client _client;
-    private ClientJmsDelegate _delegate;
-    private ClientCommandVisitor _visitor;
-    private ParticipantExecutor _participant;
-    private ParticipantExecutorRegistry _participantRegistry;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        _delegate = mock(ClientJmsDelegate.class);
-        _visitor = mock(ClientCommandVisitor.class);
-        _client = new Client(_delegate);
-        _client.setClientCommandVisitor(_visitor);
-        _participant = mock(ParticipantExecutor.class);
-        when(_participant.getParticipantName()).thenReturn("testParticipantMock");
-
-        _participantRegistry = mock(ParticipantExecutorRegistry.class);
-        when(_participantRegistry.executors()).thenReturn(Collections.singletonList(_participant));
-        _client.setParticipantRegistry(_participantRegistry);
-    }
-
-    public void testInitialState() throws Exception
-    {
-        assertEquals("Expected client to be in CREATED state", ClientState.CREATED, _client.getState());
-    }
-
-    public void testStart() throws Exception
-    {
-        _client.start();
-        final InOrder inOrder = inOrder(_delegate);
-        inOrder.verify(_delegate).setInstructionListener(_client);
-        inOrder.verify(_delegate).sendRegistrationMessage();
-        assertEquals("Expected client to be in STARTED state", ClientState.READY, _client.getState());
-    }
-
-    public void testStopClient() throws Exception
-    {
-        _client.stop();
-
-        assertEquals("Expected client to be in STOPPED state", ClientState.STOPPED, _client.getState());
-    }
-
-    public void testProcessInstructionVisitsCommandAndResponds() throws Exception
-    {
-        // has to be declared to be of supertype Command otherwise Mockito verify()
-        // refers to wrong method
-        final Command command = new StopClientCommand();
-        _client.processInstruction(command);
-
-        verify(_visitor).visit(command);
-        verify(_delegate).sendResponseMessage(isA(Response.class));
-    }
-
-    public void testWaitUntilStopped() throws Exception
-    {
-        stopClientLater(500);
-        _client.waitUntilStopped(1000);
-        verify(_delegate).destroy();
-    }
-
-    public void testStartTest() throws Exception
-    {
-        _client.start();
-        _client.addParticipantExecutor(_participant);
-
-        verify(_participantRegistry).add(_participant);
-
-        _client.startTest();
-
-        InOrder inOrder = Mockito.inOrder(_delegate, _participant);
-        inOrder.verify(_delegate).startConnections();
-        inOrder.verify(_participant).start(_client);
-    }
-
-    public void testTearDownTest() throws Exception
-    {
-        // before we can tear down the test the client needs to be in the "running test" state, which requires a participant
-        _client.start();
-        _client.addParticipantExecutor(_participant);
-        _client.startTest();
-
-        _client.tearDownTest();
-
-        verify(_delegate).tearDownTest();
-
-        verify(_participantRegistry).clear();
-    }
-
-    public void testResults() throws Exception
-    {
-        ParticipantResult testResult = mock(ParticipantResult.class);
-        _client.sendResults(testResult);
-        verify(_delegate).sendResponseMessage(testResult);
-    }
-
-    private void stopClientLater(long delay)
-    {
-        doLater(new TimerTask()
-        {
-            @Override
-            public void run()
-            {
-                _client.stop();
-            }
-
-        }, delay);
-    }
-
-    private void doLater(TimerTask task, long delayInMillis)
-    {
-        Timer timer = new Timer();
-        timer.schedule(task, delayInMillis);
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ConsumerParticipantTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ConsumerParticipantTest.java
deleted file mode 100644
index f75415a2bf..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ConsumerParticipantTest.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * 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.disttest.client;
-
-import static org.apache.qpid.disttest.client.ParticipantTestHelper.assertExpectedConsumerResults;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.Collection;
-
-import javax.jms.Message;
-import javax.jms.Session;
-
-import org.apache.qpid.disttest.DistributedTestException;
-import org.apache.qpid.disttest.jms.ClientJmsDelegate;
-import org.apache.qpid.disttest.message.ConsumerParticipantResult;
-import org.apache.qpid.disttest.message.CreateConsumerCommand;
-import org.apache.qpid.disttest.message.ParticipantResult;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.mockito.InOrder;
-
-public class ConsumerParticipantTest extends QpidTestCase
-{
-    private static final String SESSION_NAME1 = "SESSION1";
-    private static final String PARTICIPANT_NAME1 = "PARTICIPANT_NAME1";
-    private static final long RECEIVE_TIMEOUT = 100;
-    private static final String CLIENT_NAME = "CLIENT_NAME";
-    private static final int PAYLOAD_SIZE_PER_MESSAGE = 1024;
-
-    private final Message _mockMessage = mock(Message.class);
-    private final CreateConsumerCommand _command = new CreateConsumerCommand();
-    private ClientJmsDelegate _delegate;
-    private ConsumerParticipant _consumerParticipant;
-    private InOrder _inOrder;
-
-    /** used to check start/end time of results */
-    private long _testStartTime;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        _delegate = mock(ClientJmsDelegate.class);
-        _inOrder = inOrder(_delegate);
-
-        _command.setSessionName(SESSION_NAME1);
-        _command.setParticipantName(PARTICIPANT_NAME1);
-        _command.setSynchronous(true);
-        _command.setReceiveTimeout(RECEIVE_TIMEOUT);
-
-        _consumerParticipant = new ConsumerParticipant(_delegate, _command);
-
-        when(_delegate.consumeMessage(PARTICIPANT_NAME1, RECEIVE_TIMEOUT)).thenReturn(_mockMessage);
-        when(_delegate.calculatePayloadSizeFrom(_mockMessage)).thenReturn(PAYLOAD_SIZE_PER_MESSAGE);
-        when(_delegate.getAcknowledgeMode(SESSION_NAME1)).thenReturn(Session.CLIENT_ACKNOWLEDGE);
-
-        _testStartTime = System.currentTimeMillis();
-    }
-
-    public void testNoMessagesToReceive() throws Exception
-    {
-        _command.setNumberOfMessages(0);
-        _command.setMaximumDuration(0);
-
-        try
-        {
-            _consumerParticipant.doIt(CLIENT_NAME);
-            fail("Exception not thrown");
-        }
-        catch(DistributedTestException e)
-        {
-            // PASS
-            assertEquals("number of messages and duration cannot both be zero", e.getMessage());
-
-        }
-
-        verify(_delegate, never()).consumeMessage(anyString(), anyLong());
-    }
-
-    public void testReceiveOneMessageSynch() throws Exception
-    {
-        int numberOfMessages = 1;
-        long totalPayloadSize = PAYLOAD_SIZE_PER_MESSAGE * numberOfMessages;
-        _command.setNumberOfMessages(numberOfMessages);
-
-        ParticipantResult result = _consumerParticipant.doIt(CLIENT_NAME);
-
-        assertExpectedConsumerResults(result, PARTICIPANT_NAME1, CLIENT_NAME, _testStartTime,
-                                      Session.CLIENT_ACKNOWLEDGE, null, numberOfMessages, PAYLOAD_SIZE_PER_MESSAGE, totalPayloadSize, null);
-
-        _inOrder.verify(_delegate).consumeMessage(PARTICIPANT_NAME1, RECEIVE_TIMEOUT);
-        _inOrder.verify(_delegate).calculatePayloadSizeFrom(_mockMessage);
-        _inOrder.verify(_delegate).commitOrAcknowledgeMessageIfNecessary(SESSION_NAME1, _mockMessage);
-    }
-
-    public void testReceiveMessagesForDurationSynch() throws Exception
-    {
-        long duration = 100;
-        _command.setMaximumDuration(duration);
-
-        ParticipantResult result = _consumerParticipant.doIt(CLIENT_NAME);
-
-        assertExpectedConsumerResults(result, PARTICIPANT_NAME1, CLIENT_NAME, _testStartTime,
-                                      Session.CLIENT_ACKNOWLEDGE, null, null, PAYLOAD_SIZE_PER_MESSAGE, null, duration);
-
-        verify(_delegate, atLeastOnce()).consumeMessage(PARTICIPANT_NAME1, RECEIVE_TIMEOUT);
-        verify(_delegate, atLeastOnce()).calculatePayloadSizeFrom(_mockMessage);
-        verify(_delegate, atLeastOnce()).commitOrAcknowledgeMessageIfNecessary(SESSION_NAME1, _mockMessage);
-    }
-
-    public void testReceiveMessagesBatchedSynch() throws Exception
-    {
-        int numberOfMessages = 10;
-        final int batchSize = 3;
-        long totalPayloadSize = PAYLOAD_SIZE_PER_MESSAGE * numberOfMessages;
-        _command.setNumberOfMessages(numberOfMessages);
-        _command.setBatchSize(batchSize);
-
-        ParticipantResult result = _consumerParticipant.doIt(CLIENT_NAME);
-
-        assertExpectedConsumerResults(result, PARTICIPANT_NAME1, CLIENT_NAME, _testStartTime,
-                                      Session.CLIENT_ACKNOWLEDGE, batchSize, numberOfMessages, PAYLOAD_SIZE_PER_MESSAGE, totalPayloadSize, null);
-
-        verify(_delegate, times(numberOfMessages)).consumeMessage(PARTICIPANT_NAME1, RECEIVE_TIMEOUT);
-        verify(_delegate, times(numberOfMessages)).calculatePayloadSizeFrom(_mockMessage);
-        verify(_delegate, times(4)).commitOrAcknowledgeMessageIfNecessary(SESSION_NAME1, _mockMessage);
-    }
-
-    public void testReceiveMessagesWithVaryingPayloadSize() throws Exception
-    {
-        int numberOfMessages = 3;
-
-        int firstPayloadSize = PAYLOAD_SIZE_PER_MESSAGE;
-        int secondPayloadSize = PAYLOAD_SIZE_PER_MESSAGE * 2;
-        int thirdPayloadSize = PAYLOAD_SIZE_PER_MESSAGE * 4;
-
-        _command.setNumberOfMessages(numberOfMessages);
-
-        when(_delegate.calculatePayloadSizeFrom(_mockMessage)).thenReturn(firstPayloadSize, secondPayloadSize, thirdPayloadSize);
-
-        ParticipantResult result = _consumerParticipant.doIt(CLIENT_NAME);
-
-        final int expectedPayloadResultPayloadSize = 0;
-        final long totalPayloadSize = firstPayloadSize + secondPayloadSize + thirdPayloadSize;
-        assertExpectedConsumerResults(result, PARTICIPANT_NAME1, CLIENT_NAME, _testStartTime,
-                                      Session.CLIENT_ACKNOWLEDGE, null, numberOfMessages, expectedPayloadResultPayloadSize, totalPayloadSize, null);
-
-        verify(_delegate, times(numberOfMessages)).consumeMessage(PARTICIPANT_NAME1, RECEIVE_TIMEOUT);
-        verify(_delegate, times(numberOfMessages)).calculatePayloadSizeFrom(_mockMessage);
-        verify(_delegate, times(numberOfMessages)).commitOrAcknowledgeMessageIfNecessary(SESSION_NAME1, _mockMessage);
-    }
-
-    public void testReleaseResources()
-    {
-        _consumerParticipant.releaseResources();
-        verify(_delegate).closeTestConsumer(PARTICIPANT_NAME1);
-    }
-
-    public void testLatency() throws Exception
-    {
-        int numberOfMessages = 1;
-        long totalPayloadSize = PAYLOAD_SIZE_PER_MESSAGE * numberOfMessages;
-        _command.setNumberOfMessages(numberOfMessages);
-        _command.setEvaluateLatency(true);
-        _consumerParticipant = new ConsumerParticipant(_delegate, _command);
-        ParticipantResult result = _consumerParticipant.doIt(CLIENT_NAME);
-
-        assertExpectedConsumerResults(result, PARTICIPANT_NAME1, CLIENT_NAME, _testStartTime,
-                                      Session.CLIENT_ACKNOWLEDGE, null, numberOfMessages, PAYLOAD_SIZE_PER_MESSAGE, totalPayloadSize, null);
-
-        _inOrder.verify(_delegate).consumeMessage(PARTICIPANT_NAME1, RECEIVE_TIMEOUT);
-        _inOrder.verify(_delegate).calculatePayloadSizeFrom(_mockMessage);
-        _inOrder.verify(_delegate).commitOrAcknowledgeMessageIfNecessary(SESSION_NAME1, _mockMessage);
-        assertTrue("Unexpected consuemr results", result instanceof ConsumerParticipantResult);
-        Collection<Long> latencies = ((ConsumerParticipantResult)result).getMessageLatencies();
-        assertNotNull("Message latency is not cllected", latencies);
-        assertEquals("Unexpected message latency results", 1,  latencies.size());
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java
deleted file mode 100644
index 8863e0f289..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * 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.disttest.client;
-
-import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.jms.Message;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-import org.apache.qpid.disttest.client.property.ListPropertyValue;
-import org.apache.qpid.disttest.client.property.PropertyValue;
-import org.apache.qpid.disttest.client.property.SimplePropertyValue;
-import org.apache.qpid.disttest.message.CreateProducerCommand;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class MessageProviderTest extends QpidTestCase
-{
-    private Session _session;
-    private TextMessage _message;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        _session = mock(Session.class);
-        _message = mock(TextMessage.class);
-        when(_session.createTextMessage(isA(String.class))).thenReturn(_message);
-        when(_session.createTextMessage()).thenReturn(_message);
-    }
-
-    public void testGetMessagePayload() throws Exception
-    {
-        MessageProvider messageProvider = new MessageProvider(null)
-        {
-            @Override
-            public String getMessagePayload(CreateProducerCommand command)
-            {
-                return super.getMessagePayload(command);
-            }
-        };
-        CreateProducerCommand command = new CreateProducerCommand();
-        command.setMessageSize(100);
-        String payloadValue = messageProvider.getMessagePayload(command);
-        assertNotNull("Mesage payload should not be null", payloadValue);
-        assertEquals("Unexpected payload size", 100, payloadValue.length());
-    }
-
-    public void testNextMessage() throws Exception
-    {
-        MessageProvider messageProvider = new MessageProvider(null);
-        CreateProducerCommand command = new CreateProducerCommand();
-        command.setMessageSize(100);
-        Message message = messageProvider.nextMessage(_session, command);
-        assertNotNull("Mesage should be returned", message);
-        verify(_message, atLeastOnce()).setText(isA(String.class));
-    }
-
-    public void testNextMessageWithProperties() throws Exception
-    {
-        Map<String, PropertyValue> properties = new HashMap<String, PropertyValue>();
-        properties.put("test1", new SimplePropertyValue("testValue1"));
-        properties.put("test2", new SimplePropertyValue(new Integer(1)));
-        properties.put("priority", new SimplePropertyValue(new Integer(2)));
-        List<PropertyValue> listItems = new ArrayList<PropertyValue>();
-        listItems.add(new SimplePropertyValue(new Double(2.0)));
-        ListPropertyValue list = new ListPropertyValue();
-        list.setItems(listItems);
-        properties.put("test3", list);
-
-        MessageProvider messageProvider = new MessageProvider(properties);
-        CreateProducerCommand command = new CreateProducerCommand();
-        command.setMessageSize(100);
-        Message message = messageProvider.nextMessage(_session, command);
-        assertNotNull("Mesage should be returned", message);
-        verify(_message, atLeastOnce()).setText(isA(String.class));
-        verify(_message, atLeastOnce()).setJMSPriority(2);
-        verify(_message, atLeastOnce()).setStringProperty("test1", "testValue1");
-        verify(_message, atLeastOnce()).setIntProperty("test2", 1);
-        verify(_message, atLeastOnce()).setDoubleProperty("test3", 2.0);
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantExecutorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantExecutorTest.java
deleted file mode 100644
index 6720047cd1..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantExecutorTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * 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.disttest.client;
-
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.qpid.disttest.DistributedTestException;
-import org.apache.qpid.disttest.message.ParticipantResult;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.mockito.ArgumentMatcher;
-import org.mockito.InOrder;
-
-public class ParticipantExecutorTest extends QpidTestCase
-{
-    private static final ResultHasError HAS_ERROR = new ResultHasError();
-    private static final String CLIENT_NAME = "CLIENT_NAME";
-    private static final String PARTICIPANT_NAME = "PARTICIPANT_NAME";
-    private ParticipantExecutor _participantExecutor = null;
-    private Client _client = null;
-    private Participant _participant = null;
-    private ParticipantResult _mockResult;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-
-        _client = mock(Client.class);
-        when(_client.getClientName()).thenReturn(CLIENT_NAME);
-        _participant = mock(Participant.class);
-
-        _participantExecutor = new ParticipantExecutor(_participant);
-        _participantExecutor.setExecutor(new SynchronousExecutor());
-
-        _mockResult = mock(ParticipantResult.class);
-    }
-
-    public void testStart() throws Exception
-    {
-        when(_participant.doIt(CLIENT_NAME)).thenReturn(_mockResult);
-
-        _participantExecutor.start(_client);
-
-        InOrder inOrder = inOrder(_participant, _client);
-
-        inOrder.verify(_participant).doIt(CLIENT_NAME);
-        inOrder.verify(_participant).releaseResources();
-        inOrder.verify(_client).sendResults(_mockResult);
-    }
-
-    public void testParticipantThrowsException() throws Exception
-    {
-        when(_participant.doIt(CLIENT_NAME)).thenThrow(DistributedTestException.class);
-
-        _participantExecutor.start(_client);
-
-        InOrder inOrder = inOrder(_participant, _client);
-
-        inOrder.verify(_participant).doIt(CLIENT_NAME);
-        inOrder.verify(_participant).releaseResources();
-        inOrder.verify(_client).sendResults(argThat(HAS_ERROR));
-    }
-
-    public void testReleaseResourcesThrowsException() throws Exception
-    {
-        when(_participant.doIt(CLIENT_NAME)).thenReturn(_mockResult);
-        doThrow(DistributedTestException.class).when(_participant).releaseResources();
-
-        _participantExecutor.start(_client);
-
-        InOrder inOrder = inOrder(_participant, _client);
-
-        inOrder.verify(_participant).doIt(CLIENT_NAME);
-        inOrder.verify(_participant).releaseResources();
-
-        // check that sendResults is called even though releaseResources threw an exception
-        inOrder.verify(_client).sendResults(_mockResult);
-    }
-
-    public void testThreadNameAndDaemonness() throws Exception
-    {
-        ThreadPropertyReportingParticipant participant = new ThreadPropertyReportingParticipant(PARTICIPANT_NAME);
-        _participantExecutor = new ParticipantExecutor(participant);
-
-        _participantExecutor.start(_client);
-        participant.awaitExecution();
-
-        assertTrue("Participant should be run in a thread named after it", participant.threadWasCalled().endsWith(PARTICIPANT_NAME));
-        assertTrue("Executor should use daemon threads to avoid them preventing JVM termination", participant.wasDaemon());
-    }
-
-    private static final class ThreadPropertyReportingParticipant implements Participant
-    {
-        private final String _participantName;
-        private final CountDownLatch _participantExecuted = new CountDownLatch(1);
-        private String _threadName;
-        private boolean _daemon;
-
-        public ThreadPropertyReportingParticipant(String participantName)
-        {
-            _participantName = participantName;
-        }
-
-        public String threadWasCalled()
-        {
-            return _threadName;
-        }
-
-        public boolean wasDaemon()
-        {
-            return _daemon;
-        }
-
-        @Override
-        public void releaseResources()
-        {
-        }
-
-        @Override
-        public String getName()
-        {
-            return _participantName;
-        }
-
-        @Override
-        public ParticipantResult doIt(String registeredClientName) throws Exception
-        {
-            Thread currentThread = Thread.currentThread();
-            _threadName = currentThread.getName();
-            _daemon = currentThread.isDaemon();
-
-            _participantExecuted.countDown();
-
-            return null; // unused
-        }
-
-        public void awaitExecution()
-        {
-            boolean success = false;
-            try
-            {
-                success = _participantExecuted.await(5, TimeUnit.SECONDS);
-            }
-            catch (InterruptedException e)
-            {
-                Thread.currentThread().interrupt();
-            }
-
-            assertTrue("Participant not executed", success);
-        }
-    }
-
-    /** avoids our unit test needing to use multiple threads */
-    private final class SynchronousExecutor implements Executor
-    {
-        @Override
-        public void execute(Runnable command)
-        {
-            command.run();
-        }
-    }
-
-    private static class ResultHasError extends ArgumentMatcher<ParticipantResult>
-    {
-        @Override
-        public boolean matches(Object argument)
-        {
-            ParticipantResult result = (ParticipantResult) argument;
-            return result.hasError();
-        }
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantRegistryTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantRegistryTest.java
deleted file mode 100644
index 5cc8d2f30a..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantRegistryTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.disttest.client;
-
-import static org.mockito.Mockito.mock;
-
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ParticipantRegistryTest extends QpidTestCase
-{
-    private ParticipantExecutorRegistry _participantRegistry = new ParticipantExecutorRegistry();
-
-    private ParticipantExecutor _testParticipant1 = mock(ParticipantExecutor.class);
-    private ParticipantExecutor _testParticipant2 = mock(ParticipantExecutor.class);
-
-    public void testAdd()
-    {
-        assertTrue(_participantRegistry.executors().isEmpty());
-
-        _participantRegistry.add(_testParticipant1);
-
-        assertTrue(_participantRegistry.executors().contains(_testParticipant1));
-
-        _participantRegistry.add(_testParticipant2);
-
-        assertTrue(_participantRegistry.executors().contains(_testParticipant2));
-    }
-
-    public void testClear()
-    {
-        _participantRegistry.add(_testParticipant1);
-
-        assertEquals(1, _participantRegistry.executors().size());
-
-        _participantRegistry.clear();
-
-        assertTrue(_participantRegistry.executors().isEmpty());
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantResultFactoryTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantResultFactoryTest.java
deleted file mode 100644
index 9eab459443..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantResultFactoryTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * 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.disttest.client;
-
-import java.util.Date;
-
-import javax.jms.DeliveryMode;
-
-import org.apache.qpid.disttest.message.ConsumerParticipantResult;
-import org.apache.qpid.disttest.message.CreateConsumerCommand;
-import org.apache.qpid.disttest.message.CreateParticpantCommand;
-import org.apache.qpid.disttest.message.CreateProducerCommand;
-import org.apache.qpid.disttest.message.ParticipantResult;
-import org.apache.qpid.disttest.message.ProducerParticipantResult;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ParticipantResultFactoryTest extends QpidTestCase
-{
-    private static final String PARTICIPANT_NAME = "participantName";
-    private static final String REGISTERED_CLIENT_NAME = "registeredClientName";
-
-    private static final int BATCH_SIZE = 10;
-    private static final long MAXIMUM_DURATION = 500;
-    private static final int NUMBER_OF_MESSAGES_PROCESSED = 100;
-    private static final long TIME_TAKEN = 100;
-    private static final long TOTAL_PAYLOAD_PROCESSED = 200;
-    private static final int PAYLOAD_SIZE = 300;
-
-    private static final Date START = new Date(0);
-    private static final Date END = new Date(START.getTime() + TIME_TAKEN);
-
-    private ParticipantResultFactory _participantResultFactory;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-
-        _participantResultFactory = new ParticipantResultFactory();
-    }
-
-    public void testCreateForProducer()
-    {
-        CreateProducerCommand command = new CreateProducerCommand();
-        setCommonCommandFields(command);
-
-        long producerStartDelay = 30;
-        command.setStartDelay(producerStartDelay);
-
-        int deliveryMode = DeliveryMode.PERSISTENT;
-        command.setDeliveryMode(deliveryMode);
-
-        int priority = 5;
-        command.setPriority(priority);
-
-        long producerInterval = 50;
-        command.setInterval(producerInterval);
-
-        long timeToLive = 60;
-        command.setTimeToLive(timeToLive);
-
-        int totalNumberOfConsumers = 0;
-        int totalNumberOfProducers = 1;
-
-        int acknowledgeMode = 1;
-
-        ProducerParticipantResult result = _participantResultFactory.createForProducer(PARTICIPANT_NAME,
-                                                                                       REGISTERED_CLIENT_NAME,
-                                                                                       command,
-                                                                                       acknowledgeMode,
-                                                                                       NUMBER_OF_MESSAGES_PROCESSED,
-                                                                                       PAYLOAD_SIZE,
-                                                                                       TOTAL_PAYLOAD_PROCESSED,
-                                                                                       START, END);
-
-        assertCommonResultProperties(result);
-
-        assertEquals(deliveryMode, result.getDeliveryMode());
-        assertEquals(acknowledgeMode, result.getAcknowledgeMode());
-        assertEquals(priority, result.getPriority());
-        assertEquals(producerInterval, result.getInterval());
-        assertEquals(producerStartDelay, result.getStartDelay());
-        assertEquals(timeToLive, result.getTimeToLive());
-        assertEquals(totalNumberOfConsumers, result.getTotalNumberOfConsumers());
-        assertEquals(totalNumberOfProducers, result.getTotalNumberOfProducers());
-    }
-
-    public void testCreateForConsumer()
-    {
-        CreateConsumerCommand command = new CreateConsumerCommand();
-        setCommonCommandFields(command);
-
-        boolean topic = true;
-        command.setTopic(topic);
-
-        boolean durable = true;
-        command.setDurableSubscription(durable);
-
-        boolean browsingSubscription = false;
-        command.setBrowsingSubscription(browsingSubscription);
-
-        String selector = "selector";
-        boolean isSelector = true;
-        command.setSelector(selector);
-
-        boolean noLocal = false;
-        command.setNoLocal(noLocal);
-
-        boolean synchronousConsumer = true;
-        command.setSynchronous(synchronousConsumer);
-
-        int totalNumberOfConsumers = 1;
-        int totalNumberOfProducers = 0;
-
-        int acknowledgeMode = 2;
-
-        ConsumerParticipantResult result = _participantResultFactory.createForConsumer(PARTICIPANT_NAME,
-                                                                                       REGISTERED_CLIENT_NAME,
-                                                                                       command,
-                                                                                       acknowledgeMode,
-                                                                                       NUMBER_OF_MESSAGES_PROCESSED,
-                                                                                       PAYLOAD_SIZE,
-                                                                                       TOTAL_PAYLOAD_PROCESSED,
-                                                                                       START, END);
-
-        assertCommonResultProperties(result);
-
-        assertEquals(topic,                  result.isTopic());
-        assertEquals(durable,                result.isDurableSubscription());
-        assertEquals(browsingSubscription,   result.isBrowsingSubscription());
-        assertEquals(isSelector,             result.isSelector());
-        assertEquals(noLocal,                result.isNoLocal());
-        assertEquals(synchronousConsumer,    result.isSynchronousConsumer());
-        assertEquals(totalNumberOfConsumers, result.getTotalNumberOfConsumers());
-        assertEquals(totalNumberOfProducers, result.getTotalNumberOfProducers());
-    }
-
-    public void testCreateForError()
-    {
-        String errorMessage = "error";
-        ParticipantResult result = _participantResultFactory.createForError(PARTICIPANT_NAME, REGISTERED_CLIENT_NAME, errorMessage);
-        assertEquals(PARTICIPANT_NAME, result.getParticipantName());
-        assertEquals(REGISTERED_CLIENT_NAME, result.getRegisteredClientName());
-    }
-
-
-    private void setCommonCommandFields(CreateParticpantCommand command)
-    {
-        command.setBatchSize(BATCH_SIZE);
-        command.setMaximumDuration(MAXIMUM_DURATION);
-    }
-
-
-    private void assertCommonResultProperties(ParticipantResult result)
-    {
-        assertEquals(PARTICIPANT_NAME, result.getParticipantName());
-        assertEquals(REGISTERED_CLIENT_NAME, result.getRegisteredClientName());
-        assertEquals(BATCH_SIZE, result.getBatchSize());
-        assertEquals(MAXIMUM_DURATION, result.getMaximumDuration());
-        assertEquals(TIME_TAKEN, result.getTimeTaken());
-        assertEquals(NUMBER_OF_MESSAGES_PROCESSED, result.getNumberOfMessagesProcessed());
-        assertEquals(TOTAL_PAYLOAD_PROCESSED, result.getTotalPayloadProcessed());
-        assertEquals(PAYLOAD_SIZE, result.getPayloadSize());
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java
deleted file mode 100644
index 5508ac8aca..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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.disttest.client;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.qpid.disttest.message.ParticipantResult;
-
-public class ParticipantTestHelper
-{
-
-    public static void assertAtLeast(String message, final long minimumExpected, final long actual)
-    {
-        assertTrue(message + " " + actual, actual >= minimumExpected);
-    }
-
-    public static void assertExpectedConsumerResults(ParticipantResult result, String participantName, String registeredClientName, long expectedTestStartTime, int expectedAcknowledgeMode, Integer expectedBatchSize, Integer expectedNumberOfMessages, Integer expectedPayloadSize, Long expectedTotalPayloadProcessed, Long expectedMinimumExpectedDuration)
-    {
-        assertExpectedResults(result, participantName, registeredClientName, expectedTestStartTime,
-                expectedAcknowledgeMode, expectedBatchSize, expectedNumberOfMessages, expectedPayloadSize, expectedTotalPayloadProcessed, expectedMinimumExpectedDuration);
-        assertEquals("Unexpected number of consumers", 1, result.getTotalNumberOfConsumers());
-        assertEquals("Unexpected number of producers", 0, result.getTotalNumberOfProducers());
-    }
-
-    public static void assertExpectedProducerResults(ParticipantResult result, String participantName, String registeredClientName, long expectedTestStartTime, int expectedAcknowledgeMode, Integer expectedBatchSize, Integer expectedNumberOfMessages, Integer expectedPayloadSize, Long expectedTotalPayloadProcessed, Long expectedMinimumExpectedDuration)
-    {
-        assertExpectedResults(result, participantName, registeredClientName, expectedTestStartTime, expectedAcknowledgeMode, expectedBatchSize, expectedNumberOfMessages, expectedPayloadSize, expectedTotalPayloadProcessed, expectedMinimumExpectedDuration);
-        assertEquals("Unexpected number of producers", 1, result.getTotalNumberOfProducers());
-        assertEquals("Unexpected number of consumers", 0, result.getTotalNumberOfConsumers());
-    }
-
-    private static void assertExpectedResults(ParticipantResult result, String participantName, String registeredClientName, long expectedTestStartTime, int expectedAcknowledgeMode, Integer expectedBatchSize, Integer expectedNumberOfMessages, Integer expectedPayloadSize, Long expectedTotalPayloadProcessed, Long expectedMinimumExpectedDuration)
-    {
-        assertFalse(result.hasError());
-
-        assertEquals("unexpected participant name", participantName, result.getParticipantName());
-        assertEquals("unexpected client name", registeredClientName, result.getRegisteredClientName());
-
-        assertAtLeast("start time of result is too low", expectedTestStartTime, result.getStartInMillis());
-        assertAtLeast("end time of result should be after start time", result.getStartInMillis(), result.getEndInMillis());
-
-        assertEquals("unexpected acknowledge mode", expectedAcknowledgeMode, result.getAcknowledgeMode());
-
-        if(expectedNumberOfMessages != null)
-        {
-            assertEquals("unexpected number of messages", expectedNumberOfMessages.intValue(), result.getNumberOfMessagesProcessed());
-        }
-        if(expectedBatchSize != null)
-        {
-            assertEquals("unexpected batch size", expectedBatchSize.intValue(), result.getBatchSize());
-        }
-        if (expectedPayloadSize != null)
-        {
-            assertEquals("unexpected payload size", expectedPayloadSize.intValue(), result.getPayloadSize());
-        }
-        if (expectedTotalPayloadProcessed != null)
-        {
-            assertEquals("unexpected total payload processed", expectedTotalPayloadProcessed.longValue(), result.getTotalPayloadProcessed());
-        }
-        if(expectedMinimumExpectedDuration != null)
-        {
-            assertAtLeast("participant did not take a sufficient length of time.", expectedMinimumExpectedDuration, result.getTimeTaken());
-        }
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java
deleted file mode 100644
index 08ee8715fd..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * 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.disttest.client;
-
-import static org.apache.qpid.disttest.client.ParticipantTestHelper.assertExpectedProducerResults;
-import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import javax.jms.DeliveryMode;
-import javax.jms.Message;
-import javax.jms.Session;
-
-import org.apache.qpid.disttest.DistributedTestException;
-import org.apache.qpid.disttest.jms.ClientJmsDelegate;
-import org.apache.qpid.disttest.message.CreateProducerCommand;
-import org.apache.qpid.disttest.message.ParticipantResult;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.mockito.InOrder;
-
-public class ProducerParticipantTest extends QpidTestCase
-{
-    private ProducerParticipant _producer;
-
-    private static final String SESSION_NAME1 = "SESSION1";
-    private static final String PARTICIPANT_NAME1 = "PARTICIPANT_NAME1";
-
-    private static final String CLIENT_NAME = "CLIENT_NAME";
-    private static final int PAYLOAD_SIZE_PER_MESSAGE = 1024;
-
-
-    private final Message _mockMessage = mock(Message.class);
-    private final CreateProducerCommand _command = new CreateProducerCommand();
-    private ClientJmsDelegate _delegate;
-    private InOrder _inOrder;
-
-    /** used to check start/end time of results */
-    private long _testStartTime;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        _delegate = mock(ClientJmsDelegate.class);
-        _inOrder = inOrder(_delegate);
-
-        _command.setSessionName(SESSION_NAME1);
-        _command.setParticipantName(PARTICIPANT_NAME1);
-
-        when(_delegate.sendNextMessage(isA(CreateProducerCommand.class))).thenReturn(_mockMessage);
-        when(_delegate.calculatePayloadSizeFrom(_mockMessage)).thenReturn(PAYLOAD_SIZE_PER_MESSAGE);
-        when(_delegate.getAcknowledgeMode(SESSION_NAME1)).thenReturn(Session.AUTO_ACKNOWLEDGE);
-
-        _producer = new ProducerParticipant(_delegate, _command);
-
-        _testStartTime = System.currentTimeMillis();
-    }
-
-    public void testStartDelay() throws Exception
-    {
-        final long delay = 100;
-        int numberOfMessages = 1;
-        long totalPayloadSize = PAYLOAD_SIZE_PER_MESSAGE * numberOfMessages;
-
-        _command.setStartDelay(delay);
-        _command.setNumberOfMessages(numberOfMessages);
-
-        ParticipantResult result = _producer.doIt(CLIENT_NAME);
-
-        long expectedPublishedStartTime = _testStartTime + delay;
-        assertExpectedProducerResults(result, PARTICIPANT_NAME1, CLIENT_NAME, expectedPublishedStartTime, Session.AUTO_ACKNOWLEDGE, null, numberOfMessages, PAYLOAD_SIZE_PER_MESSAGE, totalPayloadSize, null);
-    }
-
-
-    public void testNoMessagesToSend() throws Exception
-    {
-        _command.setNumberOfMessages(0);
-        _command.setMaximumDuration(0);
-
-        try
-        {
-            _producer.doIt(CLIENT_NAME);
-            fail("Exception not thrown");
-        }
-        catch (DistributedTestException e)
-        {
-            // PASS
-            assertEquals("number of messages and duration cannot both be zero", e.getMessage());
-        }
-    }
-
-    public void testOneMessageToSend()  throws Exception
-    {
-        int batchSize = 1;
-        int numberOfMessages = 1;
-        long totalPayloadSize = PAYLOAD_SIZE_PER_MESSAGE * numberOfMessages;
-        int deliveryMode = DeliveryMode.PERSISTENT;
-
-        _command.setNumberOfMessages(numberOfMessages);
-        _command.setBatchSize(batchSize);
-        _command.setDeliveryMode(deliveryMode);
-
-        ParticipantResult result = _producer.doIt(CLIENT_NAME);
-        assertExpectedProducerResults(result, PARTICIPANT_NAME1, CLIENT_NAME, _testStartTime,
-                                      Session.AUTO_ACKNOWLEDGE, null, numberOfMessages, PAYLOAD_SIZE_PER_MESSAGE, totalPayloadSize, null);
-
-        _inOrder.verify(_delegate).sendNextMessage(isA(CreateProducerCommand.class));
-        _inOrder.verify(_delegate).calculatePayloadSizeFrom(_mockMessage);
-        _inOrder.verify(_delegate).commitIfNecessary(SESSION_NAME1);
-
-    }
-
-    public void testSendMessagesForDuration() throws Exception
-    {
-        final long duration = 1000;
-        _command.setMaximumDuration(duration);
-
-        ParticipantResult result = _producer.doIt(CLIENT_NAME);
-        assertExpectedProducerResults(result, PARTICIPANT_NAME1, CLIENT_NAME, _testStartTime,
-                                      Session.AUTO_ACKNOWLEDGE, null, null, PAYLOAD_SIZE_PER_MESSAGE, null, duration);
-
-        verify(_delegate, atLeastOnce()).sendNextMessage(isA(CreateProducerCommand.class));
-        verify(_delegate, atLeastOnce()).calculatePayloadSizeFrom(_mockMessage);
-        verify(_delegate, atLeastOnce()).commitIfNecessary(SESSION_NAME1);
-    }
-
-    public void testSendMessagesForDurationWithDelayExceedingDuration() throws Exception
-    {
-        final long duration = 100;
-        _command.setMaximumDuration(duration);
-        _command.setStartDelay(150);
-
-        try
-        {
-            _producer.doIt(CLIENT_NAME);
-            fail("Exception should be thrown indicating configuration error");
-        }
-        catch(DistributedTestException e)
-        {
-            assertEquals("Start delay must be less than maximum test duration", e.getMessage());
-        }
-    }
-
-    public void testSendMessageBatches() throws Exception
-    {
-        final int batchSize = 3;
-        final int numberOfMessages = 10;
-        final int expectedNumberOfCommits = 4; // one for each batch of 3 messages, plus one more at the end of the test for the tenth msg.
-        long totalPayloadSize = PAYLOAD_SIZE_PER_MESSAGE * numberOfMessages;
-
-        _command.setNumberOfMessages(numberOfMessages);
-        _command.setBatchSize(batchSize);
-
-        ParticipantResult result = _producer.doIt(CLIENT_NAME);
-        assertExpectedProducerResults(result, PARTICIPANT_NAME1, CLIENT_NAME, _testStartTime,
-                                      Session.AUTO_ACKNOWLEDGE, batchSize, numberOfMessages, PAYLOAD_SIZE_PER_MESSAGE, totalPayloadSize, null);
-
-        verify(_delegate, times(numberOfMessages)).sendNextMessage(isA(CreateProducerCommand.class));
-        verify(_delegate, times(numberOfMessages)).calculatePayloadSizeFrom(_mockMessage);
-        verify(_delegate, times(expectedNumberOfCommits)).commitIfNecessary(SESSION_NAME1);
-    }
-
-    public void testSendMessageWithPublishInterval() throws Exception
-    {
-        final int batchSize = 3;
-        final long publishInterval = 100;
-        int numberOfMessages = 10;
-        long totalPayloadSize = PAYLOAD_SIZE_PER_MESSAGE * numberOfMessages;
-
-        final long expectedTimeToRunTest = batchSize * publishInterval;
-
-        _command.setNumberOfMessages(numberOfMessages);
-        _command.setBatchSize(batchSize);
-        _command.setInterval(publishInterval);
-
-        ParticipantResult result = _producer.doIt(CLIENT_NAME);
-        assertExpectedProducerResults(result, PARTICIPANT_NAME1, CLIENT_NAME, _testStartTime,
-                                      Session.AUTO_ACKNOWLEDGE, null, numberOfMessages, null, totalPayloadSize, expectedTimeToRunTest);
-
-        verify(_delegate, times(numberOfMessages)).sendNextMessage(isA(CreateProducerCommand.class));
-        verify(_delegate, times(numberOfMessages)).calculatePayloadSizeFrom(_mockMessage);
-        verify(_delegate, times(4)).commitIfNecessary(SESSION_NAME1);
-    }
-
-    public void testSendMessageWithVaryingPayloadSize() throws Exception
-    {
-        int numberOfMessages = 3;
-
-        int firstPayloadSize = PAYLOAD_SIZE_PER_MESSAGE;
-        int secondPayloadSize = PAYLOAD_SIZE_PER_MESSAGE * 2;
-        int thirdPayloadSize = PAYLOAD_SIZE_PER_MESSAGE * 4;
-
-        final long totalPayloadSize = firstPayloadSize + secondPayloadSize + thirdPayloadSize;
-
-        when(_delegate.calculatePayloadSizeFrom(_mockMessage)).thenReturn(firstPayloadSize, secondPayloadSize, thirdPayloadSize);
-
-        _command.setNumberOfMessages(numberOfMessages);
-
-        ParticipantResult result = _producer.doIt(CLIENT_NAME);
-
-        final int expectedPayloadResultPayloadSize = 0;
-        assertExpectedProducerResults(result, PARTICIPANT_NAME1, CLIENT_NAME, _testStartTime,
-                                      Session.AUTO_ACKNOWLEDGE, null, numberOfMessages, expectedPayloadResultPayloadSize, totalPayloadSize, null);
-
-        verify(_delegate, times(numberOfMessages)).sendNextMessage(isA(CreateProducerCommand.class));
-        verify(_delegate, times(numberOfMessages)).calculatePayloadSizeFrom(_mockMessage);
-        verify(_delegate, times(numberOfMessages)).commitIfNecessary(SESSION_NAME1);
-    }
-
-    public void testReleaseResources()
-    {
-        _producer.releaseResources();
-        verify(_delegate).closeTestProducer(PARTICIPANT_NAME1);
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java
deleted file mode 100644
index 3172eb07ed..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * 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.disttest.client.property;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ListPropertyValueTest extends QpidTestCase
-{
-    private ListPropertyValue _generator;
-    private List<PropertyValue> _items;
-
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-        _generator = new ListPropertyValue();
-        _items = new ArrayList<PropertyValue>();
-        _items.add(new SimplePropertyValue(new Integer(1)));
-        _items.add(new SimplePropertyValue(new Double(2.1)));
-        _items.add(new SimplePropertyValue(new Boolean(true)));
-        ListPropertyValue innerList = new ListPropertyValue();
-        List<PropertyValue> innerListItems = new ArrayList<PropertyValue>();
-        innerListItems.add(new SimplePropertyValue("test"));
-        innerListItems.add(new SimplePropertyValue(new Integer(2)));
-        innerList.setItems(innerListItems);
-        _items.add(innerList);
-        _generator.setItems(_items);
-    }
-
-    public void testGetItems()
-    {
-        List<? extends Object> items = _generator.getItems();
-        assertEquals("Unexpected list items", _items, items);
-    }
-
-    public void testGetValue()
-    {
-        for (int i = 0; i < 2; i++)
-        {
-            assertEquals("Unexpected first item", new Integer(1), _generator.getValue());
-            assertEquals("Unexpected second item", new Double(2.1), _generator.getValue());
-            assertEquals("Unexpected third item", new Boolean(true), _generator.getValue());
-            if (i == 0)
-            {
-                assertEquals("Unexpected forth item", "test", _generator.getValue());
-            }
-            else
-            {
-                assertEquals("Unexpected forth item", new Integer(2), _generator.getValue());
-            }
-        }
-    }
-
-    public void testNonCyclicGetValue()
-    {
-        _generator.setCyclic(false);
-        assertFalse("Generator should not be cyclic", _generator.isCyclic());
-        assertEquals("Unexpected first item", new Integer(1), _generator.getValue());
-        assertEquals("Unexpected second item", new Double(2.1), _generator.getValue());
-        assertEquals("Unexpected third item", new Boolean(true), _generator.getValue());
-        assertEquals("Unexpected forth item", "test", _generator.getValue());
-        assertEquals("Unexpected fifth item", new Integer(2), _generator.getValue());
-        assertEquals("Unexpected sixs item", "test", _generator.getValue());
-        assertEquals("Unexpected sevens item", new Integer(2), _generator.getValue());
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java
deleted file mode 100644
index eba1bcc435..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/PropertyValueFactoryTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.disttest.client.property;
-
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class PropertyValueFactoryTest extends QpidTestCase
-{
-    private PropertyValueFactory _factory;
-
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-        _factory = new PropertyValueFactory();
-    }
-
-    public void testCreateListPropertyValue()
-    {
-        PropertyValue propertyValue = _factory.createPropertyValue("list");
-        assertNotNull("List generator is not created", propertyValue);
-        assertTrue("Unexpected type of list generator", propertyValue instanceof ListPropertyValue);
-    }
-
-    public void testCreateRangePropertyValue()
-    {
-        PropertyValue propertyValue = _factory.createPropertyValue("range");
-        assertNotNull("Range generator is not created", propertyValue);
-        assertTrue("Unexpected type of range generator", propertyValue instanceof RangePropertyValue);
-    }
-
-    public void testCreateRandomPropertyValue()
-    {
-        PropertyValue propertyValue = _factory.createPropertyValue("random");
-        assertNotNull("Random generator is not created", propertyValue);
-        assertTrue("Unexpected type of range generator", propertyValue instanceof RandomPropertyValue);
-    }
-
-    public void testCreateSimplePropertyValue()
-    {
-        PropertyValue propertyValue = _factory.createPropertyValue("simple");
-        assertNotNull("Simple property value is not created", propertyValue);
-        assertTrue("Unexpected type of property value", propertyValue instanceof SimplePropertyValue);
-    }
-
-    public void testCreateNonExistingPropertyValue()
-    {
-        try
-        {
-            _factory.createPropertyValue("nonExisting");
-            fail("Non existing property value should not be created");
-        }
-        catch (Exception e)
-        {
-            // pass
-        }
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java
deleted file mode 100644
index 9651dd95ce..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.disttest.client.property;
-
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class RandomPropertyValueTest extends QpidTestCase
-{
-    private RandomPropertyValue _generator;
-
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-        _generator = new RandomPropertyValue();
-        _generator.setUpper(20.0);
-        _generator.setLower(10.0);
-        _generator.setType("double");
-    }
-
-    public void testGetters()
-    {
-        assertEquals("Unexpected upper boundary", new Double(20.0), _generator.getUpper());
-        assertEquals("Unexpected lower boundary", new Double(10.0), _generator.getLower());
-        assertEquals("Unexpected type", "double", _generator.getType());
-    }
-
-    public void testGetValue()
-    {
-        Object value = _generator.getValue();
-        assertTrue("Unexpected type", value instanceof Double);
-        assertTrue("Unexpected value", ((Double) value).doubleValue() >= 10.0
-                && ((Double) value).doubleValue() <= 20.0);
-    }
-
-    public void testGetValueInt()
-    {
-        _generator.setType("int");
-        Object value = _generator.getValue();
-        assertTrue("Unexpected type", value instanceof Integer);
-        assertTrue("Unexpected value", ((Integer) value).intValue() >= 10 && ((Integer) value).intValue() <= 20);
-    }
-
-    public void testGetValueLong()
-    {
-        _generator.setType("long");
-        Object value = _generator.getValue();
-        assertTrue("Unexpected type", value instanceof Long);
-        assertTrue("Unexpected value", ((Long) value).longValue() >= 10 && ((Long) value).longValue() <= 20);
-    }
-
-    public void testGetValueFloat()
-    {
-        _generator.setType("float");
-        Object value = _generator.getValue();
-        assertTrue("Unexpected type", value instanceof Float);
-        assertTrue("Unexpected value", ((Float) value).floatValue() >= 10.0 && ((Float) value).floatValue() <= 20.0);
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java
deleted file mode 100644
index b0649a49ae..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * 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.disttest.client.property;
-
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class RangePropertyValueTest extends QpidTestCase
-{
-    private RangePropertyValue _generator;
-
-    @Override
-    public void setUp() throws Exception
-    {
-        super.setUp();
-        _generator = new RangePropertyValue();
-        _generator.setUpper(10.0);
-        _generator.setLower(0.0);
-        _generator.setStep(2.0);
-        _generator.setType("double");
-    }
-
-    public void testGetters()
-    {
-        assertEquals("Unexpected upper boundary", new Double(10.0), _generator.getUpper());
-        assertEquals("Unexpected lower boundary", new Double(0.0), _generator.getLower());
-        assertEquals("Unexpected step", new Double(2.0), _generator.getStep());
-        assertEquals("Unexpected type", "double", _generator.getType());
-        assertTrue("Unexpected cyclic", _generator.isCyclic());
-    }
-
-    public void testGetValue()
-    {
-        double[] expected = { 0.0, 2.0, 4.0, 6.0, 8.0, 10.0 };
-        for (int j = 0; j < 2; j++)
-        {
-            for (int i = 0; i < expected.length; i++)
-            {
-                Object value = _generator.getValue();
-                assertTrue("Should be Double", value instanceof Double);
-                assertEquals("Unexpected value ", expected[i], value);
-            }
-        }
-    }
-
-    public void testGetValueNonCyclic()
-    {
-        _generator.setCyclic(false);
-        double[] expected = { 0.0, 2.0, 4.0, 6.0, 8.0, 10.0 };
-        for (int i = 0; i < expected.length; i++)
-        {
-            Object value = _generator.getValue();
-            assertTrue("Should be Double", value instanceof Double);
-            assertEquals("Unexpected value ", expected[i], value);
-        }
-        for (int i = 0; i < expected.length; i++)
-        {
-            Object value = _generator.getValue();
-            assertEquals("Unexpected value ", expected[expected.length - 1], value);
-        }
-    }
-
-    public void testGetValueInt()
-    {
-        _generator.setType("int");
-        int[] expected = { 0, 2, 4, 6, 8, 10 };
-        for (int j = 0; j < 2; j++)
-        {
-            for (int i = 0; i < expected.length; i++)
-            {
-                Object value = _generator.getValue();
-                assertTrue("Should be Double", value instanceof Integer);
-                assertEquals("Unexpected value ", expected[i], value);
-            }
-        }
-    }
-
-    public void testGetValueByte()
-    {
-        _generator.setType("byte");
-        byte[] expected = { 0, 2, 4, 6, 8, 10 };
-        for (int j = 0; j < 2; j++)
-        {
-            for (int i = 0; i < expected.length; i++)
-            {
-                Object value = _generator.getValue();
-                assertTrue("Should be Double", value instanceof Byte);
-                assertEquals("Unexpected value ", expected[i], value);
-            }
-        }
-    }
-
-    public void testGetValueLong()
-    {
-        _generator.setType("long");
-        long[] expected = { 0, 2, 4, 6, 8, 10 };
-        for (int j = 0; j < 2; j++)
-        {
-            for (int i = 0; i < expected.length; i++)
-            {
-                Object value = _generator.getValue();
-                assertTrue("Should be Double", value instanceof Long);
-                assertEquals("Unexpected value ", expected[i], value);
-            }
-        }
-    }
-
-    public void testGetValueShort()
-    {
-        _generator.setType("short");
-        short[] expected = { 0, 2, 4, 6, 8, 10 };
-        for (int j = 0; j < 2; j++)
-        {
-            for (int i = 0; i < expected.length; i++)
-            {
-                Object value = _generator.getValue();
-                assertTrue("Should be Double", value instanceof Short);
-                assertEquals("Unexpected value ", expected[i], value);
-            }
-        }
-    }
-
-    public void testGetValueFloat()
-    {
-        _generator.setType("float");
-        float[] expected = { 0.0f, 2.0f, 4.0f, 6.0f, 8.0f, 10.0f };
-        for (int j = 0; j < 2; j++)
-        {
-            for (int i = 0; i < expected.length; i++)
-            {
-                Object value = _generator.getValue();
-                assertTrue("Should be Double", value instanceof Float);
-                assertEquals("Unexpected value ", expected[i], value);
-            }
-        }
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/SimplePropertyValueTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/SimplePropertyValueTest.java
deleted file mode 100644
index f1977015fe..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/property/SimplePropertyValueTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.disttest.client.property;
-
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class SimplePropertyValueTest extends QpidTestCase
-{
-    public void testGetValue()
-    {
-        SimplePropertyValue value = new SimplePropertyValue(new Integer(1));
-        assertEquals("Unexpected value", new Integer(1), value.getValue());
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimitsTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimitsTest.java
deleted file mode 100644
index 0880512333..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimitsTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.disttest.client.utils;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.concurrent.Callable;
-
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ExecutorWithNoLimitsTest extends QpidTestCase
-{
-    private final static Object RESULT = new Object();
-
-    private ExecutorWithLimits _limiter = new ExecutorWithNoLimits();
-    @SuppressWarnings("unchecked")
-    private Callable<Object> _callback = mock(Callable.class);
-
-    public void testNormalExecution() throws Exception
-    {
-        when(_callback.call()).thenReturn(RESULT);
-        final Object actualResult = _limiter.execute(_callback);
-        verify(_callback).call();
-        assertEquals(RESULT, actualResult);
-    }
-
-    public void testCallableThrowsException() throws Exception
-    {
-        when(_callback.call()).thenThrow(new Exception("mocked exception"));
-
-        try
-        {
-            _limiter.execute(_callback);
-            fail("Exception not thrown");
-        }
-        catch (Exception e)
-        {
-            // PASS
-        }
-        verify(_callback).call();
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimitTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimitTest.java
deleted file mode 100644
index 2abdba2446..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimitTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * 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.disttest.client.utils;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.CancellationException;
-
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ExecutorWithTimeLimitTest extends QpidTestCase
-{
-    private static final int TIMEOUT = 500;
-    private static final Object RESULT = new Object();
-
-    private ExecutorWithLimits _limiter;
-    @SuppressWarnings("unchecked")
-    private Callable<Object> _callback = mock(Callable.class);
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        _limiter = new ExecutorWithTimeLimit(System.currentTimeMillis(), TIMEOUT);
-    }
-
-    @Override
-    protected void tearDown() throws Exception
-    {
-        super.tearDown();
-        if (_limiter != null)
-        {
-            _limiter.shutdown();
-        }
-    }
-
-    public void testCallableCompletesNormally() throws Exception
-    {
-        when(_callback.call()).thenReturn(RESULT);
-
-        final Object actualResult = _limiter.execute(_callback);
-
-        verify(_callback).call();
-        assertEquals(RESULT, actualResult);
-    }
-
-    public void testCallableThrowsException() throws Exception
-    {
-        when(_callback.call()).thenThrow(new Exception("mocked exception"));
-
-        try
-        {
-            _limiter.execute(_callback);
-            fail("Exception not thrown");
-        }
-        catch (CancellationException ce)
-        {
-            fail("Wrong exception thrown");
-        }
-        catch (Exception e)
-        {
-            // PASS
-        }
-        verify(_callback).call();
-    }
-
-    public void testCallableNotRunDueToInsufficentTimeRemaining() throws Exception
-    {
-        long now = System.currentTimeMillis();
-        ExecutorWithLimits shortTimeLimiter = new ExecutorWithTimeLimit(now - 100, 100);
-        try
-        {
-            shortTimeLimiter.execute(_callback);
-            fail("Exception not thrown");
-        }
-        catch (CancellationException ca)
-        {
-            // PASS
-        }
-        finally
-        {
-            shortTimeLimiter.shutdown();
-        }
-
-        verify(_callback, never()).call();
-    }
-
-    public void testExecutionInterruptedByTimeout() throws Exception
-    {
-        Callable<Void> oversleepingCallback = new Callable<Void>()
-        {
-            @Override
-            public Void call() throws Exception
-            {
-                Thread.sleep(TIMEOUT * 2);
-                return null;
-            }
-        };
-
-        try
-        {
-            _limiter.execute(oversleepingCallback);
-            fail("Exception not thrown");
-        }
-        catch (CancellationException ca)
-        {
-            // PASS
-        }
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java
deleted file mode 100644
index c07d9fcb81..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * 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.disttest.controller;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-import org.apache.qpid.disttest.DistributedTestException;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ClientRegistryTest extends QpidTestCase
-{
-    private static final String CLIENT1_REGISTERED_NAME = "CLIENT1_REGISTERED_NAME";
-    private static final String CLIENT2_REGISTERED_NAME = "CLIENT2_REGISTERED_NAME";
-    private static final String CLIENT3_REGISTERED_NAME = "CLIENT3_REGISTERED_NAME";
-
-    private static final int AWAIT_DELAY = 100;
-
-    private ClientRegistry _clientRegistry = new ClientRegistry();
-
-    public void testRegisterClient()
-    {
-        assertEquals(0, _clientRegistry.getClients().size());
-
-        _clientRegistry.registerClient(CLIENT1_REGISTERED_NAME);
-        assertEquals(1, _clientRegistry.getClients().size());
-
-    }
-
-    public void testRejectsDuplicateClientNames()
-    {
-        _clientRegistry.registerClient(CLIENT1_REGISTERED_NAME);
-        try
-        {
-            _clientRegistry.registerClient(CLIENT1_REGISTERED_NAME);
-            fail("Should have thrown an exception");
-        }
-        catch (final DistributedTestException e)
-        {
-            // pass
-        }
-    }
-
-    public void testAwaitOneClientWhenClientNotRegistered()
-    {
-        int numberOfClientsAbsent = _clientRegistry.awaitClients(1, AWAIT_DELAY);
-        assertEquals(1, numberOfClientsAbsent);
-    }
-
-    public void testAwaitOneClientWhenClientAlreadyRegistered()
-    {
-        _clientRegistry.registerClient(CLIENT1_REGISTERED_NAME);
-
-        int numberOfClientsAbsent = _clientRegistry.awaitClients(1, AWAIT_DELAY);
-        assertEquals(0, numberOfClientsAbsent);
-    }
-
-    public void testAwaitTwoClientsWhenClientRegistersWhilstWaiting()
-    {
-        _clientRegistry.registerClient(CLIENT1_REGISTERED_NAME);
-        registerClientLater(CLIENT2_REGISTERED_NAME, 50);
-
-        int numberOfClientsAbsent = _clientRegistry.awaitClients(2, AWAIT_DELAY);
-        assertEquals(0, numberOfClientsAbsent);
-    }
-
-    public void testAwaitTimeoutForPromptRegistrations()
-    {
-        registerClientsLaterAndAssertResult("Clients registering every 100ms should be within 600ms timeout",
-                new int[] {300, 400, 500},
-                600,
-                0);
-    }
-
-    public void testAwaitTimeoutForWhenThirdRegistrationIsLate()
-    {
-        registerClientsLaterAndAssertResult("Third client registering tardily should exceed timeout",
-                new int[] {300, 400, 1500},
-                600,
-                1);
-    }
-
-    public void testAwaitTimeoutWhenSecondAndThirdRegistrationsAreLate()
-    {
-        registerClientsLaterAndAssertResult("Second and third clients registering tardily should exceed timeout",
-                new int[] {300, 1500, 1500},
-                600,
-                2);
-    }
-
-    private void registerClientsLaterAndAssertResult(String message, int[] registrationDelays, int timeout, int expectedNumberOfAbsentees)
-    {
-        registerClientLater(CLIENT1_REGISTERED_NAME, registrationDelays[0]);
-        registerClientLater(CLIENT2_REGISTERED_NAME, registrationDelays[1]);
-        registerClientLater(CLIENT3_REGISTERED_NAME, registrationDelays[2]);
-
-        int numberOfClientsAbsent = _clientRegistry.awaitClients(3, timeout);
-
-        assertEquals(message, expectedNumberOfAbsentees, numberOfClientsAbsent);
-    }
-
-    private void registerClientLater(final String clientName, long delayInMillis)
-    {
-        doLater(new TimerTask()
-        {
-            @Override
-            public void run()
-            {
-                _clientRegistry.registerClient(clientName);
-            }
-        }, delayInMillis);
-    }
-
-    private void doLater(TimerTask task, long delayInMillis)
-    {
-        Timer timer = new Timer();
-        timer.schedule(task, delayInMillis);
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java
deleted file mode 100644
index e482268ab2..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * 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.disttest.controller;
-
-import static org.apache.qpid.disttest.PerfTestConstants.COMMAND_RESPONSE_TIMEOUT;
-import static org.apache.qpid.disttest.PerfTestConstants.REGISTRATION_TIMEOUT;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.qpid.disttest.DistributedTestException;
-import org.apache.qpid.disttest.controller.config.Config;
-import org.apache.qpid.disttest.controller.config.TestInstance;
-import org.apache.qpid.disttest.jms.ControllerJmsDelegate;
-import org.apache.qpid.disttest.message.Command;
-import org.apache.qpid.disttest.message.RegisterClientCommand;
-import org.apache.qpid.disttest.message.Response;
-import org.apache.qpid.disttest.message.StopClientCommand;
-import org.apache.qpid.disttest.results.aggregation.ITestResult;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-public class ControllerTest extends QpidTestCase
-{
-    private static final String CLIENT1_REGISTERED_NAME = "client-uid1";
-
-    private Controller _controller;
-    private ControllerJmsDelegate _respondingJmsDelegate;
-    private TestRunner _testRunner;
-    private ClientRegistry _clientRegistry;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        _respondingJmsDelegate = mock(ControllerJmsDelegate.class);
-        _controller = new Controller(_respondingJmsDelegate, REGISTRATION_TIMEOUT, COMMAND_RESPONSE_TIMEOUT);
-        _testRunner = mock(TestRunner.class);
-        _clientRegistry = mock(ClientRegistry.class);
-
-        Config configWithOneClient = createMockConfig(1);
-        _controller.setConfig(configWithOneClient);
-        _controller.setClientRegistry(_clientRegistry);
-        _controller.setTestRunnerFactory(createTestFactoryReturningMock());
-
-        doAnswer(new Answer<Void>()
-        {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable
-            {
-                final String clientName = (String)invocation.getArguments()[0];
-                final Command command = (Command)invocation.getArguments()[1];
-                _controller.processStopClientResponse(new Response(clientName, command.getType()));
-                return null;
-            }
-        }).when(_respondingJmsDelegate).sendCommandToClient(anyString(), isA(Command.class));
-    }
-
-
-    public void testControllerRejectsEmptyConfiguration()
-    {
-        Config configWithZeroClients = createMockConfig(0);
-
-        try
-        {
-            _controller.setConfig(configWithZeroClients);
-            fail("Exception not thrown");
-        }
-        catch (DistributedTestException e)
-        {
-            // PASS
-        }
-    }
-
-    public void testControllerReceivesTwoExpectedClientRegistrations()
-    {
-        Config configWithTwoClients = createMockConfig(2);
-        _controller.setConfig(configWithTwoClients);
-        when(_clientRegistry.awaitClients(2, REGISTRATION_TIMEOUT)).thenReturn(0);
-
-        _controller.awaitClientRegistrations();
-    }
-
-    public void testControllerDoesntReceiveAnyRegistrations()
-    {
-        when(_clientRegistry.awaitClients(1, REGISTRATION_TIMEOUT)).thenReturn(1);
-
-        try
-        {
-            _controller.awaitClientRegistrations();
-            fail("Exception not thrown");
-        }
-        catch (DistributedTestException e)
-        {
-            // PASS
-        }
-    }
-
-    public void testRegisterClient()
-    {
-        RegisterClientCommand command = new RegisterClientCommand(CLIENT1_REGISTERED_NAME, "dummy");
-        _controller.registerClient(command);
-
-        verify(_clientRegistry).registerClient(CLIENT1_REGISTERED_NAME);
-        verify(_respondingJmsDelegate).registerClient(command);
-
-    }
-
-    public void testControllerSendsClientStopCommandToClient()
-    {
-        when(_clientRegistry.getClients()).thenReturn(Collections.singleton(CLIENT1_REGISTERED_NAME));
-
-        _controller.stopAllRegisteredClients();
-
-        verify(_respondingJmsDelegate).sendCommandToClient(eq(CLIENT1_REGISTERED_NAME), isA(StopClientCommand.class));
-    }
-
-    public void testRunAllTests()
-    {
-        Config config = createSimpleConfig();
-        _controller.setConfig(config);
-
-        TestResult testResult = new TestResult("test1");
-
-        when(_testRunner.run()).thenReturn(testResult);
-
-        ResultsForAllTests results = _controller.runAllTests();
-
-        List<ITestResult> testResults = results.getTestResults();
-        assertEquals(1, testResults.size());
-        assertSame(testResult, testResults.get(0));
-
-        verify(_testRunner).run();
-    }
-
-    private Config createSimpleConfig()
-    {
-        Config config = mock(Config.class);
-        TestInstance testInstance = mock(TestInstance.class);
-
-        List<TestInstance> testInstances = Arrays.asList(testInstance);
-
-        when(config.getTests()).thenReturn(testInstances);
-        when(config.getTotalNumberOfClients()).thenReturn(1); // necessary otherwise controller rejects "invalid" config
-
-        return config;
-    }
-
-    private Config createMockConfig(int numberOfClients)
-    {
-        Config config = mock(Config.class);
-        when(config.getTotalNumberOfClients()).thenReturn(numberOfClients);
-        return config;
-    }
-
-    private TestRunnerFactory createTestFactoryReturningMock()
-    {
-        TestRunnerFactory testRunnerFactory = mock(TestRunnerFactory.class);
-
-        when(testRunnerFactory.createTestRunner(
-                isA(ParticipatingClients.class),
-                isA(TestInstance.class),
-                isA(ControllerJmsDelegate.class),
-                isA(Long.class),
-                isA(Long.class)))
-                .thenReturn(_testRunner);
-
-        return testRunnerFactory;
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ParticipatingClientsTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ParticipatingClientsTest.java
deleted file mode 100644
index da180f328f..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ParticipatingClientsTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * 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.disttest.controller;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ParticipatingClientsTest extends QpidTestCase
-{
-    private static final String CLIENT1_CONFIGURED_NAME = "CLIENT1_CONFIGURED_NAME";
-    private static final String CLIENT2_CONFIGURED_NAME = "CLIENT2_CONFIGURED_NAME";
-
-    private static final String CLIENT1_REGISTERED_NAME = "CLIENT1_REGISTERED_NAME";
-    private static final String CLIENT2_REGISTERED_NAME = "CLIENT2_REGISTERED_NAME";
-    private static final String CLIENT3_REGISTERED_NAME = "CLIENT3_REGISTERED_NAME";
-    private ClientRegistry _clientRegistry;
-    private List<String> _configuredClientNamesForTest;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        _clientRegistry = mock(ClientRegistry.class);
-    }
-
-    public void testTooFewRegisteredClientsForTest()
-    {
-        _configuredClientNamesForTest = Arrays.asList(CLIENT1_CONFIGURED_NAME, CLIENT2_CONFIGURED_NAME);
-        when(_clientRegistry.getClients()).thenReturn(Arrays.asList(CLIENT1_REGISTERED_NAME));
-
-        try
-        {
-            new ParticipatingClients(_clientRegistry, _configuredClientNamesForTest);
-            fail("Exception not thrown");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // PASS
-        }
-
-    }
-
-
-    public void testSelectOneClientFromPoolOfOne()
-    {
-        _configuredClientNamesForTest = Arrays.asList(CLIENT1_CONFIGURED_NAME);
-        when(_clientRegistry.getClients()).thenReturn(Arrays.asList(CLIENT1_REGISTERED_NAME));
-
-        ParticipatingClients clients = new ParticipatingClients(_clientRegistry, _configuredClientNamesForTest);
-        assertBothWays(clients, CLIENT1_REGISTERED_NAME, CLIENT1_CONFIGURED_NAME);
-    }
-
-    public void testSelectTwoClientFromPoolOfMany()
-    {
-        _configuredClientNamesForTest = Arrays.asList(CLIENT1_CONFIGURED_NAME, CLIENT2_CONFIGURED_NAME);
-        when(_clientRegistry.getClients()).thenReturn(Arrays.asList(CLIENT1_REGISTERED_NAME, CLIENT2_REGISTERED_NAME, CLIENT3_REGISTERED_NAME));
-
-        ParticipatingClients clients = new ParticipatingClients(_clientRegistry, _configuredClientNamesForTest);
-
-        assertBothWays(clients, CLIENT1_REGISTERED_NAME, CLIENT1_CONFIGURED_NAME);
-        assertBothWays(clients, CLIENT2_REGISTERED_NAME, CLIENT2_CONFIGURED_NAME);
-    }
-
-    public void testGetUnrecognisedConfiguredName()
-    {
-        _configuredClientNamesForTest = Arrays.asList(CLIENT1_CONFIGURED_NAME);
-        when(_clientRegistry.getClients()).thenReturn(Arrays.asList(CLIENT1_REGISTERED_NAME));
-
-        ParticipatingClients clients = new ParticipatingClients(_clientRegistry, _configuredClientNamesForTest);
-
-        testUnrecognisedClientConfiguredName(clients, "unknown");
-        testUnrecognisedClientRegisteredName(clients, "unknown");
-    }
-
-    public void testGetRegisteredClientNames()
-    {
-        _configuredClientNamesForTest = Arrays.asList(CLIENT1_CONFIGURED_NAME);
-        List<String> registeredNames = Arrays.asList(CLIENT1_REGISTERED_NAME);
-        when(_clientRegistry.getClients()).thenReturn(registeredNames);
-
-        ParticipatingClients clients = new ParticipatingClients(_clientRegistry, _configuredClientNamesForTest);
-
-        Collection<String> registeredParticipatingNames = clients.getRegisteredNames();
-        assertEquals(1, registeredParticipatingNames.size());
-        assertTrue(registeredParticipatingNames.contains(CLIENT1_REGISTERED_NAME));
-    }
-
-    private void testUnrecognisedClientConfiguredName(ParticipatingClients clients, String unrecognisedClientConfiguredName)
-    {
-        try
-        {
-            clients.getRegisteredNameFromConfiguredName(unrecognisedClientConfiguredName);
-            fail("Exception not thrown");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // PASS
-        }
-    }
-
-    private void testUnrecognisedClientRegisteredName(ParticipatingClients clients, String unrecognisedClientRegisteredName)
-    {
-        try
-        {
-            clients.getConfiguredNameFromRegisteredName(unrecognisedClientRegisteredName);
-            fail("Exception not thrown");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // PASS
-        }
-    }
-
-    private void assertBothWays(ParticipatingClients clients, String registeredName, String configuredName)
-    {
-        assertEquals(registeredName, clients.getRegisteredNameFromConfiguredName(configuredName));
-        assertEquals(configuredName, clients.getConfiguredNameFromRegisteredName(registeredName));
-    }
-
-
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/TestRunnerTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/TestRunnerTest.java
deleted file mode 100644
index d8b25e76fa..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/TestRunnerTest.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * 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.disttest.controller;
-
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import org.apache.qpid.disttest.DistributedTestException;
-import org.apache.qpid.disttest.controller.config.QueueConfig;
-import org.apache.qpid.disttest.controller.config.TestInstance;
-import org.apache.qpid.disttest.jms.ControllerJmsDelegate;
-import org.apache.qpid.disttest.message.Command;
-import org.apache.qpid.disttest.message.CreateConnectionCommand;
-import org.apache.qpid.disttest.message.NoOpCommand;
-import org.apache.qpid.disttest.message.ParticipantResult;
-import org.apache.qpid.disttest.message.Response;
-import org.apache.qpid.disttest.message.StartTestCommand;
-import org.apache.qpid.disttest.message.TearDownTestCommand;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-public class TestRunnerTest extends QpidTestCase
-{
-    private static final String TEST_NAME = "TEST_NAME";
-    private static final String PARTICIPANT_NAME = "TEST_PARTICIPANT_NAME";
-    private static final int ITERATION_NUMBER = 1;
-
-    private static final String CLIENT1_REGISTERED_NAME = "client-uid1";
-    private static final String CLIENT1_CONFIGURED_NAME = "client1";
-
-    private static final long COMMAND_RESPONSE_TIMEOUT = 1000;
-    private static final long TEST_RESULT_TIMEOUT = 2000;
-    private static final long DELAY = 100;
-
-    private TestRunner _testRunner;
-    private TestInstance _testInstance;
-    private ControllerJmsDelegate _respondingJmsDelegate;
-    private ParticipatingClients _participatingClients;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        _respondingJmsDelegate = mock(ControllerJmsDelegate.class);
-
-        _participatingClients = mock(ParticipatingClients.class);
-        when(_participatingClients.getRegisteredNameFromConfiguredName(CLIENT1_CONFIGURED_NAME)).thenReturn(CLIENT1_REGISTERED_NAME);
-        when(_participatingClients.getConfiguredNameFromRegisteredName(CLIENT1_REGISTERED_NAME)).thenReturn(CLIENT1_CONFIGURED_NAME);
-        when(_participatingClients.getRegisteredNames()).thenReturn(Collections.singleton(CLIENT1_REGISTERED_NAME));
-
-        doAnswer(new Answer<Void>()
-        {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable
-            {
-                final String clientName = (String)invocation.getArguments()[0];
-                final Command command = (Command)invocation.getArguments()[1];
-                _testRunner.processCommandResponse(new Response(clientName, command.getType()));
-                return null;
-            }
-        }).when(_respondingJmsDelegate).sendCommandToClient(anyString(), isA(Command.class));
-    }
-
-    public void testSendConnectionCommandToClient()
-    {
-        _testInstance = createTestInstanceWithConnection();
-
-        _testRunner = new TestRunner(_participatingClients, _testInstance , _respondingJmsDelegate, COMMAND_RESPONSE_TIMEOUT, TEST_RESULT_TIMEOUT);
-        _testRunner.sendTestSetupCommands();
-
-        verify(_respondingJmsDelegate).sendCommandToClient(eq(CLIENT1_REGISTERED_NAME), isA(CreateConnectionCommand.class));
-    }
-
-    public void testSendCommandToAllParticipatingClients()
-    {
-        _testRunner = new TestRunner(_participatingClients, mock(TestInstance.class), _respondingJmsDelegate, COMMAND_RESPONSE_TIMEOUT, TEST_RESULT_TIMEOUT);
-
-        StartTestCommand startTestCommand = new StartTestCommand();
-        _testRunner.sendCommandToParticipatingClients(startTestCommand);
-
-        verify(_respondingJmsDelegate).sendCommandToClient(CLIENT1_REGISTERED_NAME, startTestCommand);
-    }
-
-    public void testWaitsForCommandResponses()
-    {
-        _testInstance = createTestInstanceWithConnection();
-        _testRunner = new TestRunner(_participatingClients, _testInstance , _respondingJmsDelegate, COMMAND_RESPONSE_TIMEOUT, TEST_RESULT_TIMEOUT);
-
-        _testRunner.sendTestSetupCommands();
-
-        _testRunner.awaitCommandResponses();
-    }
-
-    public void testClientFailsToSendCommandResponseWithinTimeout()
-    {
-        ControllerJmsDelegate jmsDelegate = mock(ControllerJmsDelegate.class);
-
-        _testInstance = createTestInstanceWithConnection();
-        _testRunner = new TestRunner(_participatingClients, _testInstance , jmsDelegate, COMMAND_RESPONSE_TIMEOUT, TEST_RESULT_TIMEOUT);
-
-        _testRunner.sendTestSetupCommands();
-        // we don't call sendCommandResponseLater so controller should time out
-
-        try
-        {
-            _testRunner.awaitCommandResponses();
-            fail("Exception not thrown");
-        }
-        catch (DistributedTestException e)
-        {
-            // PASS
-        }
-    }
-
-    public void testCreateAndDeleteQueues()
-    {
-        _testInstance =  mock(TestInstance.class);
-        List<QueueConfig> queues = mock(List.class);
-        when(_testInstance.getQueues()).thenReturn(queues);
-
-        _testRunner = new TestRunner(_participatingClients, _testInstance, _respondingJmsDelegate, COMMAND_RESPONSE_TIMEOUT, TEST_RESULT_TIMEOUT);
-
-        _testRunner.createQueues();
-        verify(_respondingJmsDelegate).createQueues(queues);
-
-        _testRunner.deleteQueues();
-        verify(_respondingJmsDelegate).deleteQueues(queues);
-    }
-
-    public void testRun()
-    {
-        _testInstance = createTestInstanceWithOneParticipant();
-        _testRunner = new TestRunner(_participatingClients, _testInstance , _respondingJmsDelegate, COMMAND_RESPONSE_TIMEOUT, TEST_RESULT_TIMEOUT);
-
-        ParticipantResult incomingParticipantResult = new ParticipantResult(PARTICIPANT_NAME);
-        incomingParticipantResult.setRegisteredClientName(CLIENT1_REGISTERED_NAME);
-        sendTestResultsLater(_testRunner, incomingParticipantResult);
-
-        TestResult results = _testRunner.run();
-
-        verify(_respondingJmsDelegate).addCommandListener(isA(TestRunner.TestCommandResponseListener.class));
-        verify(_respondingJmsDelegate).addCommandListener(isA(TestRunner.ParticipantResultListener.class));
-
-        verify(_respondingJmsDelegate).createQueues(isA(List.class));
-
-        verify(_respondingJmsDelegate).sendCommandToClient(eq(CLIENT1_REGISTERED_NAME), isA(StartTestCommand.class));
-        verify(_respondingJmsDelegate).sendCommandToClient(eq(CLIENT1_REGISTERED_NAME), isA(NoOpCommand.class));
-        verify(_respondingJmsDelegate).sendCommandToClient(eq(CLIENT1_REGISTERED_NAME), isA(TearDownTestCommand.class));
-
-        verify(_respondingJmsDelegate).deleteQueues(isA(List.class));
-
-        verify(_respondingJmsDelegate).removeCommandListener(isA(TestRunner.ParticipantResultListener.class));
-        verify(_respondingJmsDelegate).removeCommandListener(isA(TestRunner.TestCommandResponseListener.class));
-
-        List<ParticipantResult> participantResults = results.getParticipantResults();
-        assertEquals(1, participantResults.size());
-        ParticipantResult resultingParticipantResult = participantResults.get(0);
-
-        assertResultHasCorrectTestDetails(resultingParticipantResult);
-    }
-
-    private void assertResultHasCorrectTestDetails(ParticipantResult resultingParticipantResult)
-    {
-        assertEquals("Test runner should have set configured name when it received participant results",
-                CLIENT1_CONFIGURED_NAME, resultingParticipantResult.getConfiguredClientName());
-        assertEquals("Test runner should have set test name when it received participant results",
-                TEST_NAME, resultingParticipantResult.getTestName());
-        assertEquals("Test runner should have set test iteration number when it received participant results",
-                ITERATION_NUMBER, resultingParticipantResult.getIterationNumber());
-    }
-
-
-    private TestInstance createTestInstanceWithOneParticipant()
-    {
-        TestInstance testInstance = mock(TestInstance.class);
-
-        List<CommandForClient> commands = Arrays.asList(
-                new CommandForClient(CLIENT1_CONFIGURED_NAME, new NoOpCommand()));
-
-        when(testInstance.createCommands()).thenReturn(commands);
-
-        when(testInstance.getTotalNumberOfParticipants()).thenReturn(1);
-
-        when(testInstance.getName()).thenReturn(TEST_NAME);
-
-        List<QueueConfig> queues = mock(List.class);
-        when(testInstance.getQueues()).thenReturn(queues);
-
-        when(testInstance.getIterationNumber()).thenReturn(ITERATION_NUMBER);
-
-        return testInstance;
-    }
-
-    private TestInstance createTestInstanceWithConnection()
-    {
-        TestInstance testInstance = mock(TestInstance.class);
-
-        List<CommandForClient> commands = Arrays.asList(
-                new CommandForClient(CLIENT1_CONFIGURED_NAME, new CreateConnectionCommand("conn1", "factory")));
-
-        when(testInstance.createCommands()).thenReturn(commands);
-
-        return testInstance;
-    }
-
-    private void sendTestResultsLater(final TestRunner runner, final ParticipantResult result)
-    {
-        doLater(new TimerTask()
-        {
-            @Override
-            public void run()
-            {
-                runner.processParticipantResult(result);
-            }
-        }, DELAY);
-    }
-
-    private void doLater(TimerTask task, long delayInMillis)
-    {
-        Timer timer = new Timer();
-        timer.schedule(task, delayInMillis);
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ClientConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ClientConfigTest.java
deleted file mode 100644
index 4bf4307eaf..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ClientConfigTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * 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.disttest.controller.config;
-
-import static org.apache.qpid.disttest.controller.config.ConfigTestUtils.assertCommandForClient;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.qpid.disttest.client.property.PropertyValue;
-import org.apache.qpid.disttest.client.property.SimplePropertyValue;
-import org.apache.qpid.disttest.controller.CommandForClient;
-import org.apache.qpid.disttest.message.Command;
-import org.apache.qpid.disttest.message.CreateMessageProviderCommand;
-import org.apache.qpid.disttest.message.NoOpCommand;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ClientConfigTest extends QpidTestCase
-{
-    private static final String CLIENT1 = "client1";
-
-    public void testClientConfigHasZeroArgConstructorForGson()
-    {
-        ClientConfig c = new ClientConfig();
-        assertNotNull(c);
-    }
-
-    public void testCreateCommands()
-    {
-        ClientConfig clientConfig = createClientConfigWithConnectionConfigReturningChildCommands();
-
-        List<CommandForClient> commands = clientConfig.createCommands();
-        assertEquals(2, commands.size());
-
-        assertCommandForClient(commands, 0, CLIENT1, NoOpCommand.class);
-        assertCommandForClient(commands, 1, CLIENT1, NoOpCommand.class);
-    }
-
-    public void testCreateCommandsForMessageProvider()
-    {
-        ClientConfig clientConfig = createClientConfigWithMessageProviderConfigReturningCommands();
-
-        List<CommandForClient> commands = clientConfig.createCommands();
-        assertEquals(1, commands.size());
-
-        assertCommandForClient(commands, 0, CLIENT1, CreateMessageProviderCommand.class);
-    }
-
-    public void testGetTotalNumberOfParticipants()
-    {
-        ClientConfig clientConfig = createClientConfigWithTwoParticipants();
-        assertEquals(2, clientConfig.getTotalNumberOfParticipants());
-    }
-
-    private ClientConfig createClientConfigWithConnectionConfigReturningChildCommands()
-    {
-        ConnectionConfig connectionConfig = mock(ConnectionConfig.class);
-
-        List<Command> commands = Arrays.asList((Command)new NoOpCommand(), (Command)new NoOpCommand());
-        when(connectionConfig.createCommands()).thenReturn(commands);
-
-        return new ClientConfig(CLIENT1, connectionConfig);
-    }
-
-    private ClientConfig createClientConfigWithMessageProviderConfigReturningCommands()
-    {
-        Map<String, PropertyValue> messageProperties = new HashMap<String, PropertyValue>();
-        messageProperties.put("test", new SimplePropertyValue("testValue"));
-        MessageProviderConfig config = new MessageProviderConfig("test", messageProperties);
-
-        List<MessageProviderConfig> providerConfigs = new ArrayList<MessageProviderConfig>();
-        providerConfigs.add(config);
-
-        return new ClientConfig(CLIENT1, new ArrayList<ConnectionConfig>(), providerConfigs);
-    }
-
-    private ClientConfig createClientConfigWithTwoParticipants()
-    {
-        ConnectionConfig connectionConfig1 = mock(ConnectionConfig.class);
-        ConnectionConfig connectionConfig2 = mock(ConnectionConfig.class);
-
-        when(connectionConfig1.getTotalNumberOfParticipants()).thenReturn(1);
-        when(connectionConfig2.getTotalNumberOfParticipants()).thenReturn(1);
-
-        ClientConfig clientConfig = new ClientConfig(CLIENT1, connectionConfig1, connectionConfig2);
-        return clientConfig;
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest-test-config.js b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest-test-config.js
deleted file mode 100644
index 527300eff4..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest-test-config.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *
- * 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.
- *
- */
-jsonObject = {
-  "_tests":
-    QPID.iterations( { "__ACK_MODE": [ 0, 1 ] },
-      {
-          // this is a comment - it wouldn't be allowed if this were pure JSON
-
-          "_name": "Test 1",
-          "_queues": [
-            {
-              "_name": "Json-Queue-Name"
-            }
-          ],
-
-          "_clients": QPID.times(2,
-            {
-              "_name": "repeatingClient__CLIENT_INDEX",
-              "_connections": [
-                {
-                  "_name": "connection1",
-                  "_sessions": [
-                    {
-                      "_sessionName": "session1",
-                      "_acknowledgeMode": "__ACK_MODE",
-                      "_consumers": []
-                    }
-                  ]
-                }
-              ]
-            },
-            "__CLIENT_INDEX"
-        )
-    })
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java
deleted file mode 100644
index e208945901..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * 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.disttest.controller.config;
-
-import java.io.Reader;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.qpid.disttest.ConfigFileTestHelper;
-import org.apache.qpid.disttest.client.property.PropertyValue;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.test.utils.TestFileUtils;
-
-public class ConfigReaderTest extends QpidTestCase
-{
-    private Config _config;
-
-    @Override
-    protected void setUp()
-    {
-        ConfigReader configReader = new ConfigReader();
-        Reader reader = ConfigFileTestHelper.getConfigFileReader(getClass(), "sampleConfig.json");
-        _config = configReader.readConfig(reader);
-    }
-
-    public void testReadTest()
-    {
-        List<TestConfig> tests = _config.getTestConfigs();
-        assertEquals("Unexpected number of tests", 2, tests.size());
-        TestConfig test1Config = tests.get(0);
-        assertNotNull("Test 1 configuration is expected", test1Config);
-        assertEquals("Unexpected test name", "Test 1", test1Config.getName());
-
-        TestConfig test2Config = tests.get(1);
-        assertNotNull("Test 2 configuration is expected", test2Config);
-    }
-
-    public void testReadsTestWithQueues()
-    {
-        TestConfig test1Config =  _config.getTestConfigs().get(0);
-        List<QueueConfig> queues = test1Config.getQueues();
-        assertEquals("Unexpected number of queues", 2, queues.size());
-        QueueConfig queue1Config = queues.get(0);
-        assertNotNull("Expected queue 1 config", queue1Config);
-        assertEquals("Unexpected queue name", "Json-Queue-Name", queue1Config.getName());
-        assertTrue("Unexpected attributes", queue1Config.getAttributes().isEmpty());
-        assertFalse("Unexpected durable", queue1Config.isDurable());
-
-        QueueConfig queue2Config = queues.get(1);
-        assertNotNull("Expected queue 2 config", queue2Config);
-        assertEquals("Unexpected queue name", "Json Queue Name 2", queue2Config.getName());
-        assertTrue("Unexpected durable", queue2Config.isDurable());
-        Map<String, Object> attributes =  queue2Config.getAttributes();
-        assertNotNull("Expected attributes", attributes);
-        assertFalse("Attributes are not loaded", attributes.isEmpty());
-        assertEquals("Unexpected number of attributes", 1, attributes.size());
-        assertEquals("Unexpected attribute 'x-qpid-priorities' value", 10,
-                ((Number)attributes.get("x-qpid-priorities")).intValue());
-    }
-
-    public void testReadsTestWithIterations()
-    {
-        TestConfig testConfig = _config.getTestConfigs().get(0);
-        List<IterationValue> iterationValues = testConfig.getIterationValues();
-        assertEquals("Unexpected number of iterations", 2, iterationValues.size());
-
-        IterationValue iteration1 = iterationValues.get(0);
-
-        String messageSizeProperty = "_messageSize";
-
-        assertEquals("Unexpected value for property " + messageSizeProperty,
-                "100",
-                iteration1.getIterationPropertyValuesWithUnderscores().get(messageSizeProperty));
-    }
-
-    public void testReadsMessageProviders()
-    {
-        TestConfig testConfig = _config.getTestConfigs().get(0);
-        ClientConfig cleintConfig = testConfig.getClients().get(0);
-        List<MessageProviderConfig> configs = cleintConfig.getMessageProviders();
-        assertNotNull("Message provider configs should not be null", configs);
-        assertEquals("Unexpected number of message providers", 1, configs.size());
-        MessageProviderConfig messageProvider = configs.get(0);
-        assertNotNull("Message provider config should not be null", messageProvider);
-        assertEquals("Unexpected provider name", "testProvider1", messageProvider.getName());
-        Map<String, PropertyValue> properties = messageProvider.getMessageProperties();
-        assertNotNull("Message properties should not be null", properties);
-        assertEquals("Unexpected number of message properties", 3, properties.size());
-        assertNotNull("test property is not found", properties.get("test"));
-        assertNotNull("priority property is not found", properties.get("priority"));
-        assertNotNull("id property is not found", properties.get("id"));
-     }
-
-    public void testReadsJS() throws Exception
-    {
-        ConfigReader configReader = new ConfigReader();
-        String path = TestFileUtils.createTempFileFromResource(this, "ConfigReaderTest-test-config.js").getAbsolutePath();
-        _config = configReader.getConfigFromFile(path);
-
-        List<TestConfig> testConfigs = _config.getTestConfigs();
-        assertEquals("Unexpected number of tests", 2, testConfigs.size());
-        TestConfig testConfig1 = _config.getTestConfigs().get(0);
-        List<ClientConfig> cleintConfigs = testConfig1.getClients();
-        assertEquals("Unexpected number of test 1 clients", 2, cleintConfigs.size());
-        List<QueueConfig> queueConfigs = testConfig1.getQueues();
-        assertEquals("Unexpected number of test 1 queue", 1, queueConfigs.size());
-        assertEquals("Unexpected queue name", "Json-Queue-Name", queueConfigs.get(0).getName());
-        ClientConfig cleintConfig = cleintConfigs.get(0);
-        List<ConnectionConfig> connectionConfigs = cleintConfig.getConnections();
-        assertEquals("Unexpected number of connections", 1, connectionConfigs.size());
-        List<SessionConfig> sessionConfigs = connectionConfigs.get(0).getSessions();
-        assertEquals("Unexpected number of sessions", 1, sessionConfigs.size());
-        assertEquals("Unexpected ack mode", 0, sessionConfigs.get(0).getAcknowledgeMode());
-
-        TestConfig testConfig2 = _config.getTestConfigs().get(1);
-        List<ClientConfig> cleintConfigs2 = testConfig2.getClients();
-        assertEquals("Unexpected number of test 1 clients", 2, cleintConfigs2.size());
-        List<QueueConfig> queueConfigs2 = testConfig2.getQueues();
-        assertEquals("Unexpected number of test 1 queue", 1, queueConfigs2.size());
-        assertEquals("Unexpected queue name", "Json-Queue-Name", queueConfigs2.get(0).getName());
-        ClientConfig cleintConfig2 = cleintConfigs2.get(0);
-        List<ConnectionConfig> connectionConfigs2 = cleintConfig2.getConnections();
-        assertEquals("Unexpected number of connections", 1, connectionConfigs2.size());
-        List<SessionConfig> sessionConfigs2 = connectionConfigs2.get(0).getSessions();
-        assertEquals("Unexpected number of sessions", 1, sessionConfigs2.size());
-        assertEquals("Unexpected ack mode", 1, sessionConfigs2.get(0).getAcknowledgeMode());
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTest.java
deleted file mode 100644
index 291ce2af78..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.disttest.controller.config;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ConfigTest extends QpidTestCase
-{
-    public void testGetTestsForTestWithIteratingMessageSizes()
-    {
-        Config config = createConfigWithIteratingMessageSizes();
-        List<TestInstance> testConfigs = config.getTests();
-
-        assertEquals("should have a test config for each message size", 2, testConfigs.size());
-
-        TestInstance instance0 = testConfigs.get(0);
-        assertEquals(0, instance0.getIterationNumber());
-
-        TestInstance instance1 = testConfigs.get(1);
-        assertEquals(1, instance1.getIterationNumber());
-    }
-
-    private Config createConfigWithIteratingMessageSizes()
-    {
-        TestConfig testConfig = mock(TestConfig.class);
-
-        when(testConfig.getIterationValues()).thenReturn(Arrays.asList(new IterationValue(),new IterationValue()));
-
-        Config config = new Config(testConfig);
-
-        return config;
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java
deleted file mode 100644
index 6ee42c62c6..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.disttest.controller.config;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
-import org.apache.qpid.disttest.controller.CommandForClient;
-import org.apache.qpid.disttest.message.Command;
-
-public class ConfigTestUtils
-{
-    public static <C extends Command> void assertCommandForClient(final List<CommandForClient> commandsForClients, final int index, final String expectedRegisteredClientName, final Class<C> expectedCommandClass)
-    {
-        final CommandForClient commandForClient = commandsForClients.get(index);
-        assertEquals(expectedRegisteredClientName, commandForClient.getClientName());
-        final Command command = commandForClient.getCommand();
-        assertTrue("Command " + index + " is of class " + command.getClass() + " but expecting " + expectedCommandClass,
-                expectedCommandClass.isAssignableFrom(command.getClass()));
-    }
-
-    public static <C extends Command> void assertCommandEquals(final List<Command> commands, final int index, final Class<C> expectedCommandClass)
-    {
-        @SuppressWarnings("unchecked")
-        C command = (C) getCommand(commands, index); //explicit cast added to get round oracle compiler bug (id 6302954)
-        assertTrue("Command " + index + " is of class " + command.getClass() + " but expecting " + expectedCommandClass,
-                expectedCommandClass.isAssignableFrom(command.getClass()));
-    }
-
-    public static <C extends Command>  C getCommand(final List<Command> commands, final int index)
-    {
-        @SuppressWarnings("unchecked")
-        C command = (C) commands.get(index);
-        return command;
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConnectionConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConnectionConfigTest.java
deleted file mode 100644
index 0eee80e425..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConnectionConfigTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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.disttest.controller.config;
-
-import static org.apache.qpid.disttest.controller.config.ConfigTestUtils.assertCommandEquals;
-import static org.apache.qpid.disttest.controller.config.ConfigTestUtils.getCommand;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.qpid.disttest.message.Command;
-import org.apache.qpid.disttest.message.CreateConnectionCommand;
-import org.apache.qpid.disttest.message.NoOpCommand;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ConnectionConfigTest extends QpidTestCase
-{
-    private static final String CONNECTION_FACTORY_NAME = "ConnectionFactoryName";
-    private static final String CONNECTION_NAME = "ConnectionName";
-
-    public void testConnectionConfigHasZeroArgConstructorForGson()
-    {
-        ConnectionConfig c = new ConnectionConfig();
-        assertNotNull(c);
-    }
-
-    public void testCreateCommandsForConnectionAndChildren()
-    {
-        ConnectionConfig connectionConfig = createConnectionConfigWithChildCommands();
-
-        List<Command> commands = connectionConfig.createCommands();
-        assertEquals(3, commands.size());
-
-        assertCommandEquals(commands, 0, CreateConnectionCommand.class);
-        assertCommandEquals(commands, 1, NoOpCommand.class);
-        assertCommandEquals(commands, 2, NoOpCommand.class);
-
-        CreateConnectionCommand createConnectionCommand = getCommand(commands, 0);
-        assertEquals(CONNECTION_NAME, createConnectionCommand.getConnectionName());
-        assertEquals(CONNECTION_FACTORY_NAME, createConnectionCommand.getConnectionFactoryName());
-    }
-
-    public void testGetTotalNumberOfParticipants()
-    {
-        ConnectionConfig connectionConfig = createConnectionConfigWithTwoParticipants();
-        assertEquals(2, connectionConfig.getTotalNumberOfParticipants());
-    }
-
-    private ConnectionConfig createConnectionConfigWithTwoParticipants()
-    {
-        SessionConfig sessionConfig1 = mock(SessionConfig.class);
-        SessionConfig sessionConfig2 = mock(SessionConfig.class);
-
-        when(sessionConfig1.getTotalNumberOfParticipants()).thenReturn(1);
-        when(sessionConfig2.getTotalNumberOfParticipants()).thenReturn(1);
-
-        ConnectionConfig connectionConfig = new ConnectionConfig(CONNECTION_NAME, CONNECTION_FACTORY_NAME, sessionConfig1, sessionConfig2);
-
-        return connectionConfig;
-    }
-
-    private ConnectionConfig createConnectionConfigWithChildCommands()
-    {
-        SessionConfig sessionConfig = mock(SessionConfig.class);
-
-        NoOpCommand cmd1 = mock(NoOpCommand.class);
-        NoOpCommand cmd2 = mock(NoOpCommand.class);
-        List<Command> commands = Arrays.asList((Command)cmd1, (Command)cmd2);
-        when(sessionConfig.createCommands(CONNECTION_NAME)).thenReturn(commands);
-
-        return new ConnectionConfig(CONNECTION_NAME, CONNECTION_FACTORY_NAME, sessionConfig);
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConsumerConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConsumerConfigTest.java
deleted file mode 100644
index 0aa05a176e..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConsumerConfigTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.disttest.controller.config;
-
-import org.apache.qpid.disttest.message.CreateConsumerCommand;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ConsumerConfigTest extends QpidTestCase
-{
-    public void testConsumerHasZeroArgConstructorForGson()
-    {
-        ConsumerConfig c = new ConsumerConfig();
-        assertNotNull(c);
-    }
-
-    public void testCreateConsumerCommand()
-    {
-        boolean isTopic = true;
-        boolean isDurableSubscription = true;
-        boolean isBrowsingSubscription = true;
-        boolean noLocal = true;
-        long numberOfMessages = 100;
-        String consumerName = "consumerName";
-        String sessionName = "sessionName";
-        String destinationName = "destinationName";
-        String selector = "selector";
-        int batchSize = 10;;
-        long maximumDuration = 50;
-        boolean isSynchronousNonDefault = false;
-
-        ConsumerConfig consumerConfig = new ConsumerConfig(
-            consumerName,
-            destinationName,
-            numberOfMessages,
-            batchSize,
-            maximumDuration,
-            isTopic,
-            isDurableSubscription,
-            isBrowsingSubscription,
-            selector,
-            noLocal,
-            isSynchronousNonDefault);
-
-        CreateConsumerCommand createConsumerCommand = consumerConfig.createCommand(sessionName);
-
-        assertEquals(sessionName, createConsumerCommand.getSessionName());
-        assertEquals(consumerName, createConsumerCommand.getParticipantName());
-        assertEquals(destinationName, createConsumerCommand.getDestinationName());
-        assertEquals(numberOfMessages, createConsumerCommand.getNumberOfMessages());
-        assertEquals(batchSize, createConsumerCommand.getBatchSize());
-        assertEquals(maximumDuration, createConsumerCommand.getMaximumDuration());
-
-        assertEquals(isTopic, createConsumerCommand.isTopic());
-        assertEquals(isDurableSubscription, createConsumerCommand.isDurableSubscription());
-        assertEquals(isBrowsingSubscription, createConsumerCommand.isBrowsingSubscription());
-        assertEquals(selector, createConsumerCommand.getSelector());
-        assertEquals(noLocal, createConsumerCommand.isNoLocal());
-        assertEquals(isSynchronousNonDefault, createConsumerCommand.isSynchronous());
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/IterationValueTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/IterationValueTest.java
deleted file mode 100644
index 860f6af565..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/IterationValueTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.disttest.controller.config;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.qpid.disttest.message.CreateConnectionCommand;
-import org.apache.qpid.disttest.message.CreateConsumerCommand;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class IterationValueTest extends QpidTestCase
-{
-    private static final int MAXIMUM_DURATION = 10;
-
-    private static final boolean IS_DURABLE_SUBSCRIPTION = true;
-
-    private CreateConsumerCommand _createConsumerCommand;
-    private Map<String, String> _iterationValueMap;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        _createConsumerCommand = mock(CreateConsumerCommand.class);
-
-        _iterationValueMap = new HashMap<String, String>();
-        _iterationValueMap.put("_maximumDuration", String.valueOf(MAXIMUM_DURATION));
-        _iterationValueMap.put("_durableSubscription", String.valueOf(IS_DURABLE_SUBSCRIPTION));
-    }
-
-    public void testApplyPopulatedIterationValueToCommandWithMatchingProperties() throws Exception
-    {
-        IterationValue iterationValue = new IterationValue(_iterationValueMap);
-
-        iterationValue.applyToCommand(_createConsumerCommand);
-
-        verify(_createConsumerCommand).setMaximumDuration(MAXIMUM_DURATION);
-        verify(_createConsumerCommand).setDurableSubscription(IS_DURABLE_SUBSCRIPTION);
-    }
-
-    public void testApplyPopulatedIterationValueToCommandWithoutMatchingProperties() throws Exception
-    {
-        IterationValue iterationValue = new IterationValue(_iterationValueMap);
-
-        CreateConnectionCommand createConnectionCommand = mock(CreateConnectionCommand.class);
-        iterationValue.applyToCommand(createConnectionCommand);
-
-        verifyZeroInteractions(createConnectionCommand);
-    }
-
-    public void testApplyUnpopulatedIterationValueToCommand() throws Exception
-    {
-        IterationValue iterationValue = new IterationValue();
-
-        iterationValue.applyToCommand(_createConsumerCommand);
-
-        verifyZeroInteractions(_createConsumerCommand);
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest-test-config.js b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest-test-config.js
deleted file mode 100644
index eab98e8bd7..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest-test-config.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *
- * 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.
- *
- */
-jsonObject = {
-  "_countries":
-    QPID.iterations( { "__ITERATING_VALUE": [ 0, 1 ] },
-      {
-          // this is a comment - it wouldn't be allowed if this were pure JSON
-
-          "_name": "Country",
-          "_regions": QPID.times(2,
-            {
-              "_name": "repeatingRegion__REGION_INDEX",
-              "_towns": [
-                {
-                  "_name": "town1",
-                  "_iteratingAttribute": "__ITERATING_VALUE",
-                  "_consumers": []
-                }
-              ]
-            },
-            "__REGION_INDEX"
-        )
-    })
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest.java
deleted file mode 100644
index 174bd8092c..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *
- * 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.disttest.controller.config;
-
-import static org.apache.commons.beanutils.PropertyUtils.getProperty;
-
-import java.io.FileReader;
-import java.util.List;
-import java.util.TreeMap;
-
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.test.utils.TestFileUtils;
-
-import com.google.gson.Gson;
-
-public class JavaScriptConfigEvaluatorTest extends QpidTestCase
-{
-    public void testEvaluateJavaScript() throws Exception
-    {
-        String jsFilePath = TestFileUtils.createTempFileFromResource(this, "JavaScriptConfigEvaluatorTest-test-config.js").getAbsolutePath();
-
-        String rawConfig = new JavaScriptConfigEvaluator().evaluateJavaScript(jsFilePath);
-
-        Object configAsObject = getObject(rawConfig);
-
-        // Tests are produced by the QPID.iterations js function
-        assertEquals("Unexpected number of countries", 2, getPropertyAsList(configAsObject, "_countries").size());
-
-        Object country0 = getProperty(configAsObject, "_countries.[0]");
-        assertEquals("Unexpected country name", "Country", getProperty(country0, "_name"));
-        assertEquals("Unexpected country iteration number", 0, getPropertyAsInt(country0, "_iterationNumber"));
-
-        assertEquals("Unexpected number of regions", 2, getPropertyAsList(country0, "_regions").size());
-        // Region names are produced by the QPID.times js function
-        assertEquals("Unexpected region name", "repeatingRegion0", getProperty(country0, "_regions.[0]._name"));
-        assertEquals("Unexpected region name", "repeatingRegion1", getProperty(country0, "_regions.[1]._name"));
-        // Iterating attribute are produced by the QPID.iterations js function
-        assertEquals("Unexpected iterating attribute", "0", getProperty(country0, "_regions.[0]._towns.[0]._iteratingAttribute"));
-
-        Object country1 = getProperty(configAsObject, "_countries.[1]");
-        assertEquals("Unexpected country iteration number", 1, getPropertyAsInt(country1, "_iterationNumber"));
-        assertEquals("Unexpected iterating attribute", "1", getProperty(country1, "_regions.[0]._towns.[0]._iteratingAttribute"));
-    }
-
-    public void testEvaluateJavaScriptWithReader() throws Exception
-    {
-        String jsFilePath = TestFileUtils.createTempFileFromResource(this, "JavaScriptConfigEvaluatorTest-test-config.js").getAbsolutePath();
-
-        FileReader fileReader = new FileReader(jsFilePath);
-        String rawConfig = new JavaScriptConfigEvaluator().evaluateJavaScript(fileReader);
-
-        Object configAsObject = getObject(rawConfig);
-
-        // Tests are produced by the QPID.iterations js function
-        assertEquals("Unexpected number of countries", 2, getPropertyAsList(configAsObject, "_countries").size());
-
-        Object country0 = getProperty(configAsObject, "_countries.[0]");
-        assertEquals("Unexpected country name", "Country", getProperty(country0, "_name"));
-        assertEquals("Unexpected country iteration number", 0, getPropertyAsInt(country0, "_iterationNumber"));
-
-        assertEquals("Unexpected number of regions", 2, getPropertyAsList(country0, "_regions").size());
-        // Region names are produced by the QPID.times js function
-        assertEquals("Unexpected region name", "repeatingRegion0", getProperty(country0, "_regions.[0]._name"));
-        assertEquals("Unexpected region name", "repeatingRegion1", getProperty(country0, "_regions.[1]._name"));
-        // Iterating attribute are produced by the QPID.iterations js function
-        assertEquals("Unexpected iterating attribute", "0", getProperty(country0, "_regions.[0]._towns.[0]._iteratingAttribute"));
-
-        Object country1 = getProperty(configAsObject, "_countries.[1]");
-        assertEquals("Unexpected country iteration number", 1, getPropertyAsInt(country1, "_iterationNumber"));
-        assertEquals("Unexpected iterating attribute", "1", getProperty(country1, "_regions.[0]._towns.[0]._iteratingAttribute"));
-    }
-
-    private int getPropertyAsInt(Object configAsObject, String property) throws Exception
-    {
-        Number propertyValue = (Number) getProperty(configAsObject, property);
-
-        return propertyValue.intValue();
-    }
-
-    private List<?> getPropertyAsList(Object configAsObject, String property)
-            throws Exception
-    {
-        return (List<?>)getProperty(configAsObject, property);
-    }
-
-    private Object getObject(String jsonStringIn)
-    {
-        Gson gson = new Gson();
-        @SuppressWarnings("rawtypes")
-        TreeMap object = gson.fromJson(jsonStringIn, TreeMap.class);
-        return object;
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/MessageProviderConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/MessageProviderConfigTest.java
deleted file mode 100644
index 148c07b1ca..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/MessageProviderConfigTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.disttest.controller.config;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.qpid.disttest.client.property.PropertyValue;
-import org.apache.qpid.disttest.client.property.SimplePropertyValue;
-import org.apache.qpid.disttest.message.CreateMessageProviderCommand;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class MessageProviderConfigTest extends QpidTestCase
-{
-    public void testCreateCommandsForMessageProvider()
-    {
-        Map<String, PropertyValue> messageProperties = new HashMap<String, PropertyValue>();
-        messageProperties.put("test", new SimplePropertyValue("testValue"));
-        MessageProviderConfig config = new MessageProviderConfig("test", messageProperties);
-        CreateMessageProviderCommand command = config.createCommand();
-        assertNotNull("Command should not be null", command);
-        assertNotNull("Unexpected name", command.getProviderName());
-        assertEquals("Unexpected properties", messageProperties, command.getMessageProperties());
-    }
-
-    public void testMessageProviderConfig()
-    {
-        Map<String, PropertyValue> messageProperties = new HashMap<String, PropertyValue>();
-        messageProperties.put("test", new SimplePropertyValue("testValue"));
-        MessageProviderConfig config = new MessageProviderConfig("test", messageProperties);
-        assertEquals("Unexpected name", "test", config.getName());
-        assertEquals("Unexpected properties", messageProperties, config.getMessageProperties());
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
deleted file mode 100644
index b6efd68cbd..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.disttest.controller.config;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import org.apache.qpid.disttest.message.CreateParticpantCommand;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ParticipantConfigTest extends QpidTestCase
-{
-    public void testCreateProducerCommandAppliesDurationOverride()
-    {
-        long overriddenDuration = 123;
-        setTestSystemProperty(ParticipantConfig.DURATION_OVERRIDE_SYSTEM_PROPERTY, String.valueOf(overriddenDuration));
-
-        CreateParticpantCommand createParticipantCommand = mock(CreateParticpantCommand.class);
-        ParticipantConfig participantConfig = new ParticipantConfig("name", "destinationName", false, 1, 2, 5000)
-        {
-        };
-
-        participantConfig.setParticipantProperties(createParticipantCommand);
-
-        verify(createParticipantCommand).setMaximumDuration(overriddenDuration);
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ProducerConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ProducerConfigTest.java
deleted file mode 100644
index ea9a406b1d..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ProducerConfigTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.disttest.controller.config;
-
-import javax.jms.DeliveryMode;
-import javax.jms.Message;
-
-import org.apache.qpid.disttest.message.CreateProducerCommand;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ProducerConfigTest extends QpidTestCase
-{
-    public void testProducerHasZeroArgConstructorForGson()
-    {
-        ProducerConfig p = new ProducerConfig();
-        assertNotNull(p);
-    }
-
-    public void testConfigProvidesJmsDefaults()
-    {
-        CreateProducerCommand p = new ProducerConfig().createCommand("session1");
-        assertEquals(Message.DEFAULT_DELIVERY_MODE, p.getDeliveryMode());
-        assertEquals(Message.DEFAULT_PRIORITY, p.getPriority());
-        assertEquals(Message.DEFAULT_TIME_TO_LIVE, p.getTimeToLive());
-    }
-
-    public void testMessageSizeDefault()
-    {
-        CreateProducerCommand producer = new ProducerConfig().createCommand("session1");
-        assertEquals("Unexpected default message size", 1024, producer.getMessageSize());
-    }
-
-    public void testMessageSizeDefaultOverride()
-    {
-        final long overriddenMessageSize = 4096;
-        setTestSystemProperty(ProducerConfig.MESSAGE_SIZE_OVERRIDE_SYSTEM_PROPERTY, String.valueOf(overriddenMessageSize));
-
-        CreateProducerCommand producer2 = new ProducerConfig().createCommand("session1");
-        assertEquals("Unexpected message size", overriddenMessageSize, producer2.getMessageSize());
-    }
-
-    public void testCreateProducerCommand()
-    {
-        String destination = "url:/destination";
-        int messageSize = 1000;
-        int numberOfMessages = 10;
-        int priority = 4;
-        long timeToLive = 10000;
-        int batchSize = 5;
-        long interval = 60;
-        long maximumDuration = 70;
-        long startDelay = 80;
-        String providerName = "testProvider1";
-
-        ProducerConfig producerConfig = new ProducerConfig(
-                "producer1",
-                destination,
-                numberOfMessages,
-                batchSize,
-                maximumDuration,
-                DeliveryMode.NON_PERSISTENT,
-                messageSize,
-                priority,
-                timeToLive,
-                interval,
-                startDelay,
-                providerName);
-
-        CreateProducerCommand command = producerConfig.createCommand("session1");
-
-        assertEquals("session1", command.getSessionName());
-        assertEquals("producer1", command.getParticipantName());
-        assertEquals(destination, command.getDestinationName());
-        assertEquals(numberOfMessages, command.getNumberOfMessages());
-        assertEquals(batchSize, command.getBatchSize());
-        assertEquals(maximumDuration, command.getMaximumDuration());
-
-        assertEquals(DeliveryMode.NON_PERSISTENT, command.getDeliveryMode());
-        assertEquals(messageSize, command.getMessageSize());
-        assertEquals(priority, command.getPriority());
-        assertEquals(timeToLive, command.getTimeToLive());
-        assertEquals(interval, command.getInterval());
-        assertEquals(startDelay, command.getStartDelay());
-        assertEquals(providerName, command.getMessageProviderName());
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/SessionConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/SessionConfigTest.java
deleted file mode 100644
index 02cdbb8fca..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/SessionConfigTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.disttest.controller.config;
-
-import static org.apache.qpid.disttest.controller.config.ConfigTestUtils.assertCommandEquals;
-import static org.apache.qpid.disttest.controller.config.ConfigTestUtils.getCommand;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.Collections;
-import java.util.List;
-
-import javax.jms.Session;
-
-import org.apache.qpid.disttest.message.Command;
-import org.apache.qpid.disttest.message.CreateConsumerCommand;
-import org.apache.qpid.disttest.message.CreateProducerCommand;
-import org.apache.qpid.disttest.message.CreateSessionCommand;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class SessionConfigTest extends QpidTestCase
-{
-    private static final String CONNECTION_NAME = "conn1";
-    private static final String SESSION = "session1";
-
-    public void testSessionHasZeroArgConstructorForGson()
-    {
-        SessionConfig s = new SessionConfig();
-        assertNotNull(s);
-    }
-
-    public void testCreateCommandsForSessionAndChildren()
-    {
-        SessionConfig sessionConfig = createSessionConfigWithChildCommands();
-
-        List<Command> commands = sessionConfig.createCommands(CONNECTION_NAME);
-        assertEquals(3, commands.size());
-
-        assertCommandEquals(commands, 0, CreateSessionCommand.class);
-        assertCommandEquals(commands, 1, CreateProducerCommand.class);
-        assertCommandEquals(commands, 2, CreateConsumerCommand.class);
-
-        CreateSessionCommand createSessionCommand = getCommand(commands, 0);
-        assertEquals(Session.AUTO_ACKNOWLEDGE, createSessionCommand.getAcknowledgeMode());
-        assertEquals(SESSION, createSessionCommand.getSessionName());
-        assertEquals(CONNECTION_NAME, createSessionCommand.getConnectionName());
-    }
-
-    public void testGetTotalNumberOfParticipants()
-    {
-        SessionConfig sessionConfig = createSessionConfigWithOneConsumerAndOneProducer();
-        assertEquals(2, sessionConfig.getTotalNumberOfParticipants());
-    }
-
-    private SessionConfig createSessionConfigWithOneConsumerAndOneProducer()
-    {
-        return createSessionConfigWithChildCommands();
-    }
-
-    private SessionConfig createSessionConfigWithChildCommands()
-    {
-        ProducerConfig producerConfig = mock(ProducerConfig.class);
-        ConsumerConfig consumerConfig = mock(ConsumerConfig.class);
-
-        when(producerConfig.createCommand(SESSION)).thenReturn(mock(CreateProducerCommand.class));
-        when(consumerConfig.createCommand(SESSION)).thenReturn(mock(CreateConsumerCommand.class));
-
-        return new SessionConfig(SESSION,
-                                 Session.AUTO_ACKNOWLEDGE,
-                                 Collections.singletonList(consumerConfig),
-                                 Collections.singletonList(producerConfig));
-    }
-
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestConfigTest.java
deleted file mode 100644
index be7c7a7c8c..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestConfigTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * 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.disttest.controller.config;
-
-import static org.apache.qpid.disttest.controller.config.ConfigTestUtils.assertCommandForClient;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.qpid.disttest.controller.CommandForClient;
-import org.apache.qpid.disttest.message.NoOpCommand;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class TestConfigTest extends QpidTestCase
-{
-    private static final QueueConfig[] EMPTY_QUEUES_ARRAY = new QueueConfig[0];
-    private static final String CLIENT1 = "client1";
-    private static final String CLIENT2 = "client2";
-    private static final String TEST1 = "test1";
-
-    public void testConfigHasZeroArgConstructorForGson()
-    {
-        TestConfig c = new TestConfig();
-        assertNotNull(c);
-    }
-
-    public void testCreateCommandsForClient()
-    {
-        TestConfig config = createTestConfigWithClientConfigReturningChildCommands();
-
-        List<CommandForClient> commandsForClients = config.createCommands();
-        assertEquals("Unexpected number of commands for client", 3, commandsForClients.size());
-
-        assertCommandForClient(commandsForClients, 0, CLIENT1, NoOpCommand.class);
-        assertCommandForClient(commandsForClients, 1, CLIENT1, NoOpCommand.class);
-        assertCommandForClient(commandsForClients, 2, CLIENT2, NoOpCommand.class);
-    }
-
-    public void testGetClientNames()
-    {
-        TestConfig config = createTestConfigWithTwoClients();
-
-        assertEquals(2, config.getClientNames().size());
-    }
-
-    public void testGetTotalNumberOfClients()
-    {
-        TestConfig config = createTestConfigWithTwoClients();
-        assertEquals(2, config.getTotalNumberOfClients());
-    }
-
-    public void testGetTotalNumberOfParticipants()
-    {
-        TestConfig config = createTestConfigWithTwoClients();
-        assertEquals(2, config.getTotalNumberOfParticipants());
-    }
-
-    private TestConfig createTestConfigWithClientConfigReturningChildCommands()
-    {
-        ClientConfig clientConfig1 = createClientConfigReturningCommands(CLIENT1, 2);
-        ClientConfig clientConfig2 = createClientConfigReturningCommands(CLIENT2, 1);
-
-        TestConfig config = new TestConfig(TEST1, new ClientConfig[] { clientConfig1, clientConfig2 }, EMPTY_QUEUES_ARRAY);
-        return config;
-    }
-
-    private ClientConfig createClientConfigReturningCommands(final String clientName, int numberOfCommands)
-    {
-        ClientConfig clientConfig = mock(ClientConfig.class);
-
-        List<CommandForClient> commandList = new ArrayList<CommandForClient>();
-
-        for (int i = 1 ; i <= numberOfCommands; i++)
-        {
-            commandList.add(new CommandForClient(clientName, new NoOpCommand()));
-        }
-
-        when(clientConfig.createCommands()).thenReturn(commandList);
-        return clientConfig;
-    }
-
-    private TestConfig createTestConfigWithTwoClients()
-    {
-        ClientConfig clientConfig1 = mock(ClientConfig.class);
-        ClientConfig clientConfig2 = mock(ClientConfig.class);
-
-        when(clientConfig1.getTotalNumberOfParticipants()).thenReturn(1);
-        when(clientConfig2.getTotalNumberOfParticipants()).thenReturn(1);
-
-        TestConfig config = new TestConfig(TEST1, new ClientConfig[] { clientConfig1, clientConfig2 }, EMPTY_QUEUES_ARRAY);
-        return config;
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestInstanceTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestInstanceTest.java
deleted file mode 100644
index 187b57c399..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestInstanceTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.disttest.controller.config;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.qpid.disttest.controller.CommandForClient;
-import org.apache.qpid.disttest.message.CreateConsumerCommand;
-import org.apache.qpid.disttest.message.CreateProducerCommand;
-import org.apache.qpid.disttest.message.NoOpCommand;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class TestInstanceTest extends QpidTestCase
-{
-    private static final String CLIENT_NAME = "CLIENT_NAME";
-    private static final int ITERATION_NUMBER = 0;
-
-    private NoOpCommand _noOpCommand;
-    private CreateProducerCommand _createProducerCommand;
-    private CreateConsumerCommand _createConsumerCommand;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        _noOpCommand = mock(NoOpCommand.class);
-        _createProducerCommand = mock(CreateProducerCommand.class);
-        _createConsumerCommand = mock(CreateConsumerCommand.class);
-    }
-
-    public void testCreateCommandsWithIterationValues()
-    {
-        IterationValue iterationValue = mock(IterationValue.class);
-
-        TestConfig config = createTestConfig();
-
-        TestInstance testInstance = new TestInstance(config, ITERATION_NUMBER, iterationValue);
-
-        List<CommandForClient> commandsForClients = testInstance.createCommands();
-        assertEquals("Unexpected number of commands for client", 3, commandsForClients.size());
-
-        verify(iterationValue).applyToCommand(_noOpCommand);
-        verify(iterationValue).applyToCommand(_createProducerCommand);
-        verify(iterationValue).applyToCommand(_createConsumerCommand);
-    }
-
-    public void testCreateCommandsWithoutIterationValues()
-    {
-        TestConfig config = createTestConfig();
-        TestInstance testInstance = new TestInstance(config);
-
-        List<CommandForClient> commandsForClients = testInstance.createCommands();
-        assertEquals("Unexpected number of commands for client", 3, commandsForClients.size());
-    }
-
-    public void testGetConfiguredClientNames()
-    {
-        TestConfig testConfig = mock(TestConfig.class);
-        when(testConfig.getClientNames()).thenReturn(Collections.singletonList(CLIENT_NAME));
-        TestInstance testInstance = new TestInstance(testConfig);
-
-        List<String> clientNames = testInstance.getClientNames();
-        assertEquals(1, clientNames.size());
-        assertEquals(CLIENT_NAME, clientNames.get(0));
-    }
-
-    private TestConfig createTestConfig()
-    {
-        CommandForClient commandForClient1 = new CommandForClient(CLIENT_NAME, _noOpCommand);
-        CommandForClient commandForClient2 = new CommandForClient(CLIENT_NAME, _createProducerCommand);
-        CommandForClient commandForClient3 = new CommandForClient(CLIENT_NAME, _createConsumerCommand);
-
-        TestConfig config = mock(TestConfig.class);
-        when(config.createCommands()).thenReturn(Arrays.asList(commandForClient1, commandForClient2, commandForClient3));
-
-        return config;
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/sampleConfig.json b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/sampleConfig.json
deleted file mode 100644
index 9e1168129b..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/sampleConfig.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "_tests": [
-    {
-      "_name": "Test 1",
-      "_queues": [
-        {
-          "_name": "Json-Queue-Name",
-          "_durable": false,
-          "_attributes": {}
-        },
-        {
-          "_name": "Json Queue Name 2",
-          "_durable": true,
-          "_attributes": {
-            "x-qpid-priorities": 10.0
-          }
-        }
-      ],
-      "_iterations": [
-        {
-          "_messageSize": 100,
-          "_numberOfMessages": 10
-        },
-        {
-          "_messageSize": 200,
-          "_numberOfMessages": 5
-        }
-      ],
-      "_clients": [
-        {
-          "_connections": [
-            {
-              "_name": "connection1",
-              "_sessions": []
-            }
-          ];
-          "_messageProviders":[
-            {
-              "_name": "testProvider1";
-              "_messageProperties": {
-                 "priority": {"@def": "list"; "_items": [1,2,3,4,4]};
-                "id": {"@def": "random"; "_upper": 10};
-                "test": "test-value"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "_name": "Test 2",
-      "_queues": [
-        {
-          "_name": "Json-Queue-Name",
-          "_durable": false,
-          "_attributes": {}
-        }
-      ],
-      "_iterations": [],
-      "_clients": [
-        {
-          "_connections": [
-            {
-              "_name": "connection1",
-              "_sessions": []
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/db/ResultsDbWriterTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/db/ResultsDbWriterTest.java
deleted file mode 100644
index abc6b44493..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/db/ResultsDbWriterTest.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * 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.disttest.db;
-
-import static org.apache.qpid.disttest.message.ParticipantAttribute.ITERATION_NUMBER;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.PARTICIPANT_NAME;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.TEST_NAME;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.THROUGHPUT;
-import static org.apache.qpid.test.utils.TestFileUtils.createTestDirectory;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.File;
-import java.sql.Connection;
-import java.sql.Driver;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.sql.Timestamp;
-import java.util.Hashtable;
-import java.util.TimeZone;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.apache.qpid.disttest.controller.ResultsForAllTests;
-import org.apache.qpid.disttest.db.ResultsDbWriter.Clock;
-import org.apache.qpid.disttest.message.ParticipantResult;
-import org.apache.qpid.disttest.results.ResultsTestFixture;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.util.FileUtils;
-
-public class ResultsDbWriterTest extends QpidTestCase
-{
-    private static final long _dummyTimestamp = 1234;
-
-    private File _tempDbDirectory;
-    private Clock _clock = mock(Clock.class);
-    private ResultsTestFixture _resultsTestFixture = new ResultsTestFixture();
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        _tempDbDirectory = createTestDirectory();
-        when(_clock.currentTimeMillis()).thenReturn(_dummyTimestamp);
-    }
-
-
-    @Override
-    protected void tearDown() throws Exception
-    {
-        try
-        {
-            FileUtils.deleteDirectory(_tempDbDirectory.getAbsolutePath());
-        }
-        finally
-        {
-            super.tearDown();
-        }
-    }
-
-
-    public void testWriteResults() throws Exception
-    {
-        Context context = getContext();
-        ResultsForAllTests results = _resultsTestFixture.createResultsForAllTests();
-        String runId = "myRunId";
-
-        ResultsDbWriter resultsDbWriter = new ResultsDbWriter(context, runId, _clock);
-        resultsDbWriter.createResultsTableIfNecessary();
-
-        resultsDbWriter.writeResults(results);
-
-        ParticipantResult expectedResult = _resultsTestFixture.getFirstParticipantResult(results);
-        assertResultsAreInDb(context, expectedResult, runId);
-    }
-
-    public void testDefaultRunId() throws Exception
-    {
-        TimeZone defaultTimeZone = TimeZone.getDefault();
-        try
-        {
-            // set non-GMT timezone to make the test more rigorous.
-            TimeZone.setDefault(TimeZone.getTimeZone("GMT-05:00"));
-            ResultsDbWriter resultsDbWriter = new ResultsDbWriter(getContext(), null, _clock);
-            String runId = resultsDbWriter.getRunId();
-            assertEquals(
-                    "Default run id '" + runId + "' should correspond to dummy timestamp " + _clock.currentTimeMillis(),
-                    "run 1970-01-01 00:00:01.234",
-                    runId);
-        }
-        finally
-        {
-            TimeZone.setDefault(defaultTimeZone);
-        }
-    }
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    private Context getContext() throws NamingException
-    {
-        Context context = mock(Context.class);
-        Hashtable environment = new Hashtable();
-
-        environment.put(ResultsDbWriter.DRIVER_NAME, "org.apache.derby.jdbc.EmbeddedDriver");
-        environment.put(ResultsDbWriter.URL, "jdbc:derby:" + _tempDbDirectory + "perftestResultsDb;create=true");
-
-        when(context.getEnvironment()).thenReturn(environment);
-        return context;
-    }
-
-    @SuppressWarnings("unchecked")
-    private void assertResultsAreInDb(Context context, ParticipantResult participantResult, String expectedRunId) throws Exception
-    {
-        String driverName = (String) context.getEnvironment().get(ResultsDbWriter.DRIVER_NAME);
-        Class<? extends Driver> driverClass = (Class<? extends Driver>) Class.forName(driverName);
-        driverClass.newInstance();
-        String url = (String) context.getEnvironment().get(ResultsDbWriter.URL);
-
-        Connection connection = DriverManager.getConnection(url);
-        Statement statement = connection.createStatement();
-        ResultSet rs = statement.executeQuery(
-                "SELECT * FROM results WHERE testName='" + participantResult.getTestName() +
-                "' AND runId='" + expectedRunId + "'");
-
-        try
-        {
-            rs.next();
-            assertEquals(participantResult.getTestName(), rs.getString(TEST_NAME.getDisplayName()));
-            assertEquals(participantResult.getIterationNumber(), rs.getInt(ITERATION_NUMBER.getDisplayName()));
-            assertEquals(participantResult.getParticipantName(), rs.getString(PARTICIPANT_NAME.getDisplayName()));
-            assertEquals(participantResult.getThroughput(), rs.getDouble(THROUGHPUT.getDisplayName()));
-            assertEquals(expectedRunId, rs.getString(ResultsDbWriter.RUN_ID));
-            assertEquals(new Timestamp(_dummyTimestamp), rs.getTimestamp(ResultsDbWriter.INSERTED_TIMESTAMP));
-        }
-        finally
-        {
-            connection.close();
-        }
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/jms/JmsMessageAdaptorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/jms/JmsMessageAdaptorTest.java
deleted file mode 100644
index d4f0cb1f22..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/jms/JmsMessageAdaptorTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.disttest.jms;
-
-import org.apache.qpid.disttest.message.Command;
-import org.apache.qpid.disttest.message.CommandType;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class JmsMessageAdaptorTest extends QpidTestCase
-{
-
-    public void testCheckAllCommandTypes()
-    {
-        for (CommandType commandType : CommandType.values())
-        {
-            Class<? extends Command> clazz = JmsMessageAdaptor.getCommandClassFromType(commandType);
-            assertNotNull(clazz);
-
-        }
-
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/message/JsonHandlerTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/message/JsonHandlerTest.java
deleted file mode 100644
index 2e0c2e1ecd..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/message/JsonHandlerTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * 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.disttest.message;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.qpid.disttest.client.property.ListPropertyValue;
-import org.apache.qpid.disttest.client.property.PropertyValue;
-import org.apache.qpid.disttest.json.JsonHandler;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class JsonHandlerTest extends QpidTestCase
-{
-    private JsonHandler _jsonHandler = null;
-    private SendChristmasCards _testCommand = null;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-
-        _jsonHandler = new JsonHandler();
-
-        _testCommand = new SendChristmasCards(CommandType.START_TEST, Collections.singletonMap(SendChristmasCards.CardType.FUNNY, 5));
-        _testCommand.persons = Arrays.asList(new Person("Phil"), new Person("Andrew"));
-    }
-
-    public void testMarshallUnmarshall() throws Exception
-    {
-        final String jsonString = _jsonHandler.marshall(_testCommand);
-
-        final SendChristmasCards unmarshalledCommand = _jsonHandler.unmarshall(jsonString, SendChristmasCards.class);
-
-        assertEquals("Unmarshalled command should be equal to the original object", _testCommand, unmarshalledCommand);
-    }
-
-    public void testGeneratorDesrialization()
-    {
-        String json = "{_messageProperties: {test: 1; generator: {'@def': 'list'; _cyclic: false; _items: ['first', " +
-                "{'@def': 'range'; _upper:10; '_type':'int'}]}}}";
-        final TestCommand unmarshalledCommand = _jsonHandler.unmarshall(json, TestCommand.class);
-        Map<String, PropertyValue> properties = unmarshalledCommand.getMessageProperties();
-        assertNotNull("Properties should not be null", properties);
-        assertFalse("Properties should not be empty", properties.isEmpty());
-        assertEquals("Unexpected properties size", 2, properties.size());
-        PropertyValue testProperty = properties.get("test");
-        assertNotNull("Unexpected property test", testProperty);
-        assertTrue("Unexpected property test", testProperty.getValue() instanceof Number);
-        assertEquals("Unexpected property value", 1, ((Number)testProperty.getValue()).intValue());
-        Object generatorObject = properties.get("generator");
-        assertTrue("Unexpected generator object", generatorObject instanceof ListPropertyValue);
-        PropertyValue generator = (PropertyValue)generatorObject;
-        assertEquals("Unexpected generator value", "first", generator.getValue());
-        for (int i = 0; i < 10; i++)
-        {
-            assertEquals("Unexpected generator value", new Integer(i), generator.getValue());
-        }
-        String newJson =_jsonHandler.marshall(unmarshalledCommand);
-        final TestCommand newUnmarshalledCommand = _jsonHandler.unmarshall(newJson, TestCommand.class);
-        assertEquals("Unmarshalled command should be equal to the original object", unmarshalledCommand, newUnmarshalledCommand);
-    }
-
-    /**
-     * A {@link Command} designed to exercise {@link JsonHandler}, e.g does it handle a map of enums?.
-     *
-     * This class is non-private to avoid auto-deletion of "unused" fields/methods
-     */
-    static class SendChristmasCards extends Command
-    {
-        enum CardType {FUNNY, TRADITIONAL}
-
-        private Map<CardType, Integer> _cardTypes;
-        private List<Person> persons;
-
-        public SendChristmasCards(final CommandType type, Map<CardType, Integer> cardTypes)
-        {
-            super(type);
-            _cardTypes = cardTypes;
-        }
-
-        public Map<CardType, Integer> getCardTypes()
-        {
-            return _cardTypes;
-        }
-
-        public List<Person> getPersons()
-        {
-            return persons;
-        }
-
-        @Override
-        public boolean equals(final Object obj)
-        {
-            return EqualsBuilder.reflectionEquals(this, obj);
-        }
-    }
-
-    /**
-     * This class is non-private to avoid auto-deletion of "unused" fields/methods
-     */
-    static class Person
-    {
-        private String _firstName;
-
-        public Person(final String firstName)
-        {
-            _firstName = firstName;
-        }
-
-        public String getFirstName()
-        {
-            return _firstName;
-        }
-
-        @Override
-        public boolean equals(final Object obj)
-        {
-            return EqualsBuilder.reflectionEquals(this, obj);
-        }
-
-    }
-
-    /**
-     * Yet another test class
-     */
-    static class TestCommand extends Command
-    {
-
-        private Map<String, PropertyValue> _messageProperties;
-
-        public TestCommand(CommandType type)
-        {
-            super(type);
-        }
-
-        public Map<String, PropertyValue> getMessageProperties()
-        {
-            return _messageProperties;
-        }
-
-        public void setMessageProperties(Map<String, PropertyValue> _messageProperties)
-        {
-            this._messageProperties = _messageProperties;
-        }
-
-        @Override
-        public boolean equals(final Object obj)
-        {
-            if (obj == null || !(obj instanceof TestCommand))
-            {
-                return false;
-            }
-            TestCommand other = (TestCommand)obj;
-            if (_messageProperties == null && other._messageProperties != null )
-            {
-                return false;
-            }
-            return _messageProperties.equals(other._messageProperties);
-        }
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/message/ParticipantResultTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/message/ParticipantResultTest.java
deleted file mode 100644
index e9d444d59c..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/message/ParticipantResultTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * 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.disttest.message;
-
-import static org.apache.qpid.disttest.message.ParticipantAttribute.ACKNOWLEDGE_MODE;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.BATCH_SIZE;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.CONFIGURED_CLIENT_NAME;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.DELIVERY_MODE;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.ERROR_MESSAGE;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_BROWSING_SUBSCRIPTION;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_DURABLE_SUBSCRIPTION;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_NO_LOCAL;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_SELECTOR;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_SYNCHRONOUS_CONSUMER;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_TOPIC;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.ITERATION_NUMBER;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.MAXIMUM_DURATION;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.NUMBER_OF_MESSAGES_PROCESSED;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.PARTICIPANT_NAME;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.PAYLOAD_SIZE;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.PRIORITY;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.PRODUCER_INTERVAL;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.PRODUCER_START_DELAY;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.TEST_NAME;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.TIME_TAKEN;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.TIME_TO_LIVE;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.TOTAL_NUMBER_OF_CONSUMERS;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.TOTAL_NUMBER_OF_PRODUCERS;
-
-import java.util.Date;
-
-import javax.jms.DeliveryMode;
-
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ParticipantResultTest extends QpidTestCase
-{
-
-    public void testSharedParticipantResultAttributes() throws Exception
-    {
-        final String participantName = "PARTICIPANT_NAME1";
-        final String testName = "TEST_NAME1";
-        String clientConfiguredName = "CLIENT_CONFIGURED_NAME";
-        String errorMessage = "errorMessage";
-        int iterationNumber = 1;
-
-        ParticipantResult result = new ParticipantResult();
-
-        long numberOfMessages = 500;
-        long timeTaken = 30;
-        int batchSize = 10;
-
-        long startTime = System.currentTimeMillis();
-        long endTime = startTime + timeTaken;
-        long maximumDuration = 1000;
-
-        int totalNumberOfConsumers = 1;
-        int totalNumberOfProducers = 1;
-
-        int acknowledgeMode = 1;
-
-        result.setParticipantName(participantName);
-        result.setTestName(testName);
-        result.setIterationNumber(iterationNumber);
-        result.setConfiguredClientName(clientConfiguredName);
-
-        result.setAcknowledgeMode(acknowledgeMode);
-        result.setNumberOfMessagesProcessed(numberOfMessages);
-        result.setConfiguredClientName(clientConfiguredName);
-        result.setBatchSize(batchSize);
-
-        result.setStartDate(new Date(startTime));
-        result.setEndDate(new Date(endTime));
-        result.setMaximumDuration(maximumDuration);
-
-        result.setTotalNumberOfConsumers(totalNumberOfConsumers);
-        result.setTotalNumberOfProducers(totalNumberOfProducers);
-
-        result.setErrorMessage(errorMessage);
-
-        assertEquals(participantName,      result.getAttributes().get(PARTICIPANT_NAME));
-        assertEquals(testName,             result.getAttributes().get(TEST_NAME));
-        assertEquals(iterationNumber,         result.getAttributes().get(ITERATION_NUMBER));
-        assertEquals(clientConfiguredName,   result.getAttributes().get(CONFIGURED_CLIENT_NAME));
-        assertEquals(numberOfMessages,       result.getAttributes().get(NUMBER_OF_MESSAGES_PROCESSED));
-        assertEquals(timeTaken,              result.getAttributes().get(TIME_TAKEN));
-        assertEquals(timeTaken,              result.getAttributes().get(TIME_TAKEN));
-        assertEquals(timeTaken,              result.getAttributes().get(TIME_TAKEN));
-        assertEquals(batchSize,              result.getAttributes().get(BATCH_SIZE));
-        assertEquals(maximumDuration,        result.getAttributes().get(MAXIMUM_DURATION));
-        assertEquals(totalNumberOfConsumers, result.getAttributes().get(TOTAL_NUMBER_OF_CONSUMERS));
-        assertEquals(totalNumberOfProducers, result.getAttributes().get(TOTAL_NUMBER_OF_PRODUCERS));
-        assertEquals(acknowledgeMode,        result.getAttributes().get(ACKNOWLEDGE_MODE));
-        assertEquals(errorMessage,           result.getAttributes().get(ERROR_MESSAGE));
-    }
-
-    public void testConsumerParticipantResultAttributes() throws Exception
-    {
-        ConsumerParticipantResult result = new ConsumerParticipantResult();
-
-        boolean topic = true;
-        boolean durable = true;
-        boolean browsingSubscription = false;
-        boolean selector = true;
-        boolean noLocal = false;
-        boolean synchronousConsumer = true;
-
-        result.setTopic(topic);
-        result.setDurableSubscription(durable);
-        result.setBrowsingSubscription(browsingSubscription);
-        result.setSelector(selector);
-        result.setNoLocal(noLocal);
-        result.setSynchronousConsumer(synchronousConsumer);
-
-        assertEquals(topic,                  result.getAttributes().get(IS_TOPIC));
-        assertEquals(durable,                result.getAttributes().get(IS_DURABLE_SUBSCRIPTION));
-        assertEquals(browsingSubscription,   result.getAttributes().get(IS_BROWSING_SUBSCRIPTION));
-        assertEquals(selector,               result.getAttributes().get(IS_SELECTOR));
-        assertEquals(noLocal,                result.getAttributes().get(IS_NO_LOCAL));
-        assertEquals(synchronousConsumer,    result.getAttributes().get(IS_SYNCHRONOUS_CONSUMER));
-    }
-
-    public void testProducerParticipantResultAttributes() throws Exception
-    {
-        ProducerParticipantResult result = new ProducerParticipantResult();
-
-        int priority = 2;
-        long timeToLive = 30;
-        long producerStartDelay = 40;
-        long producerInterval = 50;
-        int messageSize = 60;
-        int deliveryMode = DeliveryMode.PERSISTENT;
-
-        result.setPriority(priority);
-        result.setTimeToLive(timeToLive);
-        result.setStartDelay(producerStartDelay);
-        result.setInterval(producerInterval);
-        result.setPayloadSize(messageSize);
-        result.setDeliveryMode(deliveryMode);
-
-
-        assertEquals(priority,           result.getAttributes().get(PRIORITY));
-        assertEquals(timeToLive,         result.getAttributes().get(TIME_TO_LIVE));
-        assertEquals(producerStartDelay, result.getAttributes().get(PRODUCER_START_DELAY));
-        assertEquals(producerInterval,   result.getAttributes().get(PRODUCER_INTERVAL));
-        assertEquals(messageSize,        result.getAttributes().get(PAYLOAD_SIZE));
-        assertEquals(deliveryMode,       result.getAttributes().get(DELIVERY_MODE));
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsFileWriterTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsFileWriterTest.java
deleted file mode 100644
index db306ea1a4..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsFileWriterTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * 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.disttest.results;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.File;
-import java.util.Arrays;
-
-import org.apache.qpid.disttest.controller.ResultsForAllTests;
-import org.apache.qpid.disttest.results.ResultsCsvWriter;
-import org.apache.qpid.disttest.results.aggregation.TestResultAggregator;
-import org.apache.qpid.disttest.results.formatting.CSVFormatter;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.test.utils.TestFileUtils;
-import org.apache.qpid.util.FileUtils;
-
-public class ResultsFileWriterTest extends QpidTestCase
-{
-    private CSVFormatter _csvFormater = mock(CSVFormatter.class);
-    private TestResultAggregator _testResultAggregator = mock(TestResultAggregator.class);
-
-    private File _outputDir = TestFileUtils.createTestDirectory();
-
-    private ResultsCsvWriter _resultsFileWriter = new ResultsCsvWriter(_outputDir);
-
-    @Override
-    public void setUp()
-    {
-        _resultsFileWriter.setCsvFormater(_csvFormater);
-        _resultsFileWriter.setTestResultAggregator(_testResultAggregator);
-    }
-
-    public void testWriteResultsToFile()
-    {
-        ResultsForAllTests resultsForAllTests = mock(ResultsForAllTests.class);
-
-        String expectedCsvContents = "expected-csv-contents";
-        when(_csvFormater.format(resultsForAllTests)).thenReturn(expectedCsvContents);
-
-        _resultsFileWriter.writeResults(resultsForAllTests, "config.json");
-
-        File resultsFile = new File(_outputDir, "config.csv");
-
-        assertEquals(expectedCsvContents, FileUtils.readFileAsString(resultsFile));
-    }
-
-    public void testWriteResultsSummary()
-    {
-        ResultsForAllTests results1 = mock(ResultsForAllTests.class);
-        ResultsForAllTests results2 = mock(ResultsForAllTests.class);
-        ResultsForAllTests summaryResults = mock(ResultsForAllTests.class);
-
-        when(_testResultAggregator.aggregateTestResults(Arrays.asList(results1, results2)))
-            .thenReturn(summaryResults);
-
-        String expectedSummaryFileContents = "expected-summary-file";
-
-        when(_csvFormater.format(summaryResults))
-            .thenReturn(expectedSummaryFileContents);
-
-        _resultsFileWriter.writeResultsSummary(Arrays.asList(results1, results2));
-
-        File summaryFile = new File(_outputDir, ResultsCsvWriter.TEST_SUMMARY_FILE_NAME);
-
-        assertEquals(expectedSummaryFileContents, FileUtils.readFileAsString(summaryFile));
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsTestFixture.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsTestFixture.java
deleted file mode 100644
index 1edef031bf..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsTestFixture.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * 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.disttest.results;
-
-import static org.apache.qpid.disttest.message.ParticipantAttribute.ACKNOWLEDGE_MODE;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.AVERAGE_LATENCY;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.BATCH_SIZE;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.CONFIGURED_CLIENT_NAME;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.DELIVERY_MODE;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.ERROR_MESSAGE;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_BROWSING_SUBSCRIPTION;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_DURABLE_SUBSCRIPTION;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_NO_LOCAL;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_SELECTOR;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_SYNCHRONOUS_CONSUMER;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_TOPIC;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.ITERATION_NUMBER;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.LATENCY_STANDARD_DEVIATION;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.MAXIMUM_DURATION;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.MAX_LATENCY;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.MESSAGE_THROUGHPUT;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.MIN_LATENCY;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.NUMBER_OF_MESSAGES_PROCESSED;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.PARTICIPANT_NAME;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.PAYLOAD_SIZE;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.PRIORITY;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.PRODUCER_INTERVAL;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.PRODUCER_START_DELAY;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.TEST_NAME;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.THROUGHPUT;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.TIME_TAKEN;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.TIME_TO_LIVE;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.TOTAL_NUMBER_OF_CONSUMERS;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.TOTAL_NUMBER_OF_PRODUCERS;
-import static org.apache.qpid.disttest.message.ParticipantAttribute.TOTAL_PAYLOAD_PROCESSED;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.qpid.disttest.controller.ResultsForAllTests;
-import org.apache.qpid.disttest.controller.TestResult;
-import org.apache.qpid.disttest.message.ParticipantAttribute;
-import org.apache.qpid.disttest.message.ParticipantResult;
-import org.apache.qpid.disttest.results.aggregation.ITestResult;
-
-public class ResultsTestFixture
-{
-    public static final double THROUGHPUT_VALUE = 2048.49;
-
-    private static final String TEST1 = "TEST1";
-    private static final String PARTICIPANT = "PARTICIPANT";
-    private static final String CONFIGURED_CLIENT1 = "CONFIGURED_CLIENT1";
-
-    public ResultsForAllTests createResultsForAllTests()
-    {
-        ParticipantResult participantResult = mock(ParticipantResult.class);
-        Map<ParticipantAttribute, Object> participantAttributes = getParticipantAttributes();
-
-        when(participantResult.getAttributes()).thenReturn(participantAttributes);
-        when(participantResult.getParticipantName()).thenReturn(PARTICIPANT);
-        when(participantResult.getTestName()).thenReturn(TEST1);
-        when(participantResult.getIterationNumber()).thenReturn(0);
-        when(participantResult.getThroughput()).thenReturn(THROUGHPUT_VALUE);
-
-        TestResult testResult = new TestResult(TEST1);
-        testResult.addParticipantResult(participantResult);
-
-        ResultsForAllTests resultsForAllTests = new ResultsForAllTests();
-        resultsForAllTests.add(testResult);
-        return resultsForAllTests;
-    }
-
-    private Map<ParticipantAttribute, Object> getParticipantAttributes()
-    {
-        Map<ParticipantAttribute, Object> participantAttributes = new HashMap<ParticipantAttribute, Object>();
-
-        participantAttributes.put(TEST_NAME, TEST1);
-        participantAttributes.put(ITERATION_NUMBER, 0);
-        participantAttributes.put(CONFIGURED_CLIENT_NAME, CONFIGURED_CLIENT1);
-        participantAttributes.put(PARTICIPANT_NAME, PARTICIPANT);
-        participantAttributes.put(NUMBER_OF_MESSAGES_PROCESSED, 2);
-        participantAttributes.put(PAYLOAD_SIZE, 1);
-        participantAttributes.put(PRIORITY, 2);
-        participantAttributes.put(TIME_TO_LIVE, 3);
-        participantAttributes.put(ACKNOWLEDGE_MODE, 4);
-        participantAttributes.put(DELIVERY_MODE, 5);
-        participantAttributes.put(BATCH_SIZE, 6);
-        participantAttributes.put(MAXIMUM_DURATION, 7);
-        participantAttributes.put(PRODUCER_START_DELAY, 8);
-        participantAttributes.put(PRODUCER_INTERVAL, 9);
-        participantAttributes.put(IS_TOPIC, true);
-        participantAttributes.put(IS_DURABLE_SUBSCRIPTION, false);
-        participantAttributes.put(IS_BROWSING_SUBSCRIPTION, true);
-        participantAttributes.put(IS_SELECTOR, false);
-        participantAttributes.put(IS_NO_LOCAL, true);
-        participantAttributes.put(IS_SYNCHRONOUS_CONSUMER, false);
-        participantAttributes.put(TOTAL_NUMBER_OF_CONSUMERS, 1);
-        participantAttributes.put(TOTAL_NUMBER_OF_PRODUCERS, 2);
-        participantAttributes.put(TOTAL_PAYLOAD_PROCESSED, 1024);
-        participantAttributes.put(THROUGHPUT, THROUGHPUT_VALUE);
-        participantAttributes.put(TIME_TAKEN, 1000);
-        participantAttributes.put(ERROR_MESSAGE, "error");
-        participantAttributes.put(MIN_LATENCY, 2l);
-        participantAttributes.put(MAX_LATENCY, 9l);
-        participantAttributes.put(AVERAGE_LATENCY, 4.6f);
-        participantAttributes.put(LATENCY_STANDARD_DEVIATION, 2.0f);
-        participantAttributes.put(MESSAGE_THROUGHPUT, 2);
-        return participantAttributes;
-    }
-
-    public ParticipantResult getFirstParticipantResult(ResultsForAllTests results)
-    {
-        List<ITestResult> testResults = results.getTestResults();
-        ITestResult testResult = testResults.iterator().next();
-        List<ParticipantResult> participantResults = testResult.getParticipantResults();
-        return participantResults.iterator().next();
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/AggregatorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/AggregatorTest.java
deleted file mode 100644
index 011eb4e68b..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/AggregatorTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.disttest.results.aggregation;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-
-import org.apache.qpid.disttest.controller.ResultsForAllTests;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class AggregatorTest extends QpidTestCase
-{
-    private Aggregator _aggregator = new Aggregator();
-    private TestResultAggregator _testResultAggregator = mock(TestResultAggregator.class);
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        _aggregator.setTestResultAggregator(_testResultAggregator);
-    }
-
-    public void testAggregrateManyTestResults() throws Exception
-    {
-        ResultsForAllTests resultsForAllTests = mock(ResultsForAllTests.class);
-        ITestResult testResult1 = mock(ITestResult.class);
-        ITestResult testResult2 = mock(ITestResult.class);
-
-        when(resultsForAllTests.getTestResults()).thenReturn(Arrays.asList(testResult1, testResult2));
-        when(_testResultAggregator.aggregateTestResult(testResult1)).thenReturn(mock(AggregatedTestResult.class));
-        when(_testResultAggregator.aggregateTestResult(testResult2)).thenReturn(mock(AggregatedTestResult.class));
-
-        ResultsForAllTests aggregatedResultsForAllTests = _aggregator.aggregateResults(resultsForAllTests);
-        assertEquals(2, aggregatedResultsForAllTests.getTestResults().size());
-
-        verify(_testResultAggregator).aggregateTestResult(testResult1);
-        verify(_testResultAggregator).aggregateTestResult(testResult2);
-
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregatorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregatorTest.java
deleted file mode 100644
index 41da1edb33..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregatorTest.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * 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.disttest.results.aggregation;
-
-import java.util.Date;
-
-import javax.jms.Session;
-
-import org.apache.qpid.disttest.message.ParticipantResult;
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class ParticipantResultAggregatorTest extends QpidTestCase
-{
-    private ParticipantResultAggregator _aggregator = new ParticipantResultAggregator(ParticipantResult.class, AGGREGATED_RESULT_NAME);
-
-    private static final String TEST_NAME = "TEST_NAME";
-    private static final String AGGREGATED_RESULT_NAME = "AGGREGATED_RESULT_NAME";
-    private static final int TEST_ITERATION_NUMBER = 1;
-
-    private static final long PARTICIPANT1_STARTDATE = 50;
-    private static final long PARTICIPANT1_ENDDATE = 20000;
-    private static final long PARTICIPANT1_TOTAL_PROCESSED = 1024;
-    private static final int PARTICIPANT1_NUMBER_OF_MESSAGES_PROCESSED = 20000;
-
-    private static final long PARTICIPANT2_STARTDATE = 100;
-    private static final long PARTICIPANT2_ENDDATE = 21000;
-    private static final long PARTICIPANT2_TOTAL_PROCESSED = 2048;
-    private static final int PARTICIPANT2_NUMBER_OF_MESSAGES_PROCESSED = 950;
-
-    private static final long OVERALL_PROCESSED = PARTICIPANT1_TOTAL_PROCESSED + PARTICIPANT2_TOTAL_PROCESSED;
-    private static final double OVERALL_TIMETAKEN = PARTICIPANT2_ENDDATE - PARTICIPANT1_STARTDATE;
-    private static final long OVERALL_NUMBER_OF_MESSAGES_PROCESSED = PARTICIPANT1_NUMBER_OF_MESSAGES_PROCESSED + PARTICIPANT2_NUMBER_OF_MESSAGES_PROCESSED;
-
-    private static final double EXPECTED_AGGREGATED_ALL_THROUGHPUT = ((OVERALL_PROCESSED)/1024)/((OVERALL_TIMETAKEN)/1000);
-    private static final int EXPECTED_AGGREGATED_MESSAGE_THROUGHPUT = (int)(OVERALL_NUMBER_OF_MESSAGES_PROCESSED * 1000.0d/OVERALL_TIMETAKEN);
-
-    public void testStartAndEndDateForOneParticipantResult()
-    {
-        ParticipantResult result = new ParticipantResult();
-        result.setStartDate(new Date(PARTICIPANT1_STARTDATE));
-        result.setEndDate(new Date(PARTICIPANT1_ENDDATE));
-
-        _aggregator.aggregate(result);
-        ParticipantResult aggregratedResult = _aggregator.getAggregatedResult();
-        assertEquals(PARTICIPANT1_STARTDATE, aggregratedResult.getStartInMillis());
-        assertEquals(PARTICIPANT1_ENDDATE, aggregratedResult.getEndInMillis());
-    }
-
-    public void testStartAndEndDateForTwoParticipantResults()
-    {
-        ParticipantResult result1 = new ParticipantResult();
-        result1.setStartDate(new Date(PARTICIPANT1_STARTDATE));
-        result1.setEndDate(new Date(PARTICIPANT1_ENDDATE));
-
-        ParticipantResult result2 = new ParticipantResult();
-        result2.setStartDate(new Date(PARTICIPANT2_STARTDATE));
-        result2.setEndDate(new Date(PARTICIPANT2_ENDDATE));
-
-        _aggregator.aggregate(result1);
-        _aggregator.aggregate(result2);
-
-        ParticipantResult aggregratedResult = _aggregator.getAggregatedResult();
-        assertEquals(PARTICIPANT1_STARTDATE, aggregratedResult.getStartInMillis());
-        assertEquals(PARTICIPANT2_ENDDATE, aggregratedResult.getEndInMillis());
-    }
-
-    public void testComputeNumberOfMessagesProcessed()
-    {
-        ParticipantResult result1 = new ParticipantResult();
-        result1.setNumberOfMessagesProcessed(10);
-
-        ParticipantResult result2 = new ParticipantResult();
-        result2.setNumberOfMessagesProcessed(15);
-
-        _aggregator.aggregate(result1);
-        _aggregator.aggregate(result2);
-
-        ParticipantResult aggregratedResult = _aggregator.getAggregatedResult();
-        assertEquals(25, aggregratedResult.getNumberOfMessagesProcessed());
-    }
-
-    public void testComputeTotalPayloadProcessed()
-    {
-        ParticipantResult result1 = new ParticipantResult();
-        result1.setTotalPayloadProcessed(PARTICIPANT1_TOTAL_PROCESSED);
-
-        ParticipantResult result2 = new ParticipantResult();
-        result2.setTotalPayloadProcessed(PARTICIPANT2_TOTAL_PROCESSED);
-
-        _aggregator.aggregate(result1);
-        _aggregator.aggregate(result2);
-
-        ParticipantResult aggregratedResult = _aggregator.getAggregatedResult();
-        assertEquals(OVERALL_PROCESSED, aggregratedResult.getTotalPayloadProcessed());
-    }
-
-    public void testComputeThroughput()
-    {
-        ParticipantResult result1 = new ParticipantResult();
-        result1.setStartDate(new Date(PARTICIPANT1_STARTDATE));
-        result1.setEndDate(new Date(PARTICIPANT1_ENDDATE));
-        result1.setTotalPayloadProcessed(PARTICIPANT1_TOTAL_PROCESSED);
-
-        ParticipantResult result2 = new ParticipantResult();
-        result2.setStartDate(new Date(PARTICIPANT2_STARTDATE));
-        result2.setEndDate(new Date(PARTICIPANT2_ENDDATE));
-        result2.setTotalPayloadProcessed(PARTICIPANT2_TOTAL_PROCESSED);
-
-        _aggregator.aggregate(result1);
-        _aggregator.aggregate(result2);
-
-        ParticipantResult aggregratedResult = _aggregator.getAggregatedResult();
-        assertEquals(EXPECTED_AGGREGATED_ALL_THROUGHPUT, aggregratedResult.getThroughput(), 0.1);
-    }
-
-    public void testComputeMessageThroughput()
-    {
-        ParticipantResult result1 = new ParticipantResult();
-        result1.setStartDate(new Date(PARTICIPANT1_STARTDATE));
-        result1.setEndDate(new Date(PARTICIPANT1_ENDDATE));
-        result1.setNumberOfMessagesProcessed(PARTICIPANT1_NUMBER_OF_MESSAGES_PROCESSED);
-
-        ParticipantResult result2 = new ParticipantResult();
-        result2.setStartDate(new Date(PARTICIPANT2_STARTDATE));
-        result2.setEndDate(new Date(PARTICIPANT2_ENDDATE));
-        result2.setNumberOfMessagesProcessed(PARTICIPANT2_NUMBER_OF_MESSAGES_PROCESSED);
-
-        _aggregator.aggregate(result1);
-        _aggregator.aggregate(result2);
-
-        ParticipantResult aggregratedResult = _aggregator.getAggregatedResult();
-        assertEquals(EXPECTED_AGGREGATED_MESSAGE_THROUGHPUT, aggregratedResult.getMessageThroughput());
-
-    }
-
-    public void testConstantTestNameAndIterationNumberRolledUp() throws Exception
-    {
-        ParticipantResult result1 = new ParticipantResult();
-        result1.setTestName(TEST_NAME);
-        result1.setIterationNumber(TEST_ITERATION_NUMBER);
-
-        ParticipantResult result2 = new ParticipantResult();
-        result2.setTestName(TEST_NAME);
-        result2.setIterationNumber(TEST_ITERATION_NUMBER);
-
-        _aggregator.aggregate(result1);
-        _aggregator.aggregate(result2);
-
-        ParticipantResult aggregratedResult = _aggregator.getAggregatedResult();
-        assertEquals(TEST_ITERATION_NUMBER, aggregratedResult.getIterationNumber());
-        assertEquals(TEST_NAME, aggregratedResult.getTestName());
-    }
-
-    public void testConstantPayloadSizesRolledUp() throws Exception
-    {
-        final int payloadSize = 1024;
-
-        ParticipantResult result1 = new ParticipantResult();
-        result1.setPayloadSize(payloadSize);
-
-        ParticipantResult result2 = new ParticipantResult();
-        result2.setPayloadSize(payloadSize);
-
-        _aggregator.aggregate(result1);
-        _aggregator.aggregate(result2);
-
-        ParticipantResult aggregratedResult = _aggregator.getAggregatedResult();
-        assertEquals(payloadSize, aggregratedResult.getPayloadSize());
-    }
-
-    public void testDifferingPayloadSizesNotRolledUp() throws Exception
-    {
-        final int payload1Size = 1024;
-        final int payload2Size = 2048;
-
-        ParticipantResult result1 = new ParticipantResult();
-        result1.setPayloadSize(payload1Size);
-
-        ParticipantResult result2 = new ParticipantResult();
-        result2.setPayloadSize(payload2Size);
-
-        _aggregator.aggregate(result1);
-        _aggregator.aggregate(result2);
-
-        ParticipantResult aggregratedResult = _aggregator.getAggregatedResult();
-        assertEquals(0, aggregratedResult.getPayloadSize());
-    }
-
-    public void testConstantBatchSizesRolledUp() throws Exception
-    {
-        final int batchSize = 10;
-
-        ParticipantResult result1 = new ParticipantResult();
-        result1.setBatchSize(batchSize);
-
-        ParticipantResult result2 = new ParticipantResult();
-        result2.setBatchSize(batchSize);
-
-        _aggregator.aggregate(result1);
-        _aggregator.aggregate(result2);
-
-        ParticipantResult aggregratedResult = _aggregator.getAggregatedResult();
-        assertEquals(batchSize, aggregratedResult.getBatchSize());
-    }
-
-    public void testDifferingBatchSizesNotRolledUp() throws Exception
-    {
-        final int batch1Size = 10;
-        final int batch2Size = 20;
-
-        ParticipantResult result1 = new ParticipantResult();
-        result1.setBatchSize(batch1Size);
-
-        ParticipantResult result2 = new ParticipantResult();
-        result2.setBatchSize(batch2Size);
-
-        _aggregator.aggregate(result1);
-        _aggregator.aggregate(result2);
-
-        ParticipantResult aggregratedResult = _aggregator.getAggregatedResult();
-        assertEquals(0, aggregratedResult.getBatchSize());
-    }
-
-    public void testConstantAcknowledgeModesRolledUp() throws Exception
-    {
-        ParticipantResult result1 = new ParticipantResult();
-        result1.setAcknowledgeMode(Session.DUPS_OK_ACKNOWLEDGE);
-
-        ParticipantResult result2 = new ParticipantResult();
-        result2.setAcknowledgeMode(Session.DUPS_OK_ACKNOWLEDGE);
-
-        _aggregator.aggregate(result1);
-        _aggregator.aggregate(result2);
-
-        ParticipantResult aggregratedResult = _aggregator.getAggregatedResult();
-        assertEquals(Session.DUPS_OK_ACKNOWLEDGE, aggregratedResult.getAcknowledgeMode());
-    }
-
-    public void testDifferingAcknowledgeModesNotRolledUp() throws Exception
-    {
-        ParticipantResult result1 = new ParticipantResult();
-        result1.setBatchSize(Session.AUTO_ACKNOWLEDGE);
-
-        ParticipantResult result2 = new ParticipantResult();
-        result2.setBatchSize(Session.SESSION_TRANSACTED);
-
-        _aggregator.aggregate(result1);
-        _aggregator.aggregate(result2);
-
-        ParticipantResult aggregratedResult = _aggregator.getAggregatedResult();
-        assertEquals(-1, aggregratedResult.getAcknowledgeMode());
-    }
-
-    public void testSumNumberOfConsumerAndProducers() throws Exception
-    {
-        final int expectedNumberOfProducers = 1;
-        final int expectedNumberOfConsumers = 2;
-
-        ParticipantResult result1 = new ParticipantResult();
-        result1.setTotalNumberOfConsumers(1);
-
-        ParticipantResult result2 = new ParticipantResult();
-        result2.setTotalNumberOfConsumers(1);
-
-        ParticipantResult result3 = new ParticipantResult();
-        result2.setTotalNumberOfProducers(1);
-
-        _aggregator.aggregate(result1);
-        _aggregator.aggregate(result2);
-        _aggregator.aggregate(result3);
-
-        ParticipantResult aggregratedResult = _aggregator.getAggregatedResult();
-        assertEquals(expectedNumberOfConsumers, aggregratedResult.getTotalNumberOfConsumers());
-        assertEquals(expectedNumberOfProducers, aggregratedResult.getTotalNumberOfProducers());
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/SeriesStatisticsTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/SeriesStatisticsTest.java
deleted file mode 100644
index 7417dddc4f..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/SeriesStatisticsTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *
- * 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.disttest.results.aggregation;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.apache.qpid.test.utils.QpidTestCase;
-
-public class SeriesStatisticsTest extends QpidTestCase
-{
-    public static Collection<Long> SERIES = Arrays.asList(new Long[] { 2l, 4l, 4l, 4l, 5l, 5l, 7l, 9l, 5l });
-
-    public void testAggregate()
-    {
-        SeriesStatistics results = new SeriesStatistics();
-        results.addMessageLatencies(SERIES);
-        results.aggregate();
-        assertEquals("Unexpected average", 5.0, results.getAverage(), 0.01);
-        assertEquals("Unexpected min", 2, results.getMinimum());
-        assertEquals("Unexpected max", 9, results.getMaximum());
-        assertEquals("Unexpected standard deviation", 2.0, results.getStandardDeviation(), 0.01);
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregatorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregatorTest.java
deleted file mode 100644
index b254a0e3bf..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregatorTest.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * 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.disttest.results.aggregation;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.qpid.disttest.controller.ResultsForAllTests;
-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
-{
-    private static final String TEST1_NAME = "TEST1_NAME";
-    private static final int TEST1_ITERATION_NUMBER = 1;
-
-    private static final String CONSUMER_PARTICIPANT_NAME1 = "CONSUMER_PARTICIPANT_NAME1";
-    private static final String CONSUMER_PARTICIPANT_NAME2 = "CONSUMER_PARTICIPANT_NAME2";
-
-    private static final String PRODUCER_PARTICIPANT_NAME = "PRODUCER_PARTICIPANT_NAME";
-
-    private static final long CONSUMER1_STARTDATE = 50;
-    private static final long CONSUMER1_ENDDATE = 20000;
-
-    private static final long CONSUMER2_STARTDATE = 100;
-    private static final long CONSUMER2_ENDDATE = 21000;
-
-    private static final long PRODUCER_STARTDATE = 0;
-    private static final long PRODUCER_ENDDATE = 19000;
-
-    private static final long NUMBER_OF_MESSAGES_PROCESSED_PER_CONSUMER = 50;
-    private static final long NUMBER_OF_MESSAGES_CONSUMED_IN_TOTAL = NUMBER_OF_MESSAGES_PROCESSED_PER_CONSUMER * 2;
-    private static final long NUMBER_OF_MESSAGES_PRODUCED = NUMBER_OF_MESSAGES_PROCESSED_PER_CONSUMER * 2;
-
-    private static final int PAYLOAD_SIZE = 1024;
-    private static final long TOTAL_PAYLOAD_PROCESSED_PER_CONSUMER = NUMBER_OF_MESSAGES_PROCESSED_PER_CONSUMER * PAYLOAD_SIZE;
-    private static final long TOTAL_PAYLOAD_PRODUCED_IN_TOTAL =  TOTAL_PAYLOAD_PROCESSED_PER_CONSUMER * 2;
-
-    private static final int EXPECTED_NUMBER_OF_AGGREGATED_RESULTS = 3;
-
-    private static final int BATCH_SIZE = 3;
-
-    private TestResultAggregator _aggregator = new TestResultAggregator();
-
-    public void testAggregateTestResults()
-    {
-        ResultsForAllTests resultsForAllTests1 = mock(ResultsForAllTests.class);
-        ResultsForAllTests resultsForAllTests2 = mock(ResultsForAllTests.class);
-
-        ResultsForAllTests summaryResult1 = mock(ResultsForAllTests.class);
-        ResultsForAllTests summaryResult2 = mock(ResultsForAllTests.class);
-
-        when(resultsForAllTests1.getAllParticipantsResult()).thenReturn(summaryResult1);
-        when(resultsForAllTests2.getAllParticipantsResult()).thenReturn(summaryResult2);
-
-        ITestResult testResult1 = mock(ITestResult.class);
-        ITestResult testResult2 = mock(ITestResult.class);
-
-        when(summaryResult1.getTestResults()).thenReturn(Arrays.asList(testResult1));
-        when(summaryResult2.getTestResults()).thenReturn(Arrays.asList(testResult2));
-
-        ResultsForAllTests actualSummaryResults = _aggregator.aggregateTestResults(Arrays.asList(
-                resultsForAllTests1,
-                resultsForAllTests2));
-
-        assertEquals(
-                "Summary results should contain the all the 'all participants' test results",
-                Arrays.asList(testResult1, testResult2),
-                actualSummaryResults.getTestResults());
-    }
-
-    public void testAggregateResultsForTwoConsumerAndOneProducer() throws Exception
-    {
-        TestResult originalTestResult = createResultsFromTest();
-
-        int numberOfOriginalParticipantResults = originalTestResult.getParticipantResults().size();
-        int expectedNumberOfResults = numberOfOriginalParticipantResults + EXPECTED_NUMBER_OF_AGGREGATED_RESULTS;
-
-        AggregatedTestResult aggregatedTestResult = _aggregator.aggregateTestResult(originalTestResult);
-
-        aggregatedTestResult.getAllConsumerParticipantResult().getTotalPayloadProcessed();
-        assertEquals(expectedNumberOfResults, aggregatedTestResult.getParticipantResults().size());
-
-        assertMinimalAggregatedResults(
-                aggregatedTestResult.getAllConsumerParticipantResult(),
-                TEST1_NAME, TEST1_ITERATION_NUMBER,
-                BATCH_SIZE, NUMBER_OF_MESSAGES_CONSUMED_IN_TOTAL, 2, 0);
-
-        assertMinimalAggregatedResults(
-                aggregatedTestResult.getAllProducerParticipantResult(),
-                TEST1_NAME, TEST1_ITERATION_NUMBER,
-                BATCH_SIZE, NUMBER_OF_MESSAGES_PRODUCED, 0, 1);
-
-        assertMinimalAggregatedResults(
-                aggregatedTestResult.getAllParticipantResult(),
-                TEST1_NAME, TEST1_ITERATION_NUMBER,
-                BATCH_SIZE, NUMBER_OF_MESSAGES_CONSUMED_IN_TOTAL, 2, 1);
-    }
-
-    public void testAggregateResultsWhenParticipantErrored()
-    {
-        ParticipantResult failedParticipantResult = new ParticipantResult();
-        failedParticipantResult.setParticipantName(PRODUCER_PARTICIPANT_NAME);
-        failedParticipantResult.setErrorMessage("error");
-        TestResult result = new TestResult(TEST1_NAME);
-        result.addParticipantResult(failedParticipantResult);
-
-        AggregatedTestResult aggregatedTestResult = _aggregator.aggregateTestResult(result);
-        assertEquals(TestResultAggregator.AGGREGATED_ERROR_MESSAGE, aggregatedTestResult.getAllParticipantResult().getErrorMessage());
-    }
-
-    public void testAggregateResultsForConsumerWithLatencyResults() throws Exception
-    {
-        TestResult originalTestResult = createResultsFromTest();
-        List<ParticipantResult> results = originalTestResult.getParticipantResults();
-        for (ParticipantResult participantResult : results)
-        {
-            if (participantResult instanceof ConsumerParticipantResult)
-            {
-                ((ConsumerParticipantResult)participantResult).setMessageLatencies(SeriesStatisticsTest.SERIES);
-                break;
-            }
-        }
-
-        int numberOfOriginalParticipantResults = originalTestResult.getParticipantResults().size();
-        int expectedNumberOfResults = numberOfOriginalParticipantResults + EXPECTED_NUMBER_OF_AGGREGATED_RESULTS;
-
-        AggregatedTestResult aggregatedTestResult = _aggregator.aggregateTestResult(originalTestResult);
-
-        aggregatedTestResult.getAllConsumerParticipantResult().getTotalPayloadProcessed();
-        assertEquals(expectedNumberOfResults, aggregatedTestResult.getParticipantResults().size());
-
-        assertMinimalAggregatedResults(
-                aggregatedTestResult.getAllConsumerParticipantResult(),
-                TEST1_NAME, TEST1_ITERATION_NUMBER,
-                BATCH_SIZE, NUMBER_OF_MESSAGES_CONSUMED_IN_TOTAL, 2, 0);
-
-        assertLatencyAggregatedResults(aggregatedTestResult.getAllConsumerParticipantResult());
-
-        assertMinimalAggregatedResults(
-                aggregatedTestResult.getAllProducerParticipantResult(),
-                TEST1_NAME, TEST1_ITERATION_NUMBER,
-                BATCH_SIZE, NUMBER_OF_MESSAGES_PRODUCED, 0, 1);
-
-        assertMinimalAggregatedResults(
-                aggregatedTestResult.getAllParticipantResult(),
-                TEST1_NAME, TEST1_ITERATION_NUMBER,
-                BATCH_SIZE, NUMBER_OF_MESSAGES_CONSUMED_IN_TOTAL, 2, 1);
-
-        int expectedThroughtput = (int)Math.round(NUMBER_OF_MESSAGES_PRODUCED * 1000.0d /(CONSUMER2_ENDDATE - PRODUCER_STARTDATE));
-        ParticipantResult result = aggregatedTestResult.getAllParticipantResult();
-        assertEquals("Unexpected message throughtput", expectedThroughtput, result.getMessageThroughput());
-    }
-
-    private void assertLatencyAggregatedResults(ParticipantResult allConsumerParticipantResult)
-    {
-        assertTrue("Unexpected result", allConsumerParticipantResult instanceof ConsumerParticipantResult);
-        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 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)
-    {
-        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());
-    }
-
-    private TestResult createResultsFromTest()
-    {
-        TestResult testResult = new TestResult(TEST1_NAME);
-
-        ConsumerParticipantResult consumerResult1 = new ConsumerParticipantResult();
-        setPropertiesOn(consumerResult1, TEST1_NAME, TEST1_ITERATION_NUMBER, CONSUMER_PARTICIPANT_NAME1, NUMBER_OF_MESSAGES_PROCESSED_PER_CONSUMER, BATCH_SIZE, PAYLOAD_SIZE, TOTAL_PAYLOAD_PROCESSED_PER_CONSUMER, CONSUMER1_STARTDATE, CONSUMER1_ENDDATE, 1, 0);
-        testResult.addParticipantResult(consumerResult1);
-
-        ConsumerParticipantResult consumerResult2 = new ConsumerParticipantResult();
-        setPropertiesOn(consumerResult2, TEST1_NAME, TEST1_ITERATION_NUMBER, CONSUMER_PARTICIPANT_NAME2, NUMBER_OF_MESSAGES_PROCESSED_PER_CONSUMER, BATCH_SIZE, PAYLOAD_SIZE, TOTAL_PAYLOAD_PROCESSED_PER_CONSUMER, CONSUMER2_STARTDATE, CONSUMER2_ENDDATE, 1, 0);
-        testResult.addParticipantResult(consumerResult2);
-
-        ParticipantResult producerResult = new ProducerParticipantResult();
-        setPropertiesOn(producerResult, TEST1_NAME, TEST1_ITERATION_NUMBER, PRODUCER_PARTICIPANT_NAME, NUMBER_OF_MESSAGES_PRODUCED, BATCH_SIZE, PAYLOAD_SIZE, TOTAL_PAYLOAD_PRODUCED_IN_TOTAL, PRODUCER_STARTDATE, PRODUCER_ENDDATE, 0, 1);
-        testResult.addParticipantResult(producerResult);
-
-        return testResult;
-    }
-
-    private void setPropertiesOn(ParticipantResult participantResult, String testName, int iterationNumber, String participantName, long numberOfMessagesProcessed, int batchSize, int payloadSize, long totalPayloadProcessed, long start, long end, int totalNumberOfConsumers, int totalNumberOfProducers)
-    {
-        participantResult.setParticipantName(participantName);
-        participantResult.setTestName(testName);
-        participantResult.setIterationNumber(iterationNumber);
-        participantResult.setTotalNumberOfConsumers(totalNumberOfConsumers);
-        participantResult.setTotalNumberOfProducers(totalNumberOfProducers);
-
-        participantResult.setNumberOfMessagesProcessed(numberOfMessagesProcessed);
-        participantResult.setPayloadSize(payloadSize);
-        participantResult.setTotalPayloadProcessed(totalPayloadProcessed);
-        participantResult.setStartDate(new Date(start));
-        participantResult.setEndDate(new Date(end));
-        participantResult.setBatchSize(batchSize);
-    }
-
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormatterTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormatterTest.java
deleted file mode 100644
index bbf73b23d2..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormatterTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.disttest.results.formatting;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-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
-{
-    private CSVFormatter _formatter = new CSVFormatter();
-
-    public void testResultsFileWithWithOneRow() throws Exception
-    {
-        ResultsTestFixture resultsTestFixture = new ResultsTestFixture();
-        ResultsForAllTests resultsForAllTests = resultsTestFixture.createResultsForAllTests();
-
-        String output = _formatter.format(resultsForAllTests);
-
-        String expectedOutput = readCsvOutputFileAsString("expectedOutput.csv");
-
-        assertEquals(expectedOutput, output);
-    }
-
-    private String readCsvOutputFileAsString(String filename) throws Exception
-    {
-        InputStream is = getClass().getResourceAsStream(filename);
-        assertNotNull(is);
-
-        StringBuilder output = new StringBuilder();
-
-        BufferedReader br = new BufferedReader(new InputStreamReader(is));
-        String line = null;
-        while((line = br.readLine()) != null)
-        {
-            output.append(line);
-            output.append("\n");
-        }
-
-        return output.toString();
-    }
-}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparatorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparatorTest.java
deleted file mode 100644
index ed109a2e27..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVOrderParticipantResultComparatorTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.disttest.results.formatting;
-
-
-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
-{
-    CSVOrderParticipantResultComparator _comparator = new CSVOrderParticipantResultComparator();
-
-    public void testOrderedConsumerParticipants() throws Exception
-    {
-        assertCompare(
-                new ConsumerParticipantResult("apple"),
-                new ConsumerParticipantResult("banana"));
-
-    }
-    public void testProducerPrecedesConsumerParticipants() throws Exception
-    {
-        assertCompare(
-                new ProducerParticipantResult(),
-                new ConsumerParticipantResult());
-    }
-
-    public void testProducerPrecedesAllProducersResult()
-    {
-        assertCompare(
-                new ProducerParticipantResult("participantName"),
-                new ParticipantResult(TestResultAggregator.ALL_PRODUCER_PARTICIPANTS_NAME));
-    }
-
-    public void testConsumerPrecedesAllConsumersResult()
-    {
-        assertCompare(
-                new ConsumerParticipantResult("participantName"),
-                new ParticipantResult(TestResultAggregator.ALL_CONSUMER_PARTICIPANTS_NAME));
-    }
-
-    public void testAllParticipantsPrecedesAllConsumersResult()
-    {
-        assertCompare(
-                new ParticipantResult(TestResultAggregator.ALL_PARTICIPANTS_NAME),
-                new ParticipantResult(TestResultAggregator.ALL_CONSUMER_PARTICIPANTS_NAME));
-    }
-
-    public void testAllParticipantsPrecedesAllProducersResult()
-    {
-        assertCompare(
-                new ParticipantResult(TestResultAggregator.ALL_PARTICIPANTS_NAME),
-                new ParticipantResult(TestResultAggregator.ALL_PRODUCER_PARTICIPANTS_NAME));
-    }
-
-    private void assertCompare(ParticipantResult smaller, ParticipantResult bigger)
-    {
-        assertEquals("Expected " + smaller + " to 'equal' itself",
-                0,
-                _comparator.compare(smaller, smaller));
-
-        String failureMsg = "Expected " + smaller + " to be smaller than " + bigger;
-
-        assertTrue(failureMsg, _comparator.compare(smaller, bigger) < 0);
-        assertTrue(failureMsg, _comparator.compare(bigger, smaller) > 0);
-    }
-
-}
-// <ParticipantResult>
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/expectedOutput.csv b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/expectedOutput.csv
deleted file mode 100644
index 02ea67d56d..0000000000
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/expectedOutput.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-testName,iterationNumber,throughputKbPerS,averageLatency,clientName,participantName,numberOfMessages,payloadSizeB,priority,timeToLiveMs,acknowledgeMode,deliveryMode,batchSize,maximumDurationMs,producerStartDelayMs,producerIntervalMs,isTopic,isDurableSubscription,isBrowsingSubscription,isSelector,isNoLocal,isSynchronousConsumer,totalNumberOfConsumers,totalNumberOfProducers,totalPayloadProcessedB,timeTakenMs,errorMessage,minLatency,maxLatency,latencyStandardDeviation,throughputMessagesPerS
-TEST1,0,2048,5,CONFIGURED_CLIENT1,PARTICIPANT,2,1,2,3,4,5,6,7,8,9,true,false,true,false,true,false,1,2,1024,1000,error,2,9,2.0,2