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 se...@apache.org on 2008/04/10 03:21:19 UTC
svn commit: r646610 [3/3] - in /jakarta/jmeter/trunk:
src/components/org/apache/jmeter/assertions/
src/components/org/apache/jmeter/config/
src/components/org/apache/jmeter/control/
src/components/org/apache/jmeter/control/gui/ src/components/org/apach...
Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java?rev=646610&r1=646609&r2=646610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java Wed Apr 9 18:21:09 2008
@@ -39,7 +39,7 @@
import org.apache.log.Logger;
/**
- * @author Thad Smith
+ * Sampler that can read from POP3 and IMAP mail servers
*/
public class MailReaderSampler extends AbstractSampler {
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -108,8 +108,9 @@
data.append(" messages found\n");
int n = getNumMessages();
- if (n == ALL_MESSAGES || n > messages.length)
+ if (n == ALL_MESSAGES || n > messages.length) {
n = messages.length;
+ }
// TODO - create a sample result for each message?
for (int i = 0; i < n; i++) {
@@ -131,8 +132,9 @@
Address[] recips = message.getAllRecipients();
for (int j = 0; j < recips.length; j++) {
data.append(recips[j].toString());
- if (j < recips.length - 1)
+ if (j < recips.length - 1) {
data.append("; "); // $NON-NLS-1$
+ }
}
data.append(NEW_LINE);
@@ -140,8 +142,9 @@
Address[] from = message.getFrom();
for (int j = 0; j < from.length; j++) {
data.append(from[j].toString());
- if (j < from.length - 1)
+ if (j < from.length - 1) {
data.append("; "); // $NON-NLS-1$
+ }
}
data.append(NEW_LINE);
Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java?rev=646610&r1=646609&r2=646610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java Wed Apr 9 18:21:09 2008
@@ -144,19 +144,21 @@
MailReaderSampler mrs = (MailReaderSampler) te;
- if (((String) serverTypeBox.getSelectedItem()).equals(POP3Label))
+ if (((String) serverTypeBox.getSelectedItem()).equals(POP3Label)) {
mrs.setServerType(MailReaderSampler.TYPE_POP3);
- else
+ } else {
mrs.setServerType(MailReaderSampler.TYPE_IMAP);
+ }
mrs.setFolder(folderBox.getText());
mrs.setServer(serverBox.getText());
mrs.setUserName(usernameBox.getText());
mrs.setPassword(passwordBox.getText());
- if (allMessagesButton.isSelected())
+ if (allMessagesButton.isSelected()) {
mrs.setNumMessages(MailReaderSampler.ALL_MESSAGES);
- else
+ } else {
mrs.setNumMessages(someMessagesField.getText());
+ }
mrs.setDeleteMessages(deleteBox.isSelected());
}
Modified: jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java?rev=646610&r1=646609&r2=646610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java (original)
+++ jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClientImpl.java Wed Apr 9 18:21:09 2008
@@ -116,8 +116,9 @@
try {
while ((x = is.read(buffer)) > -1) {
w.write(buffer, 0, x);
- if ((eolByte != 0) && (buffer[x - 1] == eolByte))
+ if ((eolByte != 0) && (buffer[x - 1] == eolByte)) {
break;
+ }
}
/*
* Timeout is reported as follows: JDK1.3: InterruptedIOException
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java?rev=646610&r1=646609&r2=646610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java (original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java Wed Apr 9 18:21:09 2008
@@ -1,4 +1,3 @@
-//$Header$
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -63,7 +62,6 @@
import org.apache.log.Logger;
/**
- * @author pete
*
* JMeterReport is the main class for the reporting component. For now,
* the plan is to make the reporting component a separate GUI, which
@@ -186,8 +184,9 @@
String icons[] = JOrphanUtils.split(p.getProperty(key), " ");
iconlist[i][0] = key;
iconlist[i][1] = icons[0];
- if (icons.length > 1)
+ if (icons.length > 1){
iconlist[i][2] = icons[1];
+ }
i++;
}
return iconlist;
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java?rev=646610&r1=646609&r2=646610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java (original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java Wed Apr 9 18:21:09 2008
@@ -33,13 +33,9 @@
import org.apache.jorphan.gui.JLabeledTextArea;
import org.apache.jorphan.gui.JLabeledTextField;
-/**
- * @author Peter Lin
- *
- */
public class ReportPageGui extends AbstractReportGui {
- private JLabeledTextField pageTitle = new JLabeledTextField(JMeterUtils.getResString("report_page_title"));;
+ private JLabeledTextField pageTitle = new JLabeledTextField(JMeterUtils.getResString("report_page_title"));
private JCheckBox makeIndex = new JCheckBox(JMeterUtils.getResString("report_page_index"));
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/AbstractAction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/AbstractAction.java?rev=646610&r1=646609&r2=646610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/AbstractAction.java (original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/AbstractAction.java Wed Apr 9 18:21:09 2008
@@ -36,8 +36,7 @@
import org.apache.log.Logger;
/**
- * @author mstover
- * @version $Revision$
+ * Parent class for implementing Menu item commands
*/
public abstract class AbstractAction implements Command {
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -57,8 +56,9 @@
Iterator iter = new LinkedList(tree.list()).iterator();
while (iter.hasNext()) {
Object o = iter.next();
- if(o instanceof TestElement)
+ if(o instanceof TestElement) {
continue; //hey, no need to convert
+ }
ReportTreeNode item = (ReportTreeNode) o;
if (item.isEnabled()) {
if (item.getUserObject() instanceof ReplaceableController) {
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportDragNDrop.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportDragNDrop.java?rev=646610&r1=646609&r2=646610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportDragNDrop.java (original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportDragNDrop.java Wed Apr 9 18:21:09 2008
@@ -1,4 +1,3 @@
-//$Header$
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,10 +32,6 @@
import org.apache.jmeter.testelement.TestPlan;
import org.apache.jmeter.testelement.WorkBench;
-/**
- * @author Peter Lin
- * @version $Revision$
- */
public class ReportDragNDrop extends AbstractAction {
public final static String ADD = "drag_n_drop.add";//$NON-NLS-1$
@@ -97,18 +92,23 @@
* @return whether it is OK to add the dragged nodes to this parent
*/
static boolean canAddTo(ReportTreeNode parentNode) {
- if (null == parentNode)
+ if (null == parentNode) {
return false;
+ }
TestElement te = parentNode.getTestElement();
// System.out.println("Add to: "+te.getClass().getName());
- if (te instanceof Controller)
+ if (te instanceof Controller) {
return true;
- if (te instanceof Sampler)
+ }
+ if (te instanceof Sampler) {
return true;
- if (te instanceof WorkBench)
+ }
+ if (te instanceof WorkBench) {
return true;
- if (te instanceof TestPlan)
+ }
+ if (te instanceof TestPlan) {
return true;
+ }
return false;
}
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportCellRenderer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportCellRenderer.java?rev=646610&r1=646609&r2=646610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportCellRenderer.java (original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportCellRenderer.java Wed Apr 9 18:21:09 2008
@@ -25,10 +25,6 @@
import javax.swing.JTree;
import javax.swing.tree.DefaultTreeCellRenderer;
-/**
- * @author Peter Lin
- * @version $Revision$
- */
public class ReportCellRenderer extends DefaultTreeCellRenderer {
public ReportCellRenderer() {
}
@@ -51,8 +47,9 @@
// Must therefore set the enabled icon so there is at least some
// icon
ic = ((ReportTreeNode) value).getIcon();
- if (ic != null)
+ if (ic != null) {
setIcon(ic);
+ }
}
}
this.setEnabled(enabled);
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java?rev=646610&r1=646609&r2=646610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java (original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java Wed Apr 9 18:21:09 2008
@@ -38,12 +38,6 @@
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.collections.ListedHashTree;
-/**
- *
- * author Peter Lin
- *
- * @version $Revision$
- */
public class ReportTreeModel extends DefaultTreeModel {
public ReportTreeModel() {
@@ -152,8 +146,9 @@
while (enumNode.hasMoreElements()) {
ReportTreeNode child = (ReportTreeNode) enumNode.nextElement();
ReportTreeNode result = traverseAndFind(userObject, child);
- if (result != null)
+ if (result != null) {
return result;
+ }
}
return null;
}
Modified: jakarta/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java?rev=646610&r1=646609&r2=646610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java Wed Apr 9 18:21:09 2008
@@ -949,7 +949,9 @@
final int size = clOptions.size();
StringBuffer sb = new StringBuffer();
for (int i=0; i< size; i++){
- if (i>0) sb.append(" ");
+ if (i>0) {
+ sb.append(" ");
+ }
sb.append(((CLOption)clOptions.get(i)).toShortString());
}
assertEquals("Canonical form ("+size+")",canon,sb.toString());
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=646610&r1=646609&r2=646610&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 Wed Apr 9 18:21:09 2008
@@ -33,10 +33,10 @@
import org.apache.jmeter.threads.JMeterVariables;
public class TestSwitchController extends JMeterTestCase {
- static {
- // LoggingManager.setPriority("DEBUG","jmeter");
- // LoggingManager.setTarget(new java.io.PrintWriter(System.out));
- }
+// static {
+// LoggingManager.setPriority("DEBUG","jmeter");
+// LoggingManager.setTarget(new java.io.PrintWriter(System.out));
+// }
public TestSwitchController(String name) {
super(name);
@@ -48,10 +48,9 @@
String n;
if (s == null) {
return null;
- } else {
- n = s.getName();
- return n;
}
+ n = s.getName();
+ return n;
}
public void test() throws Exception {
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=646610&r1=646609&r2=646610&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 Wed Apr 9 18:21:09 2008
@@ -30,10 +30,10 @@
import org.apache.jmeter.threads.JMeterVariables;
public class TestWhileController extends JMeterTestCase {
- static {
- // LoggingManager.setPriority("DEBUG","jmeter");
- // LoggingManager.setTarget(new java.io.PrintWriter(System.out));
- }
+// static {
+// LoggingManager.setPriority("DEBUG","jmeter");
+// LoggingManager.setTarget(new java.io.PrintWriter(System.out));
+// }
public TestWhileController(String name) {
super(name);
@@ -64,9 +64,8 @@
Sampler s = c.next();
if (s == null) {
return null;
- } else {
- return s.getName();
}
+ return s.getName();
}
// While (blank), previous sample OK - should loop until false
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/PackageTest.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/PackageTest.java?rev=646610&r1=646609&r2=646610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/PackageTest.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/PackageTest.java Wed Apr 9 18:21:09 2008
@@ -52,10 +52,10 @@
private static final Logger log = LoggingManager.getLoggerForClass();
- static {
- // LoggingManager.setPriority("DEBUG","jmeter");
- // LoggingManager.setTarget(new java.io.PrintWriter(System.out));
- }
+// static {
+// LoggingManager.setPriority("DEBUG","jmeter");
+// LoggingManager.setTarget(new java.io.PrintWriter(System.out));
+// }
public PackageTest(String arg0) {
super(arg0);
@@ -65,10 +65,12 @@
private static CSVRead setCSVReadParams(String p1, String p2) throws Exception {
CSVRead cr = new CSVRead();
Collection parms = new LinkedList();
- if (p1 != null)
+ if (p1 != null) {
parms.add(new CompoundVariable(p1));
- if (p2 != null)
+ }
+ if (p2 != null) {
parms.add(new CompoundVariable(p2));
+ }
cr.setParameters(parms);
return cr;
}
@@ -77,14 +79,18 @@
private static StringFromFile SFFParams(String p1, String p2, String p3, String p4) throws Exception {
StringFromFile sff = new StringFromFile();
Collection parms = new LinkedList();
- if (p1 != null)
+ if (p1 != null) {
parms.add(new CompoundVariable(p1));
- if (p2 != null)
+ }
+ if (p2 != null) {
parms.add(new CompoundVariable(p2));
- if (p3 != null)
+ }
+ if (p3 != null) {
parms.add(new CompoundVariable(p3));
- if (p4 != null)
+ }
+ if (p4 != null) {
parms.add(new CompoundVariable(p4));
+ }
sff.setParameters(parms);
return sff;
}
@@ -94,10 +100,12 @@
SplitFunction split = new SplitFunction();
Collection parms = new LinkedList();
parms.add(new CompoundVariable(p1));
- if (p2 != null)
+ if (p2 != null) {
parms.add(new CompoundVariable(p2));
- if (p3 != null)
+ }
+ if (p3 != null) {
parms.add(new CompoundVariable(p3));
+ }
split.setParameters(parms);
return split;
}
@@ -111,12 +119,15 @@
private static Collection MakeParams(String p1, String p2, String p3) {
Collection parms = new LinkedList();
- if (p1 != null)
+ if (p1 != null) {
parms.add(new CompoundVariable(p1));
- if (p2 != null)
+ }
+ if (p2 != null) {
parms.add(new CompoundVariable(p2));
- if (p3 != null)
+ }
+ if (p3 != null) {
parms.add(new CompoundVariable(p3));
+ }
return parms;
}
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java?rev=646610&r1=646609&r2=646610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java Wed Apr 9 18:21:09 2008
@@ -239,8 +239,9 @@
private int scanprintMap(Map m, String t) {
Set s = m.keySet();
int unseen = 0;
- if (s.size() == 0)
+ if (s.size() == 0) {
return 0;
+ }
Iterator i = s.iterator();
while (i.hasNext()) {
Object key = i.next();
@@ -372,9 +373,9 @@
if (funcTitles.size() > 0) {
String title = funcItem.getReferenceKey();
boolean ct = funcTitles.containsKey(title);
- if (ct)
- funcTitles.put(title, Boolean.TRUE);// For detecting extra
- // entries
+ if (ct) {
+ funcTitles.put(title, Boolean.TRUE);// For detecting extra entries
+ }
if (// Is this a work in progress ?
title.indexOf("(ALPHA") == -1 && title.indexOf("(EXPERIMENTAL") == -1) {// No,
// not
@@ -384,8 +385,9 @@
// progress
// ...
String s = "function.xml needs '" + title + "' entry for " + funcItem.getClass().getName();
- if (!ct)
+ if (!ct) {
log.warn(s); // Record in log as well
+ }
assertTrue(s, ct);
}
}
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java?rev=646610&r1=646609&r2=646610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java Wed Apr 9 18:21:09 2008
@@ -76,7 +76,7 @@
}
};
return setup;
- };
+ }
/**
* Utility method to handle starting the HttpMirrorServer for testing.
@@ -96,7 +96,9 @@
if (e != null) {// Already failed
throw new Exception("Could not start mirror server on port: "+port+". "+e);
}
- if (server.isAlive()) break; // succeeded
+ if (server.isAlive()) {
+ break; // succeeded
+ }
}
if (!server.isAlive()){
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java?rev=646610&r1=646609&r2=646610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java Wed Apr 9 18:21:09 2008
@@ -63,13 +63,13 @@
private static class StaticTestClass // Can't instantiate
{
private StaticTestClass() {
- };
+ }
}
private class TestClass // Can't instantiate
{
private TestClass() {
- };
+ }
}
private static class TestData {
@@ -193,8 +193,9 @@
HTMLParser.getParser("java.lang.String");
fail("Should not have been able to create the parser");
} catch (HTMLParseError e) {
- if (e.getCause() instanceof ClassCastException)
+ if (e.getCause() instanceof ClassCastException) {
return;
+ }
throw e;
}
}
@@ -204,8 +205,9 @@
HTMLParser.getParser(TestClass.class.getName());
fail("Should not have been able to create the parser");
} catch (HTMLParseError e) {
- if (e.getCause() instanceof InstantiationException)
+ if (e.getCause() instanceof InstantiationException) {
return;
+ }
throw e;
}
}
@@ -215,10 +217,12 @@
HTMLParser.getParser(StaticTestClass.class.getName());
fail("Should not have been able to create the parser");
} catch (HTMLParseError e) {
- if (e.getCause() instanceof ClassCastException)
+ if (e.getCause() instanceof ClassCastException) {
return;
- if (e.getCause() instanceof IllegalAccessException)
+ }
+ if (e.getCause() instanceof IllegalAccessException) {
return;
+ }
throw e;
}
}
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java?rev=646610&r1=646609&r2=646610&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java Wed Apr 9 18:21:09 2008
@@ -97,7 +97,7 @@
}
};
return setup;
- };
+ }
public void testPostRequest_UrlEncoded() throws Exception {
testPostRequest_UrlEncoded(HTTP_SAMPLER, ISO_8859_1);
@@ -1018,9 +1018,7 @@
// The value is in the first group, group 0 is the whole match
return localMatcher.getMatch().group(1);
}
- else {
- return null;
- }
+ return null;
}
private boolean checkRegularExpression(String stringToCheck, String regularExpression) {
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=646610&r1=646609&r2=646610&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 Wed Apr 9 18:21:09 2008
@@ -41,10 +41,10 @@
* Find all beans out there and check their resource property files: - Check
* that non-default property files don't have any extra keys. - Check all
* necessary properties are defined at least in the default property file,
- * except for beans whose name contains "Experimental" or "Alpha". TODO: - Check
- * property files don't have duplicate keys (is this important)
+ * except for beans whose name contains "Experimental" or "Alpha".
+ *
+ * TODO: - Check property files don't have duplicate keys (is this important)
*
- * @version $Revision$ updated on $Date$
*/
public class PackageTest extends JMeterTestCase {
private static Logger log = LoggingManager.getLoggerForClass();
@@ -91,8 +91,9 @@
throw new Error(e.toString()); // Programming error. Don't
// continue.
}
- if (bundle == null)
+ if (bundle == null) {
throw new Error("This can't happen!");
+ }
}
public void tearDown() {
@@ -100,10 +101,11 @@
}
public void runTest() {
- if (bundle == defaultBundle)
+ if (bundle == defaultBundle) {
checkAllNecessaryKeysPresent();
- else
+ } else {
checkNoInventedKeys();
+ }
}
public void checkNoInventedKeys() {
@@ -122,8 +124,9 @@
String dn = defaultBundle.getString("displayName").toUpperCase(Locale.ENGLISH);
// Skip the rest of this test for alpha/experimental beans:
- if (dn.indexOf("(ALPHA") != -1 || dn.indexOf("(EXPERIMENTAL") != -1)
+ if (dn.indexOf("(ALPHA") != -1 || dn.indexOf("(EXPERIMENTAL") != -1) {
return;
+ }
// Check for property- and group-related texts:
PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
@@ -131,13 +134,15 @@
// 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)
+ || descriptors[i].getWriteMethod() == null) {
continue;
+ }
// Ignore TestElement properties which don't have an explicit
// editor:
if (TestElement.class.isAssignableFrom(descriptors[i].getPropertyType())
- && descriptors[i].getPropertyEditorClass() == null)
+ && descriptors[i].getPropertyEditorClass() == null) {
continue;
+ }
// Done -- we're working with an editable property.
String name = descriptors[i].getName();
@@ -146,8 +151,9 @@
// bundle.getString(name+".shortDescription"); NOT MANDATORY
String group = (String) descriptors[i].getValue(GenericTestBeanCustomizer.GROUP);
- if (group != null)
- bundle.getString(group + ".displayName");
+ if (group != null) {
+ bundle.getString( group + ".displayName");
+ }
}
}
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=646610&r1=646609&r2=646610&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 Wed Apr 9 18:21:09 2008
@@ -91,8 +91,6 @@
* </dl>
*
* @see UnitTestManager
- * @author Michael Stover (mstover1 at apache.org)
- * @version $Revision$
*/
public final class AllTests {
transient private static Logger log = LoggingManager.getLoggerForClass();
@@ -106,8 +104,9 @@
private static void logprop(String prop, boolean show) {
String value = System.getProperty(prop);
log.info(prop + "=" + value);
- if (show)
+ if (show) {
System.out.println(prop + "=" + value);
+ }
}
private static void logprop(String prop) {
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org