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 14:59:28 UTC
svn commit: r1730207 - in /jmeter/trunk/src/components/org/apache/jmeter:
control/ sampler/ visualizers/ visualizers/backend/graphite/
Author: pmouawad
Date: Sat Feb 13 13:59:28 2016
New Revision: 1730207
URL: http://svn.apache.org/viewvc?rev=1730207&view=rev
Log:
Respect naming conventions
Patch by Benoit Wiart Part 1
https://github.com/apache/jmeter/pull/115/files
Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/SwitchController.java
jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/control/SwitchController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/SwitchController.java?rev=1730207&r1=1730206&r2=1730207&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/SwitchController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/SwitchController.java Sat Feb 13 13:59:28 2016
@@ -106,18 +106,18 @@ public class SwitchController extends Ge
private int scanControllerNames(String sel){
int i = 0;
- int default_pos = Integer.MAX_VALUE;
+ int defaultPos = Integer.MAX_VALUE;
for(TestElement el : getSubControllers()) {
String name=el.getName();
if (name.equals(sel)) {
return i;
}
if (name.equalsIgnoreCase("default")) { //$NON-NLS-1$
- default_pos = i;
+ defaultPos = i;
}
i++;
}
- return default_pos;
+ return defaultPos;
}
public String getSelection() {
Modified: jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java?rev=1730207&r1=1730206&r2=1730207&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java Sat Feb 13 13:59:28 2016
@@ -107,20 +107,20 @@ public class TestAction extends Abstract
return null; // This means no sample is saved
}
- private void pause(String mili_s) {
- long milis;
+ private void pause(String timeInMillis) {
+ long millis;
try {
- milis=Long.parseLong(mili_s);
+ millis=Long.parseLong(timeInMillis);
} catch (NumberFormatException e){
- log.warn("Could not create number from "+mili_s);
- milis=0;
+ log.warn("Could not create number from "+timeInMillis);
+ millis=0;
}
try {
pauseThread = Thread.currentThread();
- if(milis>0) {
- TimeUnit.MILLISECONDS.sleep(milis);
- } else if(milis<0) {
- throw new IllegalArgumentException("Configured sleep is negative:"+milis);
+ if(millis>0) {
+ TimeUnit.MILLISECONDS.sleep(millis);
+ } else if(millis<0) {
+ throw new IllegalArgumentException("Configured sleep is negative:"+millis);
} // else == 0 we do nothing
} catch (InterruptedException e) {
// NOOP
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java?rev=1730207&r1=1730206&r2=1730207&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java Sat Feb 13 13:59:28 2016
@@ -49,7 +49,7 @@ public class DistributionGraph extends J
private SamplingStatCalculator model;
- private static final int xborder = 30;
+ private static final int X_BORDER = 30;
/**
* Constructor for the Graph object.
@@ -149,7 +149,7 @@ public class DistributionGraph extends J
}
}
- private void drawSample(SamplingStatCalculator p_model, Graphics g) {
+ private void drawSample(SamplingStatCalculator pModel, Graphics g) {
int width = getWidth();
double height = getHeight() - 1.0;
@@ -157,26 +157,26 @@ public class DistributionGraph extends J
for (int y = 0; y < 4; y++) {
int q1 = (int) (height - (height * 0.25 * y));
g.setColor(Color.lightGray);
- g.drawLine(xborder, q1, width, q1);
+ g.drawLine(X_BORDER, q1, width, q1);
g.setColor(Color.black);
g.drawString(String.valueOf((25 * y) + "%"), 0, q1);
}
g.setColor(Color.black);
// draw the X axis
- g.drawLine(xborder, (int) height, width, (int) height);
+ g.drawLine(X_BORDER, (int) height, width, (int) height);
// draw the Y axis
- g.drawLine(xborder, 0, xborder, (int) height);
+ g.drawLine(X_BORDER, 0, X_BORDER, (int) height);
// the test plan has to have more than 200 samples
// for it to generate half way decent distribution
// graph. the larger the sample, the better the
// results.
- if (p_model != null && p_model.getCount() > 50) {
+ if (pModel != null && pModel.getCount() > 50) {
// now draw the bar chart
- Number ninety = p_model.getPercentPoint(0.90);
- Number fifty = p_model.getPercentPoint(0.50);
+ Number ninety = pModel.getPercentPoint(0.90);
+ Number fifty = pModel.getPercentPoint(0.50);
- long total = p_model.getCount();
- Collection<Number[]> values = p_model.getDistribution().values();
+ long total = pModel.getCount();
+ Collection<Number[]> values = pModel.getDistribution().values();
Number[][] objval = values.toArray(new Number[values.size()][]);
// we sort the objects
Arrays.sort(objval, new NumberComparator());
@@ -191,7 +191,7 @@ public class DistributionGraph extends J
if (iheight < 1) {
iheight = 1.0;
}
- int ix = (count * 4) + xborder + 5;
+ int ix = (count * 4) + X_BORDER + 5;
int dheight = (int) (height - iheight);
g.setColor(Color.blue);
g.drawLine(ix - 1, (int) height, ix - 1, dheight);
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java?rev=1730207&r1=1730206&r2=1730207&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java Sat Feb 13 13:59:28 2016
@@ -55,7 +55,7 @@ public class Graph extends JComponent im
private CachingStatCalculator model;
- private static final int width = 2000;
+ private static final int WIDTH = 2000;
private long graphMax = 1;
@@ -65,7 +65,7 @@ public class Graph extends JComponent im
* Constructor for the Graph object.
*/
public Graph() {
- this.setPreferredSize(new Dimension(width, 100));
+ this.setPreferredSize(new Dimension(WIDTH, 100));
}
/**
@@ -211,7 +211,7 @@ public class Graph extends JComponent im
// int width = getWidth();
int height = getHeight();
log.debug("Drawing a sample at " + x);
- int adjustedWidth = (int)(x % width); // will always be within range of an int: as must be < width
+ int adjustedWidth = (int)(x % WIDTH); // will always be within range of an int: as must be < width
if (wantData) {
int data = (int) (oneSample.getData() * height / graphMax);
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java?rev=1730207&r1=1730206&r2=1730207&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java Sat Feb 13 13:59:28 2016
@@ -325,8 +325,8 @@ public class TableVisualizer extends Abs
}
@Override
- public Object invoke(Object p_invokee) {
- Boolean success = (Boolean)super.invoke(p_invokee);
+ public Object invoke(Object pInvokee) {
+ Boolean success = (Boolean) super.invoke(pInvokee);
if(success != null) {
if(success.booleanValue()) {
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java?rev=1730207&r1=1730206&r2=1730207&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java Sat Feb 13 13:59:28 2016
@@ -59,7 +59,7 @@ public class SocketOutputStreamPoolFacto
/**
*/
@Override
- public boolean validateObject(SocketConnectionInfos HostAndPort, PooledObject<SocketOutputStream> socketOutputStream) {
+ public boolean validateObject(SocketConnectionInfos hostAndPort, PooledObject<SocketOutputStream> socketOutputStream) {
Socket socket = socketOutputStream.getObject().getSocket();
return socket.isConnected()
&& socket.isBound()