You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/02/13 15:47:47 UTC
svn commit: r1730224 - in /jmeter/trunk:
src/functions/org/apache/jmeter/functions/
src/monitor/components/org/apache/jmeter/visualizers/
test/src/org/apache/commons/cli/avalon/
test/src/org/apache/jmeter/assertions/ test/src/org/apache/jmeter/control/...
Author: pmouawad
Date: Sat Feb 13 14:47:47 2016
New Revision: 1730224
URL: http://svn.apache.org/viewvc?rev=1730224&view=rev
Log:
Used foreach where possible.
Patch by Graham Russell Part 3
https://github.com/apache/jmeter/pull/114
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java
jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java
jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java
jmeter/trunk/test/src/org/apache/jmeter/control/TestSwitchController.java
jmeter/trunk/test/src/org/apache/jmeter/functions/SumFunctionTest.java
jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java
jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java
jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java?rev=1730224&r1=1730223&r2=1730224&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java Sat Feb 13 14:47:47 2016
@@ -219,11 +219,11 @@ public class RegexFunction extends Abstr
private String generateResult(MatchResult match, String namep, Object[] template, JMeterVariables vars) {
saveGroups(match, namep, vars);
StringBuilder result = new StringBuilder();
- for (int a = 0; a < template.length; a++) {
- if (template[a] instanceof String) {
- result.append(template[a]);
+ for (Object t : template) {
+ if (t instanceof String) {
+ result.append(t);
} else {
- result.append(match.group(((Integer) template[a]).intValue()));
+ result.append(match.group(((Integer) t).intValue()));
}
}
if (namep.length() > 0){
Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java?rev=1730224&r1=1730223&r2=1730224&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java (original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java Sat Feb 13 14:47:47 2016
@@ -229,8 +229,7 @@ public class MonitorAccumModel implement
* the {@link MonitorModel} that should be sent to the listeners
*/
public void notifyListeners(MonitorModel model) {
- for (int idx = 0; idx < listeners.size(); idx++) {
- MonitorListener ml = listeners.get(idx);
+ for (MonitorListener ml : listeners) {
ml.addSample(model);
}
}
Modified: jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java?rev=1730224&r1=1730223&r2=1730224&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java (original)
+++ jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java Sat Feb 13 14:47:47 2016
@@ -673,8 +673,8 @@ public final class ClutilTestCase {
final int size = clOptions.size();
assertEquals(4, size);
- for (int i = 0; i < size; i++) {
- assertEquals(DEFINE_OPT, clOptions.get(i).getDescriptor().getId());
+ for (CLOption clOption : clOptions) {
+ assertEquals(DEFINE_OPT, clOption.getDescriptor().getId());
}
CLOption option;
Modified: jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java?rev=1730224&r1=1730223&r2=1730224&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java Sat Feb 13 14:47:47 2016
@@ -220,8 +220,8 @@ public class ResponseAssertionTest {
threads[i] = new TestThread(latch);
}
failed = new AtomicInteger(0);
- for (int i = 0; i < threads.length; i++) {
- threads[i].start();
+ for (Thread thread : threads) {
+ thread.start();
}
latch.await();
assertEquals(failed.get(), 0);
Modified: jmeter/trunk/test/src/org/apache/jmeter/control/TestSwitchController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/control/TestSwitchController.java?rev=1730224&r1=1730223&r2=1730224&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/control/TestSwitchController.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/control/TestSwitchController.java Sat Feb 13 14:47:47 2016
@@ -246,8 +246,8 @@ public class TestSwitchController extend
controller.initialize();
for (int i = 1; i <= 3; i++) {
assertEquals("Loop:" + i, "before", nextName(controller));
- for (int j = 0; j < exp.length; j++) {
- assertEquals("Loop:" + i, exp[j], nextName(controller));
+ for (String anExp : exp) {
+ assertEquals("Loop:" + i, anExp, nextName(controller));
}
assertEquals("Loop:" + i, "after", nextName(controller));
}
Modified: jmeter/trunk/test/src/org/apache/jmeter/functions/SumFunctionTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/functions/SumFunctionTest.java?rev=1730224&r1=1730223&r2=1730224&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/functions/SumFunctionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/functions/SumFunctionTest.java Sat Feb 13 14:47:47 2016
@@ -79,8 +79,8 @@ public class SumFunctionTest extends JMe
// Perform a sum and check the results
private void checkSum(AbstractFunction func, String value, String [] addends) throws Exception {
Collection<CompoundVariable> parms = new LinkedList<>();
- for (int i=0; i< addends.length; i++){
- parms.add(new CompoundVariable(addends[i]));
+ for (String addend : addends) {
+ parms.add(new CompoundVariable(addend));
}
parms.add(new CompoundVariable("Result"));
func.setParameters(parms);
@@ -91,8 +91,8 @@ public class SumFunctionTest extends JMe
// Perform a sum and check the results
private void checkSumNoVar(AbstractFunction func, String value, String [] addends) throws Exception {
Collection<CompoundVariable> parms = new LinkedList<>();
- for (int i=0; i< addends.length; i++){
- parms.add(new CompoundVariable(addends[i]));
+ for (String addend : addends) {
+ parms.add(new CompoundVariable(addend));
}
func.setParameters(parms);
assertEquals(value,func.execute(null,null));
Modified: jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java?rev=1730224&r1=1730223&r2=1730224&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java Sat Feb 13 14:47:47 2016
@@ -178,14 +178,13 @@ public class JMeterTest extends JMeterTe
Element body = root.getChild("body");
@SuppressWarnings("unchecked")
List<Element> sections = body.getChildren("section");
- for (int i = 0; i < sections.size(); i++) {
+ for (Element section : sections) {
@SuppressWarnings("unchecked")
- List<Element> components = sections.get(i).getChildren("component");
- for (int j = 0; j < components.size(); j++) {
- Element comp = components.get(j);
- String nm=comp.getAttributeValue("name");
- if (!nm.equals("SSL Manager")){// Not a true GUI component
- guiTitles.put(nm.replace(' ','_'), Boolean.FALSE);
+ List<Element> components = section.getChildren("component");
+ for (Element comp : components) {
+ String nm = comp.getAttributeValue("name");
+ if (!nm.equals("SSL Manager")) {// Not a true GUI component
+ guiTitles.put(nm.replace(' ', '_'), Boolean.FALSE);
}
}
}
@@ -208,11 +207,10 @@ public class JMeterTest extends JMeterTe
Element body = root.getChild("body");
@SuppressWarnings("unchecked")
List<Element> sections = body.getChildren("section");
- for (int i = 0; i < sections.size(); i++) {
+ for (Element section : sections) {
@SuppressWarnings("unchecked")
- List<Element> components = sections.get(i).getChildren("component");
- for (int j = 0; j < components.size(); j++) {
- Element comp = components.get(j);
+ List<Element> components = section.getChildren("component");
+ for (Element comp : components) {
guiTags.put(comp.getAttributeValue("tag"), Boolean.FALSE);
}
}
@@ -232,16 +230,15 @@ public class JMeterTest extends JMeterTe
Element body = root.getChild("body");
Element section = body.getChild("section");
@SuppressWarnings("unchecked")
- List<Element> sections = section.getChildren("subsection");
- for (int i = 0; i < sections.size(); i++) {
+ List<Element> subSections = section.getChildren("subsection");
+ for (Element subSection : subSections) {
@SuppressWarnings("unchecked")
- List<Element> components = sections.get(i).getChildren("component");
- for (int j = 0; j < components.size(); j++) {
- Element comp = components.get(j);
+ List<Element> components = subSection.getChildren("component");
+ for (Element comp : components) {
funcTitles.put(comp.getAttributeValue("name"), Boolean.FALSE);
String tag = comp.getAttributeValue("tag");
- if (tag != null){
- funcTitles.put(tag, Boolean.FALSE);
+ if (tag != null) {
+ funcTitles.put(tag, Boolean.FALSE);
}
}
}
@@ -253,9 +250,7 @@ public class JMeterTest extends JMeterTe
if (s.size() == 0) {
return 0;
}
- Iterator<String> i = s.iterator();
- while (i.hasNext()) {
- String key = i.next();
+ for (String key : s) {
if (!m.get(key).equals(Boolean.TRUE)) {
if (unseen == 0)// first time
{
@@ -283,14 +278,13 @@ public class JMeterTest extends JMeterTe
*/
private static Test suiteGUIComponents() throws Exception {
TestSuite suite = new TestSuite("GuiComponents");
- Iterator<Object> iter = getObjects(JMeterGUIComponent.class).iterator();
- while (iter.hasNext()) {
- JMeterGUIComponent item = (JMeterGUIComponent) iter.next();
+ for (Object o : getObjects(JMeterGUIComponent.class)) {
+ JMeterGUIComponent item = (JMeterGUIComponent) o;
if (item instanceof JMeterTreeNode) {
System.out.println("o.a.j.junit.JMeterTest INFO: JMeterGUIComponent: skipping all tests " + item.getClass().getName());
continue;
}
- if (item instanceof ObsoleteGui){
+ if (item instanceof ObsoleteGui) {
continue;
}
TestSuite ts = new TestSuite(item.getClass().getName());
@@ -311,9 +305,7 @@ public class JMeterTest extends JMeterTe
*/
private static Test suiteFunctions() throws Exception {
TestSuite suite = new TestSuite("Functions");
- Iterator<Object> iter = getObjects(Function.class).iterator();
- while (iter.hasNext()) {
- Object item = iter.next();
+ for (Object item : getObjects(Function.class)) {
if (item.getClass().equals(CompoundVariable.class)) {
continue;
}
@@ -330,9 +322,8 @@ public class JMeterTest extends JMeterTe
*/
private static Test suiteBeanComponents() throws Exception {
TestSuite suite = new TestSuite("BeanComponents");
- Iterator<Object> iter = getObjects(TestBean.class).iterator();
- while (iter.hasNext()) {
- Class<? extends Object> c = iter.next().getClass();
+ for (Object o : getObjects(TestBean.class)) {
+ Class<? extends Object> c = o.getClass();
try {
JMeterGUIComponent item = new TestBeanGUI(c);
// JMeterGUIComponent item = (JMeterGUIComponent) iter.next();
@@ -407,9 +398,7 @@ public class JMeterTest extends JMeterTe
* Check that function descriptions are OK
*/
public void runFunction2() throws Exception {
- Iterator<?> i = funcItem.getArgumentDesc().iterator();
- while (i.hasNext()) {
- Object o = i.next();
+ for (Object o : funcItem.getArgumentDesc()) {
assertTrue("Description must be a String", o instanceof String);
assertFalse("Description must not start with [refkey", ((String) o).startsWith("[refkey"));
}
@@ -479,9 +468,8 @@ public class JMeterTest extends JMeterTe
*/
private static Test suiteSerializableElements() throws Exception {
TestSuite suite = new TestSuite("SerializableElements");
- Iterator<Object> iter = getObjects(Serializable.class).iterator();
- while (iter.hasNext()) {
- Serializable serObj = (Serializable) iter.next();
+ for (Object o : getObjects(Serializable.class)) {
+ Serializable serObj = (Serializable) o;
if (serObj.getClass().getName().endsWith("_Stub")) {
continue;
}
@@ -518,9 +506,8 @@ public class JMeterTest extends JMeterTe
*/
private static Test suiteTestElements() throws Exception {
TestSuite suite = new TestSuite("TestElements");
- Iterator<Object> iter = getObjects(TestElement.class).iterator();
- while (iter.hasNext()) {
- TestElement item = (TestElement) iter.next();
+ for (Object o : getObjects(TestElement.class)) {
+ TestElement item = (TestElement) o;
TestSuite ts = new TestSuite(item.getClass().getName());
ts.addTest(new JMeterTest("runTestElement", item));
suite.addTest(ts);
@@ -625,15 +612,15 @@ public class JMeterTest extends JMeterTe
System.out.println("No classes found that extend " + exName + ". Check the following:");
System.out.println("Search paths are:");
String ss[] = JMeterUtils.getSearchPaths();
- for (int i = 0; i < ss.length; i++) {
- System.out.println(ss[i]);
+ for (String s : ss) {
+ System.out.println(s);
}
if (!classPathShown) {// Only dump it once
System.out.println("Class path is:");
String cp = System.getProperty("java.class.path");
- String cpe[] = JOrphanUtils.split(cp, java.io.File.pathSeparator);
- for (int i = 0; i < cpe.length; i++) {
- System.out.println(cpe[i]);
+ String classPathElements[] = JOrphanUtils.split(cp, java.io.File.pathSeparator);
+ for (String classPathElement : classPathElements) {
+ System.out.println(classPathElement);
}
classPathShown = true;
}
Modified: jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java?rev=1730224&r1=1730223&r2=1730224&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java Sat Feb 13 14:47:47 2016
@@ -184,8 +184,7 @@ public class PackageTest extends TestCas
// Look for duplicate keys in the file
String last = "";
- for (int i = 0; i < alf.size(); i++) {
- String curr = alf.get(i);
+ for (String curr : alf) {
if (curr.equals(last)) {
subTestFailures++;
System.out.println("\nDuplicate key =" + curr + " in " + res);
@@ -361,9 +360,8 @@ public class PackageTest extends TestCas
InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(languageBundle);
if(inputStream == null) {
Map<String, String> messagesAsProperties = new HashMap<>();
- for (Iterator<Map.Entry<Object, Object>> iterator = messages.entrySet().iterator(); iterator.hasNext();) {
- Map.Entry<Object, Object> entry = iterator.next();
- messagesAsProperties.put((String) entry.getKey(), (String) entry.getValue());
+ for (Map.Entry<Object, Object> entry : messages.entrySet()) {
+ messagesAsProperties.put((String) entry.getKey(), (String) entry.getValue());
}
missingLabelsPerBundle.put(languageBundle, messagesAsProperties);
return;
@@ -371,22 +369,21 @@ public class PackageTest extends TestCas
messagesFr.load(inputStream);
Map<String, String> missingLabels = new TreeMap<>();
- for (Iterator<Map.Entry<Object,Object>> iterator = messages.entrySet().iterator(); iterator.hasNext();) {
- Map.Entry<Object,Object> entry = iterator.next();
- String key = (String)entry.getKey();
+ for (Map.Entry<Object, Object> entry : messages.entrySet()) {
+ String key = (String) entry.getKey();
final String I18NString = "[\\d% ]+";// numeric, space and % don't need translation
- if(!messagesFr.containsKey(key)) {
+ if (!messagesFr.containsKey(key)) {
String value = (String) entry.getValue();
// TODO improve check of values that don't need translation
if (value.matches(I18NString)) {
// System.out.println("Ignoring missing "+key+"="+value+" in "+languageBundle); // TODO convert to list and display at end
} else {
- missingLabels.put(key,(String) entry.getValue());
+ missingLabels.put(key, (String) entry.getValue());
}
} else {
String value = (String) entry.getValue();
if (value.matches(I18NString)) {
- System.out.println("Unnecessary entry "+key+"="+value+" in "+languageBundle);
+ System.out.println("Unnecessary entry " + key + "=" + value + " in " + languageBundle);
}
}
}
@@ -402,12 +399,10 @@ public class PackageTest extends TestCas
*/
private String printLabels(Map<String, Map<String, String>> missingLabelsPerBundle) {
StringBuilder builder = new StringBuilder();
- for (Iterator<Map.Entry<String,Map<String, String>>> iterator = missingLabelsPerBundle.entrySet().iterator(); iterator.hasNext();) {
- Map.Entry<String,Map<String, String>> entry = iterator.next();
- builder.append("Missing labels in bundle:"+entry.getKey()+"\r\n");
- for (Iterator<Map.Entry<String,String>> it2 = entry.getValue().entrySet().iterator(); it2.hasNext();) {
- Map.Entry<String,String> entry2 = it2.next();
- builder.append(entry2.getKey()+"="+entry2.getValue()+"\r\n");
+ for (Map.Entry<String, Map<String, String>> entry : missingLabelsPerBundle.entrySet()) {
+ builder.append("Missing labels in bundle:" + entry.getKey() + "\r\n");
+ for (Map.Entry<String, String> entry2 : entry.getValue().entrySet()) {
+ builder.append(entry2.getKey() + "=" + entry2.getValue() + "\r\n");
}
builder.append("======================================================\r\n");
}
Modified: jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java?rev=1730224&r1=1730223&r2=1730224&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java Sat Feb 13 14:47:47 2016
@@ -97,13 +97,11 @@ public class TestSaveService extends JMe
public void testLoadAndSave() throws Exception {
boolean failed = false; // Did a test fail?
- for (int i = 0; i < FILES.length; i++) {
- final String fileName = FILES[i];
+ for (final String fileName : FILES) {
final File testFile = findTestFile("testfiles/" + fileName);
failed |= loadAndSave(testFile, fileName, true);
}
- for (int i = 0; i < FILES_LINES.length; i++) {
- final String fileName = FILES_LINES[i];
+ for (final String fileName : FILES_LINES) {
final File testFile = findTestFile("testfiles/" + fileName);
failed |= loadAndSave(testFile, fileName, false);
}
@@ -191,23 +189,21 @@ public class TestSaveService extends JMe
@Test
public void testLoad() throws Exception {
- for (int i = 0; i < FILES_LOAD_ONLY.length; i++) {
- File file = findTestFile("testfiles/" + FILES_LOAD_ONLY[i]);
+ for (String fileName : FILES_LOAD_ONLY) {
+ File file = findTestFile("testfiles/" + fileName);
try {
- HashTree tree =SaveService.loadTree(file);
+ HashTree tree = SaveService.loadTree(file);
assertNotNull(tree);
- } catch(IllegalArgumentException ex) {
- fail("Exception loading "+file.getAbsolutePath());
+ } catch (IllegalArgumentException ex) {
+ fail("Exception loading " + file.getAbsolutePath());
}
-
}
-
}
@Test
public void testClasses(){
List<String> missingClasses = SaveService.checkClasses();
- if(missingClasses.size()>0) {
+ if (missingClasses.size() > 0) {
fail("One or more classes not found:"+missingClasses);
}
}
Modified: jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java?rev=1730224&r1=1730223&r2=1730224&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java Sat Feb 13 14:47:47 2016
@@ -134,28 +134,28 @@ public final class PackageTest extends J
// Check for property- and group-related texts:
PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
- for (int i = 0; i < descriptors.length; i++) {
+ for (PropertyDescriptor descriptor : descriptors) {
// Skip non-editable properties, that is:
// Ignore hidden, read-only, and write-only properties
- if (descriptors[i].isHidden() || descriptors[i].getReadMethod() == null
- || descriptors[i].getWriteMethod() == null) {
+ if (descriptor.isHidden() || descriptor.getReadMethod() == null
+ || descriptor.getWriteMethod() == null) {
continue;
}
// Ignore TestElement properties which don't have an explicit
// editor:
- if (TestElement.class.isAssignableFrom(descriptors[i].getPropertyType())
- && descriptors[i].getPropertyEditorClass() == null) {
+ if (TestElement.class.isAssignableFrom(descriptor.getPropertyType())
+ && descriptor.getPropertyEditorClass() == null) {
continue;
}
// Done -- we're working with an editable property.
- String name = descriptors[i].getName();
+ String name = descriptor.getName();
bundle.getString(name + ".displayName");
- String group = (String) descriptors[i].getValue(GenericTestBeanCustomizer.GROUP);
+ String group = (String) descriptor.getValue(GenericTestBeanCustomizer.GROUP);
if (group != null) {
- bundle.getString( group + ".displayName");
+ bundle.getString(group + ".displayName");
}
}
}