Author: sebb
Date: Mon Oct 24 16:03:51 2011
New Revision: 1188186
URL: http://svn.apache.org/viewvc?rev=1188186&view=rev
Log:
Generic for loops
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java
jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java?rev=1188186&r1=1188185&r2=1188186&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
Mon Oct 24 16:03:51 2011
@@ -183,10 +183,8 @@ public class PackageTest extends TestCas
}
final ArrayList<String> list = Collections.list(prb.getKeys());
Collections.sort(list);
- Iterator<String> enumr = list.iterator();
final boolean mainResourceFile = resname.startsWith("messages");
- while (enumr.hasNext()) {
- String key = enumr.next();
+ for (String key : list) {
try {
String val = defaultPRB.getString(key); // Also Check key
is in default
if (mainResourceFile && val.equals(prb.getString(key))){
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java?rev=1188186&r1=1188185&r2=1188186&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java
Mon Oct 24 16:03:51 2011
@@ -22,6 +22,7 @@ import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.util.Enumeration;
import java.util.Iterator;
+import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -167,13 +168,11 @@ public class PackageTest extends JMeterT
public static Test suite() throws Exception {
TestSuite suite = new TestSuite("Bean Resource Test Suite");
- Iterator<String> iter =
ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(), new Class[] {
TestBean.class })
- .iterator();
+ List<String> testBaeanclassNames =
ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(), new Class[] {
TestBean.class });
boolean errorDetected = false;
JMeterUtils.setLocale(defaultLocale);
- while (iter.hasNext()) {
- String className = iter.next();
+ for (String className : testBaeanclassNames) {
Class<?> testBeanClass = Class.forName(className);
ResourceBundle defaultBundle = null;
try {
Modified: jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java?rev=1188186&r1=1188185&r2=1188186&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java Mon Oct
24 16:03:51 2011
@@ -330,9 +330,7 @@ public final class AllTests {
int sz=classList.size();
log.info("ClassFinder(TestCase) found: "+sz+ " TestCase classes");
System.out.println("ClassFinder found: "+sz+ " TestCase classes");
- Iterator<String> classes = classList.iterator();
- while (classes.hasNext()) {
- String name = classes.next();
+ for (String name : classList) {
try {
/*
* TestSuite only finds testXXX() methods, and does not
look
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
