You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2015/07/04 20:04:18 UTC
svn commit: r1689187 [22/32] - in /jmeter/branches/HC4: ./ bin/
bin/templates/ bin/testfiles/ docs/ docs/css/ docs/images/screenshots/
docs/images/screenshots/assertion/ docs/images/screenshots/changes/2.13/
docs/usermanual/ lib/ licenses/bin/ res/mave...
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/control/IncludeController.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/control/IncludeController.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/control/IncludeController.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/control/IncludeController.java Sat Jul 4 18:04:12 2015
@@ -19,10 +19,8 @@
package org.apache.jmeter.control;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
import java.util.Iterator;
import java.util.LinkedList;
@@ -34,7 +32,6 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.logging.LoggingManager;
-import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
public class IncludeController extends GenericController implements ReplaceableController {
@@ -124,7 +121,6 @@ public class IncludeController extends G
protected HashTree loadIncludedElements() {
// only try to load the JMX test plan if there is one
final String includePath = getIncludePath();
- InputStream reader = null;
HashTree tree = null;
if (includePath != null && includePath.length() > 0) {
try {
@@ -142,8 +138,7 @@ public class IncludeController extends G
}
}
- reader = new FileInputStream(file);
- tree = SaveService.loadTree(reader);
+ tree = SaveService.loadTree(file);
// filter the tree for a TestFragment.
tree = getProperBranch(tree);
removeDisabledItems(tree);
@@ -168,9 +163,6 @@ public class IncludeController extends G
JMeterUtils.reportErrorToUser(msg);
log.warn("Unexpected error", ex);
}
- finally{
- JOrphanUtils.closeQuietly(reader);
- }
}
return tree;
}
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/control/RandomController.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/control/RandomController.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/control/RandomController.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/control/RandomController.java Sat Jul 4 18:04:12 2015
@@ -19,8 +19,7 @@
package org.apache.jmeter.control;
import java.io.Serializable;
-
-import org.apache.jmeter.util.ThreadLocalRandom;
+import java.util.concurrent.ThreadLocalRandom;
/**
* Controller that rans randomly one of it's children on each iteration
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java Sat Jul 4 18:04:12 2015
@@ -18,7 +18,9 @@
package org.apache.jmeter.control.gui;
+import java.awt.Component;
import java.awt.Dimension;
+import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Collection;
@@ -26,56 +28,85 @@ import java.util.Iterator;
import javax.swing.Box;
import javax.swing.BoxLayout;
-import javax.swing.DefaultComboBoxModel;
+import javax.swing.ImageIcon;
import javax.swing.JButton;
-import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JTree;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
import org.apache.jmeter.control.Controller;
import org.apache.jmeter.control.ModuleController;
+import org.apache.jmeter.control.TestFragmentController;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.action.ActionNames;
-import org.apache.jmeter.gui.action.ActionRouter;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.gui.util.MenuFactory;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.TestPlan;
-import org.apache.jmeter.testelement.WorkBench;
import org.apache.jmeter.threads.AbstractThreadGroup;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.layout.VerticalLayout;
/**
- * ModuleController Gui.
+ * ModuleControllerGui provides UI for configuring ModuleController element.
+ * It contains filtered copy of test plan tree (called Module to run tree)
+ * in which target element can be specified by selecting node.
+ * Allowed types of elements in Module to run tree:
+ * - TestPlan - cannot be referenced
+ * - AbstractThreadGroup - cannot be referenced
+ * - Controller (except ModuleController)
+ * - TestFragmentController
*
*/
-public class ModuleControllerGui extends AbstractControllerGui implements ActionListener
-// implements UnsharedComponent
-{
+public class ModuleControllerGui extends AbstractControllerGui implements ActionListener {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -4195441608252523573L;
- private static final long serialVersionUID = 240L;
+ private static final String SEPARATOR = " > ";
+ private static final TreeNode[] EMPTY_TREE_NODES = new TreeNode[0];
+
private JMeterTreeNode selected = null;
+
+ /**
+ * Model of a Module to run tree. It is a copy of a test plan tree.
+ * User object of each element is set to a correlated JMeterTreeNode element of a test plan tree.
+ */
+ private final DefaultTreeModel moduleToRunTreeModel;
+
+ /**
+ * Module to run tree. Allows to select a module to be executed. Many ModuleControllers can reference
+ * the same element.
+ */
+ private final JTree moduleToRunTreeNodes;
- private final JComboBox nodes;
-
- private final DefaultComboBoxModel nodesModel;
-
+ /**
+ * Used in case if referenced element does not exist in test plan tree (after removing it for example)
+ */
private final JLabel warningLabel;
+ /**
+ * Helps navigating test plan
+ */
private JButton expandButton;
/**
* Initializes the gui panel for the ModuleController instance.
*/
public ModuleControllerGui() {
- nodesModel = new DefaultComboBoxModel();
- nodes = new JComboBox(nodesModel);
+ moduleToRunTreeModel = new DefaultTreeModel(new DefaultMutableTreeNode());
+ moduleToRunTreeNodes = new JTree(moduleToRunTreeModel);
+ moduleToRunTreeNodes.setCellRenderer(new ModuleControllerCellRenderer());
+
warningLabel = new JLabel(""); // $NON-NLS-1$
init();
}
@@ -112,7 +143,7 @@ public class ModuleControllerGui extends
}
buf.append(iter.next());
if (iter.hasNext()) {
- buf.append(" > "); // $NON-NLS-1$
+ buf.append(SEPARATOR); // $NON-NLS-1$
}
}
return buf.toString();
@@ -132,11 +163,18 @@ public class ModuleControllerGui extends
/** {@inheritDoc}} */
@Override
public void modifyTestElement(TestElement element) {
- configureTestElement(element);
- TreeNodeWrapper tnw = (TreeNodeWrapper) nodesModel.getSelectedItem();
- if (tnw != null && tnw.getTreeNode() != null) {
- selected = tnw.getTreeNode();
- if (selected != null) {
+ configureTestElement(element);
+ JMeterTreeNode tn = null;
+ DefaultMutableTreeNode lastSelected = (DefaultMutableTreeNode) this.moduleToRunTreeNodes.getLastSelectedPathComponent();
+ if (lastSelected != null && lastSelected.getUserObject() instanceof JMeterTreeNode) {
+ tn = (JMeterTreeNode) lastSelected.getUserObject();
+ }
+ if (tn != null) {
+ selected = tn;
+ //prevent from selecting thread group or test plan elements
+ if (selected != null
+ && !(selected.getTestElement() instanceof AbstractThreadGroup)
+ && !(selected.getTestElement() instanceof TestPlan)) {
((ModuleController) element).setSelectedNode(selected);
}
}
@@ -146,8 +184,6 @@ public class ModuleControllerGui extends
@Override
public void clearGui() {
super.clearGui();
-
- nodes.setSelectedIndex(-1);
selected = null;
}
@@ -176,93 +212,177 @@ public class ModuleControllerGui extends
setBorder(makeBorder());
add(makeTitlePanel());
- // DROP-DOWN MENU
JPanel modulesPanel = new JPanel();
- modulesPanel.setLayout(new BoxLayout(modulesPanel, BoxLayout.X_AXIS));
- JLabel nodesLabel = new JLabel(JMeterUtils.getResString("module_controller_module_to_run")); // $NON-NLS-1$
- modulesPanel.add(nodesLabel);
- modulesPanel.add(Box.createRigidArea(new Dimension(5,0)));
- nodesLabel.setLabelFor(nodes);
- reinitialize();
- modulesPanel.add(nodes);
- modulesPanel.add(warningLabel);
-
- modulesPanel.add(Box.createRigidArea(new Dimension(5,0)));
+
expandButton = new JButton(JMeterUtils.getResString("expand")); //$NON-NLS-1$
expandButton.addActionListener(this);
modulesPanel.add(expandButton);
+ modulesPanel.setLayout(new BoxLayout(modulesPanel, BoxLayout.Y_AXIS));
+ modulesPanel.add(Box.createRigidArea(new Dimension(0,5)));
+
+ JLabel nodesLabel = new JLabel(JMeterUtils.getResString("module_controller_module_to_run")); // $NON-NLS-1$
+ modulesPanel.add(nodesLabel);
+ modulesPanel.add(warningLabel);
add(modulesPanel);
+
+ JPanel treePanel = new JPanel();
+ treePanel.setLayout(new FlowLayout(FlowLayout.LEFT));
+ treePanel.add(moduleToRunTreeNodes);
+ add(treePanel);
}
+ /**
+ * Recursively traverse module to run tree in order to find JMeterTreeNode element given by testPlanPath
+ * in a DefaultMutableTreeNode tree
+ *
+ * @param level - current search level
+ * @param testPlanPath - path of a test plan tree element
+ * @param parent - module to run tree parent element
+ *
+ * @return path of a found element
+ */
+ private TreeNode[] findPathInTreeModel(int level, TreeNode[] testPlanPath, DefaultMutableTreeNode parent)
+ {
+ if(level >= testPlanPath.length) {
+ return EMPTY_TREE_NODES;
+ }
+ int childCount = parent.getChildCount();
+ JMeterTreeNode searchedTreeNode =
+ (JMeterTreeNode) testPlanPath[level];
+
+ for (int i = 0; i < childCount; i++) {
+ DefaultMutableTreeNode child = (DefaultMutableTreeNode) parent.getChildAt(i);
+ JMeterTreeNode childUserObj = (JMeterTreeNode) child.getUserObject();
+
+ if(!childUserObj.equals(searchedTreeNode)){
+ continue;
+ } else {
+ if(level == (testPlanPath.length - 1)){
+ return child.getPath();
+ } else {
+ return findPathInTreeModel(level+1, testPlanPath, child);
+ }
+ }
+ }
+ return EMPTY_TREE_NODES;
+ }
+
+ /**
+ * Expand module to run tree to selected JMeterTreeNode and set selection path to it
+ * @param selected - referenced module to run
+ */
+ private void focusSelectedOnTree(JMeterTreeNode selected)
+ {
+ TreeNode[] path = selected.getPath();
+ TreeNode[] filteredPath = new TreeNode[path.length-1];
+
+ //ignore first element of path - WorkBench, (why WorkBench is appearing in the path ???)
+ for(int i = 1; i < path.length; i++){
+ filteredPath[i-1] = path[i];
+ }
+
+ DefaultMutableTreeNode root = (DefaultMutableTreeNode) moduleToRunTreeNodes.getModel().getRoot();
+ //treepath of test plan tree and module to run tree cannot be compared directly - moduleToRunTreeModel.getPathToRoot()
+ //custom method for finding an JMeterTreeNode element in DefaultMutableTreeNode have to be used
+ TreeNode[] dmtnPath = this.findPathInTreeModel(1, filteredPath, root);
+ if (dmtnPath.length>0) {
+ TreePath treePath = new TreePath(dmtnPath);
+ moduleToRunTreeNodes.setSelectionPath(treePath);
+ moduleToRunTreeNodes.scrollPathToVisible(treePath);
+ }
+ }
+
+ /**
+ *
+ */
private void reinitialize() {
- nodesModel.removeAllElements();
+ ((DefaultMutableTreeNode) moduleToRunTreeModel.getRoot()).removeAllChildren();
+
GuiPackage gp = GuiPackage.getInstance();
JMeterTreeNode root;
if (gp != null) {
root = (JMeterTreeNode) GuiPackage.getInstance().getTreeModel().getRoot();
- buildNodesModel(root, "", 0); // $NON-NLS-1$
+ buildTreeNodeModel(root, 0, null);
+ moduleToRunTreeModel.nodeStructureChanged((TreeNode) moduleToRunTreeModel.getRoot());
}
- if (selected != null) {
- TreeNodeWrapper current;
- for (int i = 0; i < nodesModel.getSize(); i++) {
- current = (TreeNodeWrapper) nodesModel.getElementAt(i);
- if (current.getTreeNode() != null && current.getTreeNode().equals(selected)) {
- nodesModel.setSelectedItem(current);
- break;
- }
- }
+ if (selected != null) {
+ //expand Module to run tree to selected node and set selection path to it
+ this.focusSelectedOnTree(selected);
}
}
- private void buildNodesModel(JMeterTreeNode node, String parent_name, int level) {
- if (level == 0 && (parent_name == null || parent_name.length() == 0)) {
- nodesModel.addElement(new TreeNodeWrapper(null, "")); // $NON-NLS-1$
- }
- String separator = " > "; // $NON-NLS-1$
+ /**
+ * Recursively build module to run tree. Only 4 types of elements are allowed to be added:
+ * - All controllers except ModuleController
+ * - TestPlan
+ * - TestFragmentController
+ * - AbstractThreadGroup
+ *
+ * @param node - element of test plan tree
+ * @param level - level of element in a tree
+ * @param parent
+ */
+ private void buildTreeNodeModel(JMeterTreeNode node, int level,
+ DefaultMutableTreeNode parent) {
+
if (node != null) {
- StringBuilder name = new StringBuilder();
for (int i = 0; i < node.getChildCount(); i++) {
- name.setLength(0);
JMeterTreeNode cur = (JMeterTreeNode) node.getChildAt(i);
TestElement te = cur.getTestElement();
- if (te instanceof AbstractThreadGroup) {
- name.append(parent_name);
- name.append(cur.getName());
- name.append(separator);
- buildNodesModel(cur, name.toString(), level);
- } else if (te instanceof Controller && !(te instanceof ModuleController)) {
- name.append(parent_name);
- name.append(cur.getName());
- TreeNodeWrapper tnw = new TreeNodeWrapper(cur, name.toString());
- nodesModel.addElement(tnw);
- name.append(separator);
- buildNodesModel(cur, name.toString(), level + 1);
- } else if (te instanceof TestPlan || te instanceof WorkBench) {
- name.append(cur.getName());
- name.append(separator);
- buildNodesModel(cur, name.toString(), 0);
+
+ if (te instanceof Controller
+ && !(te instanceof ModuleController) && level > 0) {
+ DefaultMutableTreeNode newNode = new DefaultMutableTreeNode(cur);
+ parent.add(newNode);
+ buildTreeNodeModel(cur, level + 1, newNode);
+
+ } else if (te instanceof TestFragmentController) {
+ DefaultMutableTreeNode newNode = new DefaultMutableTreeNode(cur);
+ parent.add(newNode);
+ buildTreeNodeModel(cur, level + 1, newNode);
+
+ } else if (te instanceof AbstractThreadGroup) {
+ DefaultMutableTreeNode newNode = new DefaultMutableTreeNode(cur);
+ parent.add(newNode);
+ buildTreeNodeModel(cur, level + 1, newNode);
+ }
+
+ else if (te instanceof TestPlan) {
+ ((DefaultMutableTreeNode) moduleToRunTreeModel.getRoot())
+ .setUserObject(cur);
+ buildTreeNodeModel(cur, level,
+ (DefaultMutableTreeNode) moduleToRunTreeModel.getRoot());
}
}
}
}
+ /**
+ * Implementation of Expand button - moves focus to a test plan tree element referenced by
+ * selected element in Module to run tree
+ */
@Override
public void actionPerformed(ActionEvent e) {
if(e.getSource()==expandButton) {
- // reset previous result
- ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.SEARCH_RESET));
- JMeterTreeNode currentSelectedNode = null;
- TreeNodeWrapper tnw = (TreeNodeWrapper) nodesModel.getSelectedItem();
- if (tnw != null && tnw.getTreeNode() != null) {
- currentSelectedNode = tnw.getTreeNode();
+ JMeterTreeNode tn = null;
+ DefaultMutableTreeNode selected = (DefaultMutableTreeNode)
+ this.moduleToRunTreeNodes.getLastSelectedPathComponent();
+ if(selected != null && selected.getUserObject() instanceof JMeterTreeNode){
+ tn = (JMeterTreeNode) selected.getUserObject();
}
- if (currentSelectedNode != null) {
- expandToSelectNode(currentSelectedNode);
+ if(tn != null){
+ TreePath treePath = new TreePath(tn.getPath());
+ //changing selection in a test plan tree
+ GuiPackage.getInstance().getTreeListener().getJTree()
+ .setSelectionPath(treePath);
+ //expanding tree to make referenced element visible in test plan tree
+ GuiPackage.getInstance().getTreeListener().getJTree()
+ .scrollPathToVisible(treePath);
}
- return;
}
}
+
/**
* @param selected JMeterTreeNode tree node to expand
*/
@@ -272,4 +392,36 @@ public class ModuleControllerGui extends
jTree.expandPath(new TreePath(selected.getPath()));
selected.setMarkedBySearch(true);
}
+
+ /**
+ * Renderer class for printing "module to run" tree
+ */
+ private static class ModuleControllerCellRenderer extends DefaultTreeCellRenderer {
+
+ private static final long serialVersionUID = 1129098620102526299L;
+
+ /**
+ * @see javax.swing.tree.DefaultTreeCellRenderer#getTreeCellRendererComponent(javax.swing.JTree, java.lang.Object, boolean, boolean, boolean, int, boolean)
+ */
+ @Override
+ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded,
+ boolean leaf, int row, boolean hasFocus) {
+ JMeterTreeNode node = (JMeterTreeNode)((DefaultMutableTreeNode) value).getUserObject();
+ if(node != null){
+ super.getTreeCellRendererComponent(tree, node.getName(), selected, expanded, leaf, row,
+ hasFocus);
+ //print same icon as in test plan tree
+ boolean enabled = node.isEnabled();
+ ImageIcon icon = node.getIcon(enabled);
+ if (icon != null) {
+ if (enabled) {
+ setIcon(icon);
+ } else {
+ setDisabledIcon(icon);
+ }
+ }
+ }
+ return this;
+ }
+ }
}
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java Sat Jul 4 18:04:12 2015
@@ -38,7 +38,7 @@ import org.apache.jorphan.gui.layout.Ver
public class ThroughputControllerGui extends AbstractControllerGui {
private static final long serialVersionUID = 240L;
- private JComboBox styleBox;
+ private JComboBox<String> styleBox;
private int style;
@@ -128,10 +128,10 @@ public class ThroughputControllerGui ext
setBorder(makeBorder());
add(makeTitlePanel());
- DefaultComboBoxModel styleModel = new DefaultComboBoxModel();
+ DefaultComboBoxModel<String> styleModel = new DefaultComboBoxModel<>();
styleModel.addElement(BYNUMBER_LABEL);
styleModel.addElement(BYPERCENT_LABEL);
- styleBox = new JComboBox(styleModel);
+ styleBox = new JComboBox<>(styleModel);
styleBox.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/extractor/HtmlExtractor.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/extractor/HtmlExtractor.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/extractor/HtmlExtractor.java Sat Jul 4 18:04:12 2015
@@ -91,7 +91,7 @@ public class HtmlExtractor extends Abstr
if (previousResult == null) {
return;
}
- log.debug("HtmlExtractor processing result");
+ log.debug("HtmlExtractor "+getName()+":processing result");
// Fetch some variables
JMeterVariables vars = context.getVariables();
@@ -116,7 +116,7 @@ public class HtmlExtractor extends Abstr
try {
prevCount = Integer.parseInt(prevString);
} catch (NumberFormatException e1) {
- log.warn("Could not parse "+prevString+" "+e1);
+ log.warn(getName()+":Could not parse "+prevString+" "+e1);
}
}
int matchCount=0;// Number of refName_n variable sets to keep
@@ -145,11 +145,11 @@ public class HtmlExtractor extends Abstr
vars.remove(refName_n);
}
} catch (RuntimeException e) {
- log.warn("Error while generating result");
+ log.warn(getName()+":Error while generating result");
}
} catch (RuntimeException e) {
- log.warn("Error while generating result");
+ log.warn(getName()+":Error while generating result");
}
}
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java Sat Jul 4 18:04:12 2015
@@ -40,9 +40,7 @@ public class JSR223PostProcessor extends
try {
ScriptEngine scriptEngine = getScriptEngine();
processFileOrScript(scriptEngine, null);
- } catch (ScriptException e) {
- log.error("Problem in JSR223 script "+getName(), e);
- } catch (IOException e) {
+ } catch (ScriptException | IOException e) {
log.error("Problem in JSR223 script "+getName(), e);
}
}
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java Sat Jul 4 18:04:12 2015
@@ -62,7 +62,7 @@ public class HtmlExtractorGui extends Ab
private JLabeledTextField refNameField;
- private JComboBox extractorImplName;
+ private JComboBox<String> extractorImplName;
public HtmlExtractorGui() {
@@ -157,12 +157,12 @@ public class HtmlExtractorGui extends Ab
JPanel panel = new HorizontalPanel();
panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("html_extractor_type"))); //$NON-NLS-1$
- DefaultComboBoxModel m = new DefaultComboBoxModel();
+ DefaultComboBoxModel<String> m = new DefaultComboBoxModel<>();
for (String s : HtmlExtractor.getImplementations()){
m.addElement(s);
}
m.addElement(USE_DEFAULT_EXTRACTOR_IMPL);
- extractorImplName = new JComboBox(m);
+ extractorImplName = new JComboBox<>(m);
extractorImplName.setSelectedItem(HtmlExtractor.DEFAULT_EXTRACTOR);
JLabel label2 = new JLabel(JMeterUtils.getResString("html_extractor_type")); // $NON-NLS-1$
label2.setLabelFor(extractorImplName);
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/modifiers/CounterConfig.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/modifiers/CounterConfig.java Sat Jul 4 18:04:12 2015
@@ -138,8 +138,6 @@ public class CounterConfig extends Abstr
try {
DecimalFormat myFormatter = new DecimalFormat(format);
return myFormatter.format(value);
- } catch (NumberFormatException ignored) {
- log.warn("Error formating "+value + " at format:"+format+", using default");
} catch (IllegalArgumentException ignored) {
log.warn("Error formating "+value + " at format:"+format+", using default");
}
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java Sat Jul 4 18:04:12 2015
@@ -40,9 +40,7 @@ public class JSR223PreProcessor extends
try {
ScriptEngine scriptEngine = getScriptEngine();
processFileOrScript(scriptEngine, null);
- } catch (ScriptException e) {
- log.error("Problem in JSR223 script "+getName(), e);
- } catch (IOException e) {
+ } catch (ScriptException | IOException e) {
log.error("Problem in JSR223 script "+getName(), e);
}
}
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/sampler/TestAction.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/sampler/TestAction.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/sampler/TestAction.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/sampler/TestAction.java Sat Jul 4 18:04:12 2015
@@ -109,9 +109,9 @@ public class TestAction extends Abstract
}
private void pause(String mili_s) {
- int milis;
+ long milis;
try {
- milis=Integer.parseInt(mili_s);
+ milis=Long.parseLong(mili_s);
} catch (NumberFormatException e){
log.warn("Could not create number from "+mili_s);
milis=0;
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java Sat Jul 4 18:04:12 2015
@@ -41,7 +41,7 @@ public class TestActionGui extends Abstr
private static final long serialVersionUID = 240L;
// Gui components
- private JComboBox targetBox;
+ private JComboBox<String> targetBox;
// private ButtonGroup actionButtons;
private JRadioButton pauseButton;
@@ -163,10 +163,10 @@ public class TestActionGui extends Abstr
// Target
HorizontalPanel targetPanel = new HorizontalPanel();
targetPanel.add(new JLabel(targetLabel));
- DefaultComboBoxModel targetModel = new DefaultComboBoxModel();
+ DefaultComboBoxModel<String> targetModel = new DefaultComboBoxModel<>();
targetModel.addElement(threadTarget);
targetModel.addElement(testTarget);
- targetBox = new JComboBox(targetModel);
+ targetBox = new JComboBox<>(targetModel);
targetBox.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/timers/BSFTimer.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/timers/BSFTimer.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/timers/BSFTimer.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/timers/BSFTimer.java Sat Jul 4 18:04:12 2015
@@ -43,9 +43,7 @@ public class BSFTimer extends BSFTestEle
return 0;
}
delay = Long.parseLong(o.toString());
- } catch (NumberFormatException e) {
- log.warn("Problem in BSF script "+e);
- } catch (BSFException e) {
+ } catch (NumberFormatException | BSFException e) {
log.warn("Problem in BSF script "+e);
} finally {
if(mgr != null) {
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java Sat Jul 4 18:04:12 2015
@@ -31,8 +31,8 @@ import org.apache.jmeter.testelement.Abs
import org.apache.jmeter.testelement.TestStateListener;
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.StringProperty;
-import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.threads.AbstractThreadGroup;
+import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -177,15 +177,15 @@ public class ConstantThroughputTimer ext
double msPerRequest = (MILLISEC_PER_MIN / getThroughput());
switch (mode) {
case AllActiveThreads: // Total number of threads
- delay = (long) (JMeterContextService.getNumberOfThreads() * msPerRequest);
+ delay = Math.round(JMeterContextService.getNumberOfThreads() * msPerRequest);
break;
case AllActiveThreadsInCurrentThreadGroup: // Active threads in this group
- delay = (long) (JMeterContextService.getContext().getThreadGroup().getNumberOfThreads() * msPerRequest);
+ delay = Math.round(JMeterContextService.getContext().getThreadGroup().getNumberOfThreads() * msPerRequest);
break;
case AllActiveThreads_Shared: // All threads - alternate calculation
- delay = calculateSharedDelay(allThreadsInfo,(long) msPerRequest);
+ delay = calculateSharedDelay(allThreadsInfo,Math.round(msPerRequest));
break;
case AllActiveThreadsInCurrentThreadGroup_Shared: //All threads in this group - alternate calculation
@@ -199,12 +199,12 @@ public class ConstantThroughputTimer ext
groupInfo = previous; // so use the existing one
}
}
- delay = calculateSharedDelay(groupInfo,(long) msPerRequest);
+ delay = calculateSharedDelay(groupInfo,Math.round(msPerRequest));
break;
case ThisThreadOnly:
default: // e.g. 0
- delay = (long) msPerRequest; // i.e. * 1
+ delay = Math.round(msPerRequest); // i.e. * 1
break;
}
return delay;
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/timers/GaussianRandomTimer.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/timers/GaussianRandomTimer.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/timers/GaussianRandomTimer.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/timers/GaussianRandomTimer.java Sat Jul 4 18:04:12 2015
@@ -29,11 +29,11 @@ import org.apache.jmeter.util.JMeterUtil
*
*/
public class GaussianRandomTimer extends RandomTimer implements Serializable {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
@Override
public long delay() {
- return (long) Math.abs((this.random.nextGaussian() * getRange()) + super.delay());
+ return (long) Math.abs((getRandom().nextGaussian() * getRange()) + super.delay());
}
@Override
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/timers/JSR223Timer.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/timers/JSR223Timer.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/timers/JSR223Timer.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/timers/JSR223Timer.java Sat Jul 4 18:04:12 2015
@@ -45,11 +45,7 @@ public class JSR223Timer extends JSR223T
return 0;
}
delay = Long.parseLong(o.toString());
- } catch (NumberFormatException e) {
- log.error("Problem in JSR223 script "+getName(), e);
- } catch (IOException e) {
- log.error("Problem in JSR223 script "+getName(), e);
- } catch (ScriptException e) {
+ } catch (NumberFormatException | IOException | ScriptException e) {
log.error("Problem in JSR223 script "+getName(), e);
}
return delay;
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/timers/RandomTimer.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/timers/RandomTimer.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/timers/RandomTimer.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/timers/RandomTimer.java Sat Jul 4 18:04:12 2015
@@ -20,6 +20,7 @@ package org.apache.jmeter.timers;
import java.io.Serializable;
import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
import org.apache.jmeter.testelement.property.DoubleProperty;
import org.apache.jmeter.testelement.property.StringProperty;
@@ -31,17 +32,14 @@ import org.apache.jmeter.testelement.pro
*
*/
public abstract class RandomTimer extends ConstantTimer implements Timer, Serializable {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
public static final String RANGE = "RandomTimer.range";
- protected final Random random;
-
/**
* No-arg constructor.
*/
public RandomTimer() {
- this.random = new Random();
}
/**
@@ -65,5 +63,11 @@ public abstract class RandomTimer extend
public double getRange() {
return this.getPropertyAsDouble(RANGE);
}
-
+
+ /**
+ * @return {@link Random} Thread local Random
+ */
+ protected Random getRandom() {
+ return ThreadLocalRandom.current();
+ }
}
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/timers/SyncTimer.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/timers/SyncTimer.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/timers/SyncTimer.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/timers/SyncTimer.java Sat Jul 4 18:04:12 2015
@@ -178,9 +178,7 @@ public class SyncTimer extends AbstractT
} else {
throw new IllegalArgumentException("Negative value for timeout:"+timeoutInMs+" in Synchronizing Timer "+getName());
}
- } catch (InterruptedException e) {
- return 0;
- } catch (BrokenBarrierException e) {
+ } catch (InterruptedException | BrokenBarrierException e) {
return 0;
} catch (TimeoutException e) {
LOGGER.warn("SyncTimer "+ getName() + " timeouted waiting for users after:"+getTimeoutInMs()+"ms");
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/timers/UniformRandomTimer.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/timers/UniformRandomTimer.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/timers/UniformRandomTimer.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/timers/UniformRandomTimer.java Sat Jul 4 18:04:12 2015
@@ -29,11 +29,11 @@ import org.apache.jmeter.util.JMeterUtil
*
*/
public class UniformRandomTimer extends RandomTimer implements Serializable {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
@Override
public long delay() {
- return (long) Math.abs((this.random.nextDouble() * getRange()) + super.delay());
+ return (long) Math.abs((getRandom().nextDouble() * getRange()) + super.delay());
}
@Override
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/AxisGraph.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/AxisGraph.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/AxisGraph.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/AxisGraph.java Sat Jul 4 18:04:12 2015
@@ -426,9 +426,7 @@ public class AxisGraph extends JPanel {
legendProperties, _width, _height );
axisChart.setGraphics2D((Graphics2D) g);
axisChart.render();
- } catch (ChartDataException e) {
- log.warn("",e);
- } catch (PropertyException e) {
+ } catch (ChartDataException | PropertyException e) {
log.warn("",e);
}
}
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/JSR223Listener.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/JSR223Listener.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/JSR223Listener.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/JSR223Listener.java Sat Jul 4 18:04:12 2015
@@ -48,9 +48,7 @@ public class JSR223Listener extends JSR2
bindings.put("sampleEvent", event);
bindings.put("sampleResult", event.getResult());
processFileOrScript(scriptEngine, bindings);
- } catch (ScriptException e) {
- log.error("Problem in JSR223 script "+getName(), e);
- } catch (IOException e) {
+ } catch (ScriptException | IOException e) {
log.error("Problem in JSR223 script "+getName(), e);
}
}
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java Sat Jul 4 18:04:12 2015
@@ -91,7 +91,7 @@ public class MailerVisualizer extends Ab
private JTextField smtpPasswordField;
- private JComboBox authTypeCombo;
+ private JComboBox<String> authTypeCombo;
/**
* Constructs the MailerVisualizer and initializes its GUI.
@@ -281,7 +281,7 @@ public class MailerVisualizer extends Ab
JPanel authTypePane = new JPanel(new BorderLayout());
authTypePane.add(new JLabel(JMeterUtils.getResString("mailer_connection_security")), BorderLayout.WEST); // $NON-NLS-1$
- authTypeCombo = new JComboBox(new Object[] {
+ authTypeCombo = new JComboBox<>(new String[] {
MailerModel.MailAuthType.NONE.toString(),
MailerModel.MailAuthType.SSL.toString(),
MailerModel.MailAuthType.TLS.toString()});
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java Sat Jul 4 18:04:12 2015
@@ -53,8 +53,8 @@ import org.apache.jmeter.util.JMeterUtil
import org.apache.jorphan.gui.ObjectTableModel;
import org.apache.jorphan.reflect.Functor;
-public class PropertyControlGui extends AbstractConfigGui
- implements ActionListener, UnsharedComponent {
+public class PropertyControlGui extends AbstractConfigGui implements
+ ActionListener, UnsharedComponent {
private static final long serialVersionUID = 1L;
@@ -72,7 +72,7 @@ public class PropertyControlGui extends
private static final String JMETER = "jmeter"; // $NON-NLS-1$
private final JCheckBox systemButton = new JCheckBox("System");
-
+
private final JCheckBox jmeterButton = new JCheckBox("JMeter");
private final JLabel tableLabel = new JLabel("Properties");
@@ -138,7 +138,7 @@ public class PropertyControlGui extends
private void setUpData(){
tableModel.clearData();
- Properties p=null;
+ Properties p = null;
if (systemButton.isSelected()){
p = System.getProperties();
}
@@ -153,14 +153,14 @@ public class PropertyControlGui extends
Collections.sort(al, new Comparator<Map.Entry<Object, Object>>(){
@Override
public int compare(Map.Entry<Object, Object> o1, Map.Entry<Object, Object> o2) {
- String m1,m2;
- m1=(String)o1.getKey();
- m2=(String)o2.getKey();
+ String m1, m2;
+ m1 = (String) o1.getKey();
+ m2 = (String) o2.getKey();
return m1.compareTo(m2);
}
});
Iterator<Map.Entry<Object, Object>> i = al.iterator();
- while(i.hasNext()){
+ while (i.hasNext()) {
tableModel.addRow(i.next());
}
@@ -170,6 +170,7 @@ public class PropertyControlGui extends
public void modifyTestElement(TestElement element) {
configureTestElement(element);
}
+
private Component makeMainPanel() {
initializeTableModel();
table = new JTable(tableModel);
@@ -226,20 +227,16 @@ public class PropertyControlGui extends
* Initialize the components and layout of this component.
*/
private void init() {
- JPanel p = this;
-
- setLayout(new BorderLayout(0, 5));
- setBorder(makeBorder());
- add(makeTitlePanel(), BorderLayout.NORTH);
- p = new JPanel();
+ setLayout(new BorderLayout(0, 5));
+ setBorder(makeBorder());
+ add(makeTitlePanel(), BorderLayout.NORTH);
+ JPanel p = new JPanel();
p.setLayout(new BorderLayout());
-
p.add(makeLabelPanel(), BorderLayout.NORTH);
p.add(makeMainPanel(), BorderLayout.CENTER);
// Force a minimum table height of 70 pixels
p.add(Box.createVerticalStrut(70), BorderLayout.WEST);
- //p.add(makeButtonPanel(), BorderLayout.SOUTH);
add(p, BorderLayout.CENTER);
table.revalidate();
@@ -247,12 +244,13 @@ public class PropertyControlGui extends
private void initializeTableModel() {
tableModel = new ObjectTableModel(new String[] { COLUMN_NAMES_0, COLUMN_NAMES_1 },
new Functor[] {
- new Functor(Map.Entry.class, "getKey"), // $NON-NLS-1$
- new Functor(Map.Entry.class, "getValue") }, // $NON-NLS-1$
+ new Functor(Map.Entry.class, "getKey"), // $NON-NLS-1$
+ new Functor(Map.Entry.class, "getValue") // $NON-NLS-1$
+ },
new Functor[] {
- null, //new Functor("setName"), // $NON-NLS-1$
- new Functor(Map.Entry.class,"setValue", new Class[] { Object.class }) // $NON-NLS-1$
- },
+ null, //new Functor("setName"), // $NON-NLS-1$
+ new Functor(Map.Entry.class,"setValue", new Class[] { Object.class }) // $NON-NLS-1$
+ },
new Class[] { String.class, String.class });
}
}
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java Sat Jul 4 18:04:12 2015
@@ -29,6 +29,7 @@ import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -121,19 +122,28 @@ public class RenderAsCssJQuery implement
}
private String process(String textToParse) {
- List<String> result = new ArrayList<String>();
- Extractor extractor = HtmlExtractor.getExtractorImpl(cssJqueryLabeledChoice.getText());
- final int nbFound = extractor.extract(
- cssJqueryField.getText(), attributeField.getText(), -1, textToParse, result, 0, null);
-
- // Construct a multi-line string with all matches
- StringBuilder sb = new StringBuilder();
- sb.append("Match count: ").append(nbFound).append("\n");
- for (int j = 0; j < nbFound; j++) {
- String mr = result.get(j);
- sb.append("Match[").append(j+1).append("]=").append(mr).append("\n");
+ try {
+ List<String> result = new ArrayList<String>();
+ Extractor extractor = HtmlExtractor.getExtractorImpl(cssJqueryLabeledChoice.getText());
+ final int nbFound = extractor.extract(
+ cssJqueryField.getText(), attributeField.getText(), -1, textToParse, result, 0, null);
+
+ // Construct a multi-line string with all matches
+ StringBuilder sb = new StringBuilder();
+ sb.append("Match count: ").append(nbFound).append("\n");
+ for (int j = 0; j < nbFound; j++) {
+ String mr = result.get(j);
+ sb.append("Match[").append(j+1).append("]=").append(mr).append("\n");
+ }
+ return sb.toString();
+ } catch (Exception ex) {
+ StringBuilder sb = new StringBuilder();
+ String message = MessageFormat.format(
+ JMeterUtils.getResString("cssjquery_tester_error") // $NON-NLS-1$
+ , new Object[]{cssJqueryField.getText(), ex.getMessage()});
+ sb.append(message);
+ return sb.toString();
}
- return sb.toString();
}
/** {@inheritDoc} */
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java Sat Jul 4 18:04:12 2015
@@ -95,7 +95,7 @@ public class RenderAsHTML extends Sample
/*
* Get round problems parsing <META http-equiv='content-type'
* content='text/html; charset=utf-8'> See
- * http://issues.apache.org/bugzilla/show_bug.cgi?id=23315
+ * http://bz.apache.org/bugzilla/show_bug.cgi?id=23315
*
* Is this due to a bug in Java?
*/
@@ -111,7 +111,7 @@ public class RenderAsHTML extends Sample
resultsScrollPane.setViewportView(results);
} catch (NumberFormatException e) {
// Java Bug : http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=9001188.
- // See https://issues.apache.org/bugzilla/show_bug.cgi?id=54586
+ // See https://bz.apache.org/bugzilla/show_bug.cgi?id=54586
log.warn("An error occured rendering html code", e);
results.setText("Failed to render HTML: " + e.getMessage() +", use Text renderer");
}
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RenderAsJSON.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RenderAsJSON.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RenderAsJSON.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RenderAsJSON.java Sat Jul 4 18:04:12 2015
@@ -31,7 +31,7 @@ public class RenderAsJSON extends Sample
private static final String NORMAL_CHARACTER_REGEX = "[^\"\\\\]"; // $NON-NLS-1$
- private static final String STRING_REGEX = "\"(" + ESC_CHAR_REGEX + "|" + NORMAL_CHARACTER_REGEX + ")*\""; // $NON-NLS-1$
+ private static final String STRING_REGEX = "\"(" + ESC_CHAR_REGEX + "|" + NORMAL_CHARACTER_REGEX + ")*+\""; // $NON-NLS-1$
// This 'other value' regex is deliberately weak, even accepting an empty string, to be useful when reporting malformed data.
private static final String OTHER_VALUE_REGEX = "[^\\{\\[\\]\\}\\,]*"; // $NON-NLS-1$
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java Sat Jul 4 18:04:12 2015
@@ -56,6 +56,7 @@ import javax.swing.border.EmptyBorder;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.gui.action.ActionRouter;
import org.apache.jmeter.gui.action.SaveGraphics;
@@ -207,23 +208,23 @@ public class RespTimeGraphVisualizer ext
private final JCheckBox regexpChkBox = new JCheckBox(JMeterUtils.getResString("search_text_chkbox_regexp"), true); // $NON-NLS-1$
- private final JComboBox titleFontNameList = new JComboBox(StatGraphProperties.getFontNameMap().keySet().toArray());
+ private final JComboBox<String> titleFontNameList = new JComboBox<>(StatGraphProperties.getFontNameMap().keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY));
- private final JComboBox titleFontSizeList = new JComboBox(StatGraphProperties.fontSize);
+ private final JComboBox<String> titleFontSizeList = new JComboBox<>(StatGraphProperties.fontSize);
- private final JComboBox titleFontStyleList = new JComboBox(StatGraphProperties.getFontStyleMap().keySet().toArray());
+ private final JComboBox<String> titleFontStyleList = new JComboBox<>(StatGraphProperties.getFontStyleMap().keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY));
- private final JComboBox fontNameList = new JComboBox(StatGraphProperties.getFontNameMap().keySet().toArray());
+ private final JComboBox<String> fontNameList = new JComboBox<>(StatGraphProperties.getFontNameMap().keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY));
- private final JComboBox fontSizeList = new JComboBox(StatGraphProperties.fontSize);
+ private final JComboBox<String> fontSizeList = new JComboBox<>(StatGraphProperties.fontSize);
- private final JComboBox fontStyleList = new JComboBox(StatGraphProperties.getFontStyleMap().keySet().toArray());
+ private final JComboBox<String> fontStyleList = new JComboBox<>(StatGraphProperties.getFontStyleMap().keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY));
- private final JComboBox legendPlacementList = new JComboBox(StatGraphProperties.getPlacementNameMap().keySet().toArray());
+ private final JComboBox<String> legendPlacementList = new JComboBox<>(StatGraphProperties.getPlacementNameMap().keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY));
- private final JComboBox pointShapeLine = new JComboBox(StatGraphProperties.getPointShapeMap().keySet().toArray());
+ private final JComboBox<String> pointShapeLine = new JComboBox<>(StatGraphProperties.getPointShapeMap().keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY));
- private final JComboBox strokeWidthList = new JComboBox(StatGraphProperties.strokeWidth);
+ private final JComboBox<String> strokeWidthList = new JComboBox<>(StatGraphProperties.strokeWidth);
private final JCheckBox numberShowGrouping = new JCheckBox(JMeterUtils.getResString("aggregate_graph_number_grouping"), // $NON-NLS-1$
DEFAULT_NUMBER_SHOW_GROUPING); // Default checked
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java Sat Jul 4 18:04:12 2015
@@ -236,6 +236,7 @@ public abstract class SamplerResultTab i
statsBuff.append(JMeterUtils.getResString("view_results_size_body_in_bytes")).append(sampleResult.getBodySize()).append(NL); //$NON-NLS-1$
statsBuff.append(JMeterUtils.getResString("view_results_sample_count")).append(sampleResult.getSampleCount()).append(NL); //$NON-NLS-1$
statsBuff.append(JMeterUtils.getResString("view_results_error_count")).append(sampleResult.getErrorCount()).append(NL); //$NON-NLS-1$
+ statsBuff.append(JMeterUtils.getResString("view_results_datatype")).append(sampleResult.getDataType()).append(NL); //$NON-NLS-1$
statsDoc.insertString(statsDoc.getLength(), statsBuff.toString(), null);
statsBuff.setLength(0); // reset for reuse
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java Sat Jul 4 18:04:12 2015
@@ -25,9 +25,10 @@ import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
+import java.text.DecimalFormat;
+import java.text.Format;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -61,6 +62,7 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.table.TableCellRenderer;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.gui.action.ActionRouter;
import org.apache.jmeter.gui.action.SaveGraphics;
@@ -215,7 +217,7 @@ public class StatGraphVisualizer extends
private int defaultHeight = 300;
- private JComboBox columnsList = new JComboBox(GRAPH_COLUMNS);
+ private JComboBox<String> columnsList = new JComboBox<>(GRAPH_COLUMNS);
private List<BarGraph> eltList = new ArrayList<BarGraph>();
@@ -229,25 +231,25 @@ public class StatGraphVisualizer extends
private JCheckBox regexpChkBox = new JCheckBox(JMeterUtils.getResString("search_text_chkbox_regexp"), true); // $NON-NLS-1$
- private JComboBox titleFontNameList = new JComboBox(StatGraphProperties.getFontNameMap().keySet().toArray());
+ private JComboBox<String> titleFontNameList = new JComboBox<>(StatGraphProperties.getFontNameMap().keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY));
- private JComboBox titleFontSizeList = new JComboBox(StatGraphProperties.fontSize);
+ private JComboBox<String> titleFontSizeList = new JComboBox<>(StatGraphProperties.fontSize);
- private JComboBox titleFontStyleList = new JComboBox(StatGraphProperties.getFontStyleMap().keySet().toArray());
+ private JComboBox<String> titleFontStyleList = new JComboBox<>(StatGraphProperties.getFontStyleMap().keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY));
- private JComboBox valueFontNameList = new JComboBox(StatGraphProperties.getFontNameMap().keySet().toArray());
+ private JComboBox<String> valueFontNameList = new JComboBox<>(StatGraphProperties.getFontNameMap().keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY));
- private JComboBox valueFontSizeList = new JComboBox(StatGraphProperties.fontSize);
+ private JComboBox<String> valueFontSizeList = new JComboBox<>(StatGraphProperties.fontSize);
- private JComboBox valueFontStyleList = new JComboBox(StatGraphProperties.getFontStyleMap().keySet().toArray());
+ private JComboBox<String> valueFontStyleList = new JComboBox<>(StatGraphProperties.getFontStyleMap().keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY));
- private JComboBox fontNameList = new JComboBox(StatGraphProperties.getFontNameMap().keySet().toArray());
+ private JComboBox<String> fontNameList = new JComboBox<>(StatGraphProperties.getFontNameMap().keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY));
- private JComboBox fontSizeList = new JComboBox(StatGraphProperties.fontSize);
+ private JComboBox<String> fontSizeList = new JComboBox<>(StatGraphProperties.fontSize);
- private JComboBox fontStyleList = new JComboBox(StatGraphProperties.getFontStyleMap().keySet().toArray());
+ private JComboBox<String> fontStyleList = new JComboBox<>(StatGraphProperties.getFontStyleMap().keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY));
- private JComboBox legendPlacementList = new JComboBox(StatGraphProperties.getPlacementNameMap().keySet().toArray());
+ private JComboBox<String> legendPlacementList = new JComboBox<>(StatGraphProperties.getPlacementNameMap().keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY));
private JCheckBox drawOutlinesBar = new JCheckBox(JMeterUtils.getResString("aggregate_graph_draw_outlines"), true); // Default checked // $NON-NLS-1$
@@ -308,6 +310,23 @@ public class StatGraphVisualizer extends
String.class, String.class });
}
+ // Column formats
+ static final Format[] FORMATS =
+ new Format[]{
+ null, // Label
+ null, // count
+ null, // Mean
+ null, // median
+ null, // 90%
+ null, // 95%
+ null, // 99%
+ null, // Min
+ null, // Max
+ new DecimalFormat("#0.00%"), // Error %age //$NON-NLS-1$
+ new DecimalFormat("#.0"), // Throughput //$NON-NLS-1$
+ new DecimalFormat("#.0") // pageSize //$NON-NLS-1$
+ };
+
// Column renderers
static final TableCellRenderer[] RENDERERS =
new TableCellRenderer[]{
@@ -574,9 +593,10 @@ public class StatGraphVisualizer extends
* ObjectTableModel, so the calling getDataVector doesn't
* work as expected.
* @param model {@link ObjectTableModel}
+ * @param formats Array of {@link Format} array can contain null formatters in this case value is added as is
* @return the data from the model
*/
- public static List<List<Object>> getAllTableData(ObjectTableModel model) {
+ public static List<List<Object>> getAllTableData(ObjectTableModel model, Format[] formats) {
List<List<Object>> data = new ArrayList<List<Object>>();
if (model.getRowCount() > 0) {
for (int rw=0; rw < model.getRowCount(); rw++) {
@@ -585,7 +605,11 @@ public class StatGraphVisualizer extends
data.add(column);
for (int idx=0; idx < cols; idx++) {
Object val = model.getValueAt(rw,idx);
- column.add(val);
+ if(formats[idx] != null) {
+ column.add(formats[idx].format(val));
+ } else {
+ column.add(val);
+ }
}
}
}
@@ -615,9 +639,7 @@ public class StatGraphVisualizer extends
FileWriter writer = null;
try {
writer = new FileWriter(chooser.getSelectedFile()); // TODO Charset ?
- CSVSaveService.saveCSVStats(getAllTableData(model),writer,saveHeaders.isSelected() ? getLabels(COLUMNS) : null);
- } catch (FileNotFoundException e) {
- JMeterUtils.reportErrorToUser(e.getMessage(), "Error saving data");
+ CSVSaveService.saveCSVStats(getAllTableData(model, FORMATS),writer,saveHeaders.isSelected() ? getLabels(COLUMNS) : null);
} catch (IOException e) {
JMeterUtils.reportErrorToUser(e.getMessage(), "Error saving data");
} finally {
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/StatVisualizer.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/StatVisualizer.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/StatVisualizer.java Sat Jul 4 18:04:12 2015
@@ -22,7 +22,6 @@ import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
import java.util.Map;
@@ -63,23 +62,24 @@ public class StatVisualizer extends Abst
private static final String USE_GROUP_NAME = "useGroupName"; //$NON-NLS-1$
- private static final String SAVE_HEADERS = "saveHeaders"; //$NON-NLS-1$
+ private static final String SAVE_HEADERS = "saveHeaders"; //$NON-NLS-1$
- private final String TOTAL_ROW_LABEL
- = JMeterUtils.getResString("aggregate_report_total_label"); //$NON-NLS-1$
+ private final String TOTAL_ROW_LABEL = JMeterUtils
+ .getResString("aggregate_report_total_label"); //$NON-NLS-1$
private JTable myJTable;
private JScrollPane myScrollPane;
- private final JButton saveTable =
- new JButton(JMeterUtils.getResString("aggregate_graph_save_table")); //$NON-NLS-1$
+ private final JButton saveTable = new JButton(
+ JMeterUtils.getResString("aggregate_graph_save_table")); //$NON-NLS-1$
- private final JCheckBox saveHeaders = // should header be saved with the data?
- new JCheckBox(JMeterUtils.getResString("aggregate_graph_save_table_header"),true); //$NON-NLS-1$
+ // should header be saved with the data?
+ private final JCheckBox saveHeaders = new JCheckBox(
+ JMeterUtils.getResString("aggregate_graph_save_table_header"), true); //$NON-NLS-1$
- private final JCheckBox useGroupName =
- new JCheckBox(JMeterUtils.getResString("aggregate_graph_use_group_name")); //$NON-NLS-1$
+ private final JCheckBox useGroupName = new JCheckBox(
+ JMeterUtils.getResString("aggregate_graph_use_group_name")); //$NON-NLS-1$
private transient ObjectTableModel model;
@@ -138,7 +138,7 @@ public class StatVisualizer extends Abst
synchronized(tot) {
tot.addSample(res);
}
- model.fireTableDataChanged();
+ model.fireTableDataChanged();
}
});
}
@@ -212,10 +212,8 @@ public class StatVisualizer extends Abst
FileWriter writer = null;
try {
writer = new FileWriter(chooser.getSelectedFile()); // TODO Charset ?
- CSVSaveService.saveCSVStats(StatGraphVisualizer.getAllTableData(model),writer,
+ CSVSaveService.saveCSVStats(StatGraphVisualizer.getAllTableData(model, StatGraphVisualizer.FORMATS),writer,
saveHeaders.isSelected() ? StatGraphVisualizer.getLabels(StatGraphVisualizer.COLUMNS) : null);
- } catch (FileNotFoundException e) {
- JMeterUtils.reportErrorToUser(e.getMessage(), "Error saving data");
} catch (IOException e) {
JMeterUtils.reportErrorToUser(e.getMessage(), "Error saving data");
} finally {
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/SummaryReport.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/SummaryReport.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/SummaryReport.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/SummaryReport.java Sat Jul 4 18:04:12 2015
@@ -22,9 +22,10 @@ import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
+import java.text.DecimalFormat;
+import java.text.Format;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -114,11 +115,26 @@ public class SummaryReport extends Abstr
null, // Mean
null, // Min
null, // Max
- new NumberRenderer("#0.00"), // Std Dev.
- new NumberRenderer("#0.00%"), // Error %age
- new RateRenderer("#.0"), // Throughput
- new NumberRenderer("#0.00"), // kB/sec
- new NumberRenderer("#.0"), // avg. pageSize
+ new NumberRenderer("#0.00"), // Std Dev. //$NON-NLS-1$
+ new NumberRenderer("#0.00%"), // Error %age //$NON-NLS-1$
+ new RateRenderer("#.0"), // Throughput //$NON-NLS-1$
+ new NumberRenderer("#0.00"), // kB/sec //$NON-NLS-1$
+ new NumberRenderer("#.0"), // avg. pageSize //$NON-NLS-1$
+ };
+
+ // Column formats
+ static final Format[] FORMATS =
+ new Format[]{
+ null, // Label
+ null, // count
+ null, // Mean
+ null, // Min
+ null, // Max
+ new DecimalFormat("#0.00"), // Std Dev. //$NON-NLS-1$
+ new DecimalFormat("#0.00%"), // Error %age //$NON-NLS-1$
+ new DecimalFormat("#.0"), // Throughput //$NON-NLS-1$
+ new DecimalFormat("#0.00"), // kB/sec //$NON-NLS-1$
+ new DecimalFormat("#.0"), // avg. pageSize //$NON-NLS-1$
};
public SummaryReport() {
@@ -257,10 +273,8 @@ public class SummaryReport extends Abstr
FileWriter writer = null;
try {
writer = new FileWriter(chooser.getSelectedFile());
- CSVSaveService.saveCSVStats(StatGraphVisualizer.getAllTableData(model),writer,
+ CSVSaveService.saveCSVStats(StatGraphVisualizer.getAllTableData(model, FORMATS),writer,
saveHeaders.isSelected() ? StatGraphVisualizer.getLabels(COLUMNS) : null);
- } catch (FileNotFoundException e) {
- JMeterUtils.reportErrorToUser(e.getMessage(), "Error saving data");
} catch (IOException e) {
JMeterUtils.reportErrorToUser(e.getMessage(), "Error saving data");
} finally {
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java Sat Jul 4 18:04:12 2015
@@ -92,7 +92,7 @@ implements ActionListener, TreeSelection
private JTabbedPane rightSide;
- private JComboBox selectRenderPanel;
+ private JComboBox<ResultRenderer> selectRenderPanel;
private int selectedTab;
@@ -307,9 +307,9 @@ implements ActionListener, TreeSelection
* @return List of all render (implement ResultsRender)
*/
private Component createComboRender() {
- ComboBoxModel nodesModel = new DefaultComboBoxModel();
+ ComboBoxModel<ResultRenderer> nodesModel = new DefaultComboBoxModel<>();
// drop-down list for renderer
- selectRenderPanel = new JComboBox(nodesModel);
+ selectRenderPanel = new JComboBox<>(nodesModel);
selectRenderPanel.setActionCommand(COMBO_CHANGE_COMMAND);
selectRenderPanel.addActionListener(this);
@@ -364,7 +364,7 @@ implements ActionListener, TreeSelection
public void actionPerformed(ActionEvent event) {
String command = event.getActionCommand();
if (COMBO_CHANGE_COMMAND.equals(command)) {
- JComboBox jcb = (JComboBox) event.getSource();
+ JComboBox<?> jcb = (JComboBox<?>) event.getSource();
if (jcb != null) {
resultsRender = (ResultRenderer) jcb.getSelectedItem();
@@ -399,7 +399,7 @@ implements ActionListener, TreeSelection
// could warn the user
// if this happens and revert the choice if he doesn't confirm
// he's ready to wait.
- int len = res.getResponseData().length;
+ int len = res.getResponseDataAsString().length();
if (MAX_DISPLAY_SIZE > 0 && len > MAX_DISPLAY_SIZE) {
StringBuilder builder = new StringBuilder(MAX_DISPLAY_SIZE+100);
builder.append(JMeterUtils.getResString("view_results_response_too_large_message")) //$NON-NLS-1$
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java Sat Jul 4 18:04:12 2015
@@ -92,8 +92,7 @@ public abstract class AbstractBackendLis
*/
@Override
public SampleResult createSampleResult(BackendListenerContext context, SampleResult result) {
- SampleResult sampleResult = (SampleResult) result.clone();
- return sampleResult;
+ return result;
}
/**
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java Sat Jul 4 18:04:12 2015
@@ -57,10 +57,11 @@ public class BackendListener extends Abs
private BlockingQueue<SampleResult> queue;
private AtomicLong queueWaits; // how many times we had to wait to queue a SampleResult
private AtomicLong queueWaitTime; // how long we had to wait (nanoSeconds)
+ // @GuardedBy("LOCK")
private int instanceCount; // number of active tests
private CountDownLatch latch;
}
-
+
/**
*
*/
@@ -82,7 +83,7 @@ public class BackendListener extends Abs
* Lock used to protect accumulators update + instanceCount update
*/
private static final Object LOCK = new Object();
-
+
/**
* Property key representing the arguments for the BackendListenerClient.
*/
@@ -95,16 +96,16 @@ public class BackendListener extends Abs
private Class<?> clientClass;
public static final String DEFAULT_QUEUE_SIZE = "5000";
-
+
// Create unique object as marker for end of queue
private transient static final SampleResult FINAL_SAMPLE_RESULT = new SampleResult();
-
+
// Name of the test element. Set up by testStarted().
private transient String myName;
-
+
// Holds listenerClientData for this test element
private transient ListenerClientData listenerClientData;
-
+
/*
* This is needed for distributed testing where there is 1 instance
* per server. But we need the total to be shared.
@@ -121,7 +122,7 @@ public class BackendListener extends Abs
queuesByTestElementName.clear();
}
- setArguments(new Arguments());
+ setArguments(new Arguments());
}
/*
@@ -141,7 +142,7 @@ public class BackendListener extends Abs
clientClass = Class.forName(name, false, Thread.currentThread().getContextClassLoader());
} catch (Exception e) {
LOGGER.error(whoAmI() + "\tException initialising: " + name, e);
- }
+ }
}
/**
@@ -169,6 +170,12 @@ public class BackendListener extends Abs
BackendListenerContext context = new BackendListenerContext(args);
SampleResult sr = listenerClientData.client.createSampleResult(context, event.getResult());
+ if(sr == null) {
+ if(LOGGER.isDebugEnabled()) {
+ LOGGER.debug(getName()+"=>Dropping SampleResult:"+event.getResult());
+ }
+ return;
+ }
try {
if (!listenerClientData.queue.offer(sr)){ // we failed to add the element first time
listenerClientData.queueWaits.incrementAndGet();
@@ -181,25 +188,23 @@ public class BackendListener extends Abs
LOGGER.error("sampleOccurred, failed to queue the sample", err);
}
}
-
-
+
/**
* Thread that dequeus data from queue to send it to {@link BackendListenerClient}
*/
private static final class Worker extends Thread {
-
+
private final ListenerClientData listenerClientData;
private final BackendListenerContext context;
private final BackendListenerClient backendListenerClient;
private Worker(BackendListenerClient backendListenerClient, Arguments arguments, ListenerClientData listenerClientData){
this.listenerClientData = listenerClientData;
// Allow BackendListenerClient implementations to get access to test element name
- arguments.addArgument(TestElement.NAME, getName());
+ arguments.addArgument(TestElement.NAME, getName());
context = new BackendListenerContext(arguments);
this.backendListenerClient = backendListenerClient;
}
-
@Override
public void run() {
boolean isDebugEnabled = LOGGER.isDebugEnabled();
@@ -247,7 +252,6 @@ public class BackendListener extends Abs
}
}
}
-
/**
* Send sampleResults to {@link BackendListenerClient}
@@ -297,14 +301,14 @@ public class BackendListener extends Abs
if(LOGGER.isDebugEnabled()){
LOGGER.debug(whoAmI() + "\ttestStarted(" + host + ")");
}
-
+
int queueSize;
final String size = getQueueSize();
try {
queueSize = Integer.parseInt(size);
} catch (NumberFormatException nfe) {
LOGGER.warn("Invalid queue size '" + size + "' defaulting to " + DEFAULT_QUEUE_SIZE);
- queueSize = Integer.parseInt(DEFAULT_QUEUE_SIZE);
+ queueSize = Integer.parseInt(DEFAULT_QUEUE_SIZE);
}
synchronized (LOCK) {
@@ -336,9 +340,9 @@ public class BackendListener extends Abs
queuesByTestElementName.put(myName, listenerClientData);
}
listenerClientData.instanceCount++;
- }
+ }
}
-
+
/**
* Method called at the end of the test. This is called only on one instance
* of BackendListener. This method will loop through all of the other
@@ -367,7 +371,7 @@ public class BackendListener extends Abs
}
if (listenerClientData.queueWaits.get() > 0) {
LOGGER.warn("QueueWaits: "+listenerClientData.queueWaits+"; QueueWaitTime: "+listenerClientData.queueWaitTime+
- " (nanoseconds), you may need to increase queue capacity, see property 'backend_queue_capacity'");
+ " (nanoseconds), you may need to increase queue capacity, see property 'backend_queue_capacity'");
}
try {
listenerClientData.latch.await();
@@ -378,7 +382,7 @@ public class BackendListener extends Abs
}
}
- /** Implements TestStateListener.testEnded(String)
+ /** Implements TestStateListener.testEnded(String)
**/
@Override
public void testEnded() {
@@ -404,14 +408,13 @@ public class BackendListener extends Abs
Thread.yield();
}
}
-
+
/* (non-Javadoc)
* @see org.apache.jmeter.samplers.SampleListener#sampleStarted(org.apache.jmeter.samplers.SampleEvent)
*/
@Override
public void sampleStarted(SampleEvent e) {
// NOOP
-
}
/* (non-Javadoc)
@@ -420,7 +423,6 @@ public class BackendListener extends Abs
@Override
public void sampleStopped(SampleEvent e) {
// NOOP
-
}
/**
@@ -462,12 +464,12 @@ public class BackendListener extends Abs
public String getClassname() {
return getPropertyAsString(CLASSNAME);
}
-
+
/**
* Sets the queue size
*
* @param queueSize the size of the queue
- *
+ *
*/
public void setQueueSize(String queueSize) {
setProperty(QUEUE_SIZE, queueSize, DEFAULT_QUEUE_SIZE);
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/BackendListenerClient.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/BackendListenerClient.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/BackendListenerClient.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/BackendListenerClient.java Sat Jul 4 18:04:12 2015
@@ -117,7 +117,8 @@ public interface BackendListenerClient {
/**
* Create a copy of SampleResult, this method is here to allow customizing
* what is kept in the copy, for example copy could remove some useless fields.
- * Default to cloning
+ * Note that if it returns null, the sample result is not put in the queue.
+ * Defaults to returning result.
* @param context {@link BackendListenerContext}
* @param result {@link SampleResult}
* @return {@link SampleResult}
Modified: jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
URL: http://svn.apache.org/viewvc/jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java?rev=1689187&r1=1689186&r2=1689187&view=diff
==============================================================================
--- jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java (original)
+++ jmeter/branches/HC4/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java Sat Jul 4 18:04:12 2015
@@ -33,6 +33,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.gui.ArgumentsPanel;
@@ -61,7 +62,7 @@ public class BackendListenerGui extends
private static final Logger LOGGER = LoggingManager.getLoggerForClass();
/** A combo box allowing the user to choose a backend class. */
- private JComboBox classnameCombo;
+ private JComboBox<String> classnameCombo;
/**
* A field allowing the user to specify the size of Queue
@@ -127,7 +128,7 @@ public class BackendListenerGui extends
JLabel label = new JLabel(JMeterUtils.getResString("backend_listener_classname")); // $NON-NLS-1$
- classnameCombo = new JComboBox(possibleClasses.toArray());
+ classnameCombo = new JComboBox<>(possibleClasses.toArray(ArrayUtils.EMPTY_STRING_ARRAY));
classnameCombo.addActionListener(this);
classnameCombo.setEditable(false);
label.setLabelFor(classnameCombo);
@@ -241,7 +242,7 @@ public class BackendListenerGui extends
* @param className String class name
* @return boolean true if model contains className
*/
- private static final boolean checkContainsClassName(ComboBoxModel model, String className) {
+ private static final boolean checkContainsClassName(ComboBoxModel<?> model, String className) {
int size = model.getSize();
Set<String> set = new HashSet<String>(size);
for (int i = 0; i < size; i++) {