Author: kwall
Date: Mon Apr 16 13:48:47 2012
New Revision: 1326616
URL: http://svn.apache.org/viewvc?rev=1326616&view=rev
Log:
QPID-3936: Performance Test Framework - Fix failing tests under JDK 1.7
Modified:
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/TestRunnerTest.java
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java
Modified:
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/TestRunnerTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/TestRunnerTest.java?rev=1326616&r1=1326615&r2=1326616&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/TestRunnerTest.java
(original)
+++
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/TestRunnerTest.java
Mon Apr 16 13:48:47 2012
@@ -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 Test
_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);
Modified:
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java?rev=1326616&r1=1326615&r2=1326616&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java
(original)
+++
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/results/formatting/CSVFormaterTest.java
Mon Apr 16 13:48:47 2012
@@ -72,6 +72,7 @@ public class CSVFormaterTest extends Tes
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 Tes
return output.toString();
}
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
