Author: sebb
Date: Fri Dec 7 09:20:22 2007
New Revision: 602158
URL: http://svn.apache.org/viewvc?rev=602158&view=rev
Log:
Use getName() instead of getProperty(TestElemen.Name)
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestGenericController.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestInterleaveControl.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestLoopController.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestOnceOnlyController.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRandomOrderController.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestSwitchController.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestThroughputController.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestWhileController.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestGenericController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestGenericController.java?rev=602158&r1=602157&r2=602158&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestGenericController.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestGenericController.java
Fri Dec 7 09:20:22 2007
@@ -51,7 +51,7 @@
counter = 0;
TestElement sampler = null;
while ((sampler = controller.next()) != null) {
- assertEquals(order[counter++],
sampler.getPropertyAsString(TestElement.NAME));
+ assertEquals(order[counter++],
sampler.getName());
}
}
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java?rev=602158&r1=602157&r2=602158&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java
Fri Dec 7 09:20:22 2007
@@ -68,7 +68,7 @@
// TestElement sampler = null;
// while ((sampler = controller.next()) != null) {
// logger.debug(" ->>> Gonna assertTrue :" +
sampler.getClass().getName() + " Property is ---->>>"
-// +
sampler.getPropertyAsString(TestElement.NAME));
+// + sampler.getName());
// }
}
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestInterleaveControl.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestInterleaveControl.java?rev=602158&r1=602157&r2=602158&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestInterleaveControl.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestInterleaveControl.java
Fri Dec 7 09:20:22 2007
@@ -60,9 +60,9 @@
TestElement sampler = null;
while ((sampler = controller.next()) != null) {
if (counter == 0) {
- assertEquals(interleaveOrder[i
% 2], sampler.getPropertyAsString(TestElement.NAME));
+ assertEquals(interleaveOrder[i
% 2], sampler.getName());
} else {
- assertEquals(order[counter],
sampler.getPropertyAsString(TestElement.NAME));
+ assertEquals(order[counter],
sampler.getName());
}
counter++;
}
@@ -89,7 +89,7 @@
counter = 0;
TestElement sampler = null;
while ((sampler = controller.next()) != null) {
- assertEquals("one",
sampler.getPropertyAsString(TestElement.NAME));
+ assertEquals("one", sampler.getName());
counter++;
}
}
@@ -124,7 +124,7 @@
while (counter < order.length) {
TestElement sampler = null;
while ((sampler = controller.next()) != null) {
- assertEquals("failed on " + counter,
order[counter], sampler.getPropertyAsString(TestElement.NAME));
+ assertEquals("failed on " + counter,
order[counter], sampler.getName());
counter++;
}
}
@@ -159,7 +159,7 @@
while (counter < order.length) {
TestElement sampler = null;
while ((sampler = controller.next()) != null) {
- assertEquals("failed on" + counter,
order[counter], sampler.getPropertyAsString(TestElement.NAME));
+ assertEquals("failed on" + counter,
order[counter], sampler.getName());
counter++;
}
}
@@ -189,7 +189,7 @@
while (counter < order.length) {
TestElement sampler = null;
while ((sampler = controller.next()) != null) {
- assertEquals("failed on" + counter,
order[counter], sampler.getPropertyAsString(TestElement.NAME));
+ assertEquals("failed on" + counter,
order[counter], sampler.getName());
counter++;
}
}
@@ -219,7 +219,7 @@
while (counter < order.length) {
TestElement sampler = null;
while ((sampler = controller.next()) != null) {
- assertEquals("failed on" + counter,
order[counter], sampler.getPropertyAsString(TestElement.NAME));
+ assertEquals("failed on" + counter,
order[counter], sampler.getName());
counter++;
}
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestLoopController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestLoopController.java?rev=602158&r1=602157&r2=602158&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestLoopController.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestLoopController.java
Fri Dec 7 09:20:22 2007
@@ -56,7 +56,7 @@
counter = 0;
TestElement sampler = null;
while ((sampler = controller.next()) != null) {
- assertEquals(order[counter++],
sampler.getPropertyAsString(TestElement.NAME));
+ assertEquals(order[counter++],
sampler.getName());
}
}
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestOnceOnlyController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestOnceOnlyController.java?rev=602158&r1=602157&r2=602158&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestOnceOnlyController.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestOnceOnlyController.java
Fri Dec 7 09:20:22 2007
@@ -65,9 +65,9 @@
TestElement sampler = null;
while ((sampler = controller.next()) != null) {
if (i == 0 && counter < 2) {
-
assertEquals(interleaveOrder[counter],
sampler.getPropertyAsString(TestElement.NAME));
+
assertEquals(interleaveOrder[counter], sampler.getName());
} else {
- assertEquals(order[counter],
sampler.getPropertyAsString(TestElement.NAME));
+ assertEquals(order[counter],
sampler.getName());
}
counter++;
}
@@ -109,9 +109,9 @@
TestElement sampler = null;
while ((sampler = controller.next()) != null) {
if (i == 0 && counter < 2) {
-
assertEquals(interleaveOrder[counter],
sampler.getPropertyAsString(TestElement.NAME));
+
assertEquals(interleaveOrder[counter], sampler.getName());
} else {
- assertEquals(order[counter],
sampler.getPropertyAsString(TestElement.NAME));
+ assertEquals(order[counter],
sampler.getName());
}
counter++;
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRandomOrderController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRandomOrderController.java?rev=602158&r1=602157&r2=602158&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRandomOrderController.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestRandomOrderController.java
Fri Dec 7 09:20:22 2007
@@ -46,7 +46,7 @@
List usedSamplers = new ArrayList();
roc.initialize();
while ((sampler = roc.next()) != null) {
- String samplerName =
sampler.getPropertyAsString(TestSampler.NAME);
+ String samplerName = sampler.getName();
if (usedSamplers.contains(samplerName)) {
assertTrue("Duplicate sampler returned
from next()", false);
}
@@ -68,7 +68,7 @@
List usedSamplers = new ArrayList();
roc.initialize();
while ((sampler = roc.next()) != null) {
- String samplerName =
sampler.getPropertyAsString(TestSampler.NAME);
+ String samplerName = sampler.getName();
if (usedSamplers.contains(samplerName)) {
assertTrue("Duplicate sampler returned
from next()", false);
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestSwitchController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestSwitchController.java?rev=602158&r1=602157&r2=602158&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestSwitchController.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestSwitchController.java
Fri Dec 7 09:20:22 2007
@@ -26,7 +26,6 @@
import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.junit.stubs.TestSampler;
import org.apache.jmeter.samplers.Sampler;
-import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.StringProperty;
import org.apache.jmeter.threads.JMeterContext;
@@ -50,7 +49,7 @@
if (s == null) {
return null;
} else {
- n = s.getPropertyAsString(TestElement.NAME);
+ n = s.getName();
return n;
}
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestThroughputController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestThroughputController.java?rev=602158&r1=602157&r2=602158&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestThroughputController.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestThroughputController.java
Fri Dec 7 09:20:22 2007
@@ -63,7 +63,7 @@
for (int counter = 0; counter < order.length;
counter++) {
TestElement sampler = test.next();
assertNotNull(sampler);
- assertEquals("Counter: " + counter,
order[counter], sampler.getPropertyAsString(TestElement.NAME));
+ assertEquals("Counter: " + counter,
order[counter], sampler.getName());
}
assertNull(test.next());
sub_1.testEnded();
@@ -93,8 +93,7 @@
for (int i = 0; i < 3; i++) {
TestElement sampler = null;
while ((sampler = controller.next()) != null) {
- assertEquals("Counter: " + counter + ",
i: " + i, order[counter], sampler
-
.getPropertyAsString(TestElement.NAME));
+ assertEquals("Counter: " + counter + ",
i: " + i, order[counter], sampler.getName());
counter++;
}
assertEquals(counter, order.length);
@@ -142,8 +141,7 @@
for (int i = 0; i < 3; i++) {
TestElement sampler = null;
while ((sampler = controller.next()) != null) {
- assertEquals("Counter: " + counter + ",
i: " + i, order[counter], sampler
-
.getPropertyAsString(TestElement.NAME));
+ assertEquals("Counter: " + counter + ",
i: " + i, order[counter], sampler.getName());
counter++;
}
assertEquals(counter, order.length);
@@ -175,8 +173,7 @@
for (int i = 0; i < 3; i++) {
TestElement sampler = null;
while ((sampler = controller.next()) != null) {
- assertEquals("Counter: " + counter + ",
i: " + i, order[counter % order.length], sampler
-
.getPropertyAsString(TestElement.NAME));
+ assertEquals("Counter: " + counter + ",
i: " + i, order[counter % order.length], sampler.getName());
counter++;
}
assertEquals(counter, 150 * order.length);
@@ -208,8 +205,7 @@
for (int i = 0; i < 3; i++) {
TestElement sampler = null;
while ((sampler = controller.next()) != null) {
- assertEquals("Counter: " + counter + ",
i: " + i, order[counter % order.length], sampler
-
.getPropertyAsString(TestElement.NAME));
+ assertEquals("Counter: " + counter + ",
i: " + i, order[counter % order.length], sampler.getName());
counter++;
}
assertEquals(counter, 150 * order.length);
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestWhileController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestWhileController.java?rev=602158&r1=602157&r2=602158&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestWhileController.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestWhileController.java
Fri Dec 7 09:20:22 2007
@@ -65,7 +65,7 @@
if (s == null) {
return null;
} else {
- return s.getPropertyAsString(TestElement.NAME);
+ return s.getName();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
