You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by ms...@apache.org on 2005/03/18 19:10:34 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/junit JMeterTest.java
mstover1 2005/03/18 10:10:34
Modified: src/core/org/apache/jmeter/control LoopController.java
src/components/org/apache/jmeter/control
ThroughputController.java OnceOnlyController.java
SwitchController.java InterleaveControl.java
src/core/org/apache/jmeter/resources messages.properties
src/core/org/apache/jmeter/junit JMeterTest.java
Log:
Fixing unit tests
Revision Changes Path
1.26 +7 -2 jakarta-jmeter/src/core/org/apache/jmeter/control/LoopController.java
Index: LoopController.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/LoopController.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- LoopController.java 18 Mar 2005 15:26:58 -0000 1.25
+++ LoopController.java 18 Mar 2005 18:10:33 -0000 1.26
@@ -210,6 +210,10 @@
"six",
"seven" };
int counter = 15;
+ controller.setRunningVersion(true);
+ sub_1.setRunningVersion(true);
+ sub_2.setRunningVersion(true);
+ sub_3.setRunningVersion(true);
controller.initialize();
for (int i = 0; i < 2; i++)
{
@@ -239,6 +243,7 @@
LoopController loop = new LoopController();
loop.setLoops(-1);
loop.addTestElement(new TestSampler("never run"));
+ loop.setRunningVersion(true);
loop.initialize();
for (int i=0; i<42; i++)
{
1.17 +13 -2 jakarta-jmeter/src/components/org/apache/jmeter/control/ThroughputController.java
Index: ThroughputController.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/ThroughputController.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ThroughputController.java 10 Dec 2004 21:32:54 -0000 1.16
+++ ThroughputController.java 18 Mar 2005 18:10:33 -0000 1.17
@@ -426,6 +426,9 @@
"three",
};
sub_1.testStarted();
+ test.setRunningVersion(true);
+ sub_1.setRunningVersion(true);
+ loop.setRunningVersion(true);
test.initialize();
for (int counter= 0; counter < order.length; counter++)
{
@@ -471,6 +474,8 @@
"three",
};
int counter= 0;
+ controller.setRunningVersion(true);
+ sub_1.setRunningVersion(true);
sub_1.testStarted();
controller.initialize();
for (int i=0; i<3; i++)
@@ -527,6 +532,8 @@
// etc...
};
int counter= 0;
+ controller.setRunningVersion(true);
+ sub_1.setRunningVersion(true);
sub_1.testStarted();
controller.initialize();
for (int i=0; i<3; i++)
@@ -567,6 +574,8 @@
"three",
};
int counter= 0;
+ controller.setRunningVersion(true);
+ sub_1.setRunningVersion(true);
sub_1.testStarted();
controller.initialize();
for (int i=0; i<3; i++)
@@ -609,6 +618,8 @@
"three",
};
int counter= 0;
+ controller.setRunningVersion(true);
+ sub_1.setRunningVersion(true);
sub_1.testStarted();
controller.initialize();
for (int i=0; i<3; i++)
1.13 +10 -2 jakarta-jmeter/src/components/org/apache/jmeter/control/OnceOnlyController.java
Index: OnceOnlyController.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/OnceOnlyController.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- OnceOnlyController.java 18 Mar 2005 15:26:57 -0000 1.12
+++ OnceOnlyController.java 18 Mar 2005 18:10:33 -0000 1.13
@@ -105,6 +105,10 @@
"six",
"seven" };
int counter = 15;
+ controller.setRunningVersion(true);
+ sub_1.setRunningVersion(true);
+ sub_2.setRunningVersion(true);
+ sub_3.setRunningVersion(true);
controller.initialize();
for (int i = 0; i < 4; i++)
{
@@ -167,6 +171,10 @@
"four",
"seven" };
int counter = 11;
+ controller.setRunningVersion(true);
+ sub_1.setRunningVersion(true);
+ sub_2.setRunningVersion(true);
+ sub_3.setRunningVersion(true);
controller.initialize();
for (int i = 0; i < 4; i++)
{
1.3 +5 -1 jakarta-jmeter/src/components/org/apache/jmeter/control/SwitchController.java
Index: SwitchController.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/SwitchController.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SwitchController.java 18 Mar 2005 15:26:57 -0000 1.2
+++ SwitchController.java 18 Mar 2005 18:10:33 -0000 1.3
@@ -264,6 +264,10 @@
controller.addTestElement(new TestSampler("before"));
controller.addTestElement(switch_cont);
controller.addTestElement(new TestSampler("after"));
+ controller.setRunningVersion(true);
+ sub_1.setRunningVersion(true);
+ sub_2.setRunningVersion(true);
+ switch_cont.setRunningVersion(true);
controller.initialize();
for (int i=1;i<=3;i++){
assertEquals("Loop:"+i,"before",nextName(controller));
1.27 +25 -2 jakarta-jmeter/src/components/org/apache/jmeter/control/InterleaveControl.java
Index: InterleaveControl.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/InterleaveControl.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- InterleaveControl.java 18 Mar 2005 15:26:57 -0000 1.26
+++ InterleaveControl.java 18 Mar 2005 18:10:33 -0000 1.27
@@ -246,6 +246,10 @@
"six",
"seven" };
int counter = 14;
+ controller.setRunningVersion(true);
+ sub_1.setRunningVersion(true);
+ sub_2.setRunningVersion(true);
+ sub_3.setRunningVersion(true);
controller.initialize();
for (int i = 0; i < 4; i++)
{
@@ -283,6 +287,9 @@
sub_1.addTestElement(sub_2);
sub_2.setLoops(3);
int counter = 1;
+ controller.setRunningVersion(true);
+ sub_1.setRunningVersion(true);
+ sub_2.setRunningVersion(true);
controller.initialize();
for (int i = 0; i < 4; i++)
{
@@ -341,6 +348,10 @@
"one",
"three" };
int counter = 0;
+ controller.setRunningVersion(true);
+ sub_1.setRunningVersion(true);
+ sub_2.setRunningVersion(true);
+ sub_3.setRunningVersion(true);
controller.initialize();
while (counter < order.length)
{
@@ -399,6 +410,10 @@
"two",
"three" };
int counter = 0;
+ controller.setRunningVersion(true);
+ sub_1.setRunningVersion(true);
+ sub_2.setRunningVersion(true);
+ sub_3.setRunningVersion(true);
controller.initialize();
while (counter < order.length)
{
@@ -431,6 +446,10 @@
sub_1.addTestElement(sub_3);
String[] order = new String[] { "one", "three", "two", "four" };
int counter = 0;
+ controller.setRunningVersion(true);
+ sub_1.setRunningVersion(true);
+ sub_2.setRunningVersion(true);
+ sub_3.setRunningVersion(true);
controller.initialize();
while (counter < order.length)
{
@@ -463,6 +482,10 @@
sub_1.addTestElement(sub_3);
String[] order = new String[] { "one", "two", "three", "four" };
int counter = 0;
+ controller.setRunningVersion(true);
+ sub_1.setRunningVersion(true);
+ sub_2.setRunningVersion(true);
+ sub_3.setRunningVersion(true);
controller.initialize();
while (counter < order.length)
{
1.137 +1 -0 jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- messages.properties 18 Mar 2005 15:26:54 -0000 1.136
+++ messages.properties 18 Mar 2005 18:10:33 -0000 1.137
@@ -197,6 +197,7 @@
headers_stored=Headers Stored in the Header Manager
help=Help
html_assertion_label=HTML Assertion
+html_assertion_title=HTML Assertion
html_parameter_mask=HTML Parameter Mask
http_response_code=HTTP response code
http_url_rewriting_modifier_title=HTTP URL Re-writing Modifier
1.61 +25 -20 jakarta-jmeter/src/core/org/apache/jmeter/junit/JMeterTest.java
Index: JMeterTest.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/junit/JMeterTest.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- JMeterTest.java 10 Jan 2005 01:17:11 -0000 1.60
+++ JMeterTest.java 18 Mar 2005 18:10:34 -0000 1.61
@@ -33,6 +33,8 @@
import java.util.Map;
import java.util.Set;
+import javax.swing.JComponent;
+
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -517,25 +519,28 @@
*/
public void runSerialTest() throws Exception
{
- try
- {
- ByteArrayOutputStream bytes = new ByteArrayOutputStream();
- ObjectOutputStream out = new ObjectOutputStream(bytes);
- out.writeObject(serObj);
- out.close();
- ObjectInputStream in =
- new ObjectInputStream(
- new ByteArrayInputStream(bytes.toByteArray()));
- Object readObject = in.readObject();
- in.close();
- assertEquals(
- "deserializing class: " + serObj.getClass().getName(),
- serObj.getClass(),
- readObject.getClass());
- }
- catch (Throwable e)
+ if(!(serObj instanceof JComponent))
{
- fail("serialization of "+serObj.getClass().getName()+" failed: "+e);
+ try
+ {
+ ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream(bytes);
+ out.writeObject(serObj);
+ out.close();
+ ObjectInputStream in =
+ new ObjectInputStream(
+ new ByteArrayInputStream(bytes.toByteArray()));
+ Object readObject = in.readObject();
+ in.close();
+ assertEquals(
+ "deserializing class: " + serObj.getClass().getName(),
+ serObj.getClass(),
+ readObject.getClass());
+ }
+ catch (Throwable e)
+ {
+ fail("serialization of "+serObj.getClass().getName()+" failed: "+e);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org