diff options
| author | Keith Wall <kwall@apache.org> | 2012-04-16 13:48:47 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2012-04-16 13:48:47 +0000 |
| commit | 8fb01da22414f79461ce421d0af527d3b9fab47a (patch) | |
| tree | 77b4e9f6bc2e80f1690d86e58c2dbbe492d624eb | |
| parent | 380f474d2b8f7d0a7dd3de8098de6f2be9ccc849 (diff) | |
| download | qpid-python-8fb01da22414f79461ce421d0af527d3b9fab47a.tar.gz | |
QPID-3936: Performance Test Framework - Fix failing tests under JDK 1.7
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1326616 13f79535-47bb-0310-9956-ffa450edef68
2 files changed, 3 insertions, 3 deletions
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 index ffd41049be..983da299b9 100644 --- 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 @@ -51,6 +51,7 @@ import org.mockito.stubbing.Answer; public class TestRunnerTest extends TestCase { 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"; @@ -160,7 +161,7 @@ public class TestRunnerTest extends TestCase _testInstance = createTestInstanceWithOneParticipant(); _testRunner = new TestRunner(_participatingClients, _testInstance , _respondingJmsDelegate, COMMAND_RESPONSE_TIMEOUT, TEST_RESULT_TIMEOUT); - ParticipantResult incomingParticipantResult = new ParticipantResult(); + ParticipantResult incomingParticipantResult = new ParticipantResult(PARTICIPANT_NAME); incomingParticipantResult.setRegisteredClientName(CLIENT1_REGISTERED_NAME); sendTestResultsLater(_testRunner, incomingParticipantResult); diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java index c8f5b3a231..061ed6a28d 100644 --- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java +++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java @@ -72,6 +72,7 @@ public class CSVFormaterTest extends TestCase Map<ParticipantAttribute, Object> participantAttributes = getParticipantAttributes(); when(participantResult.getAttributes()).thenReturn(participantAttributes); + when(participantResult.getParticipantName()).thenReturn(PARTICIPANT); TestResult testResult = new TestResult(TEST1); testResult.addParticipantResult(participantResult); @@ -135,6 +136,4 @@ public class CSVFormaterTest extends TestCase return output.toString(); } - - } |