Skip to content

Added the ability to change element names in Search Tree #6290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added the ability to change element names in Search Tree #6290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c281f8
Added the ability to change element names in Search Tree
DanilGolikov Jun 11, 2024
76a1ca0
clear comments
DanilGolikov Jun 11, 2024
601f313
renaming variables to a common format
DanilGolikov Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions src/core/src/main/java/org/apache/jmeter/gui/action/SearchTreeDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ public class SearchTreeDialog extends JDialog implements ActionListener { // NOS

private JCheckBox isCaseSensitiveCB;

private JCheckBox isNamesReplaceableCB;


private transient Triple<String, Boolean, Boolean> lastSearchConditions = null;

Expand Down Expand Up @@ -171,14 +173,17 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
statusLabel.setMinimumSize(new Dimension(100, 20));
isRegexpCB = new JCheckBox(JMeterUtils.getResString("search_text_chkbox_regexp"), false); //$NON-NLS-1$
isCaseSensitiveCB = new JCheckBox(JMeterUtils.getResString("search_text_chkbox_case"), true); //$NON-NLS-1$
isNamesReplaceableCB = new JCheckBox(JMeterUtils.getResString("search_text_chkbox_names_replaceable"), false); //$NON-NLS-1$

JFactory.small(isRegexpCB);
JFactory.small(isCaseSensitiveCB);
JFactory.small(isNamesReplaceableCB);

JPanel searchCriterionPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
searchCriterionPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("search_matching"))); //$NON-NLS-1$
searchCriterionPanel.add(isCaseSensitiveCB);
searchCriterionPanel.add(isRegexpCB);
searchCriterionPanel.add(isNamesReplaceableCB);

JPanel searchPanel = new JPanel();
searchPanel.setLayout(new MigLayout("fillx, wrap 2", "[][fill,grow]"));
Expand Down Expand Up @@ -288,7 +293,8 @@ private void doReplace() {
String wordToReplace = replaceTF.getText();
String regex = isRegexpCB.isSelected() ? wordToSearch : Pattern.quote(wordToSearch);
boolean caseSensitiveReplacement = isCaseSensitiveCB.isSelected();
Pair<Integer, JMeterTreeNode> pair = doReplacementInCurrentNode(currentNode, regex, wordToReplace, caseSensitiveReplacement);
boolean namesReplacement = isNamesReplaceableCB.isSelected();
Pair<Integer, JMeterTreeNode> pair = doReplacementInCurrentNode(currentNode, regex, wordToReplace, caseSensitiveReplacement, namesReplacement);
if(pair != null) {
nbReplacements = pair.getLeft();
GuiPackage.getInstance().updateCurrentGui();
Expand Down Expand Up @@ -437,12 +443,13 @@ private void doReplaceAll(ActionEvent e) {
String regex = isRegexpCB.isSelected() ? wordToSearch : Pattern.quote(wordToSearch);
GuiPackage guiPackage = GuiPackage.getInstance();
boolean caseSensitiveReplacement = isCaseSensitiveCB.isSelected();
boolean namesReplacement = isNamesReplaceableCB.isSelected();
int totalReplaced = 0;
Pair<Integer, Set<JMeterTreeNode>> result = searchInTree(guiPackage, searcher, wordToSearch);
Set<JMeterTreeNode> matchingNodes = result.getRight();
Set<JMeterTreeNode> replacedNodes = new HashSet<>();
for (JMeterTreeNode jMeterTreeNode : matchingNodes) {
Pair<Integer, JMeterTreeNode> pair = doReplacementInCurrentNode(jMeterTreeNode, regex, wordToReplace, caseSensitiveReplacement);
Pair<Integer, JMeterTreeNode> pair = doReplacementInCurrentNode(jMeterTreeNode, regex, wordToReplace, caseSensitiveReplacement, namesReplacement);
if(pair != null) {
totalReplaced += pair.getLeft();
replacedNodes.add(pair.getRight());
Expand All @@ -468,19 +475,27 @@ private void doReplaceAll(ActionEvent e) {
* @return null if no replacement occurred or Pair of (number of replacement, current tree node)
*/
private static Pair<Integer, JMeterTreeNode> doReplacementInCurrentNode(JMeterTreeNode jMeterTreeNode,
String regex, String replaceBy, boolean caseSensitiveReplacement) {
String regex, String replaceBy, boolean caseSensitiveReplacement, boolean namesReplacement) {
try {
if (jMeterTreeNode.getUserObject() instanceof Replaceable) {
Replaceable replaceable = (Replaceable) jMeterTreeNode.getUserObject();
int numberOfReplacements = replaceable.replace(regex, replaceBy, caseSensitiveReplacement);
if (namesReplacement) {
jMeterTreeNode.setName(jMeterTreeNode.getName().replaceAll(regex, replaceBy));
numberOfReplacements++;
}
if (numberOfReplacements > 0) {
if (logger.isInfoEnabled()) {
logger.info("Replaced {} in element:{}", numberOfReplacements,
((TestElement) jMeterTreeNode.getUserObject()).getName());
}
return Pair.of(numberOfReplacements, jMeterTreeNode);
}
} else if (namesReplacement) {
jMeterTreeNode.setName(jMeterTreeNode.getName().replaceAll(regex, replaceBy));
return Pair.of(1, jMeterTreeNode);
}

} catch (Exception ex) {
logger.error("Error occurred replacing data in node:{}", jMeterTreeNode.getName(), ex);
}
Expand Down
1 change: 1 addition & 0 deletions src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,6 +1125,7 @@ search_text_button_close=Close
search_text_button_find=Find
search_text_chkbox_case=Case sensitive
search_text_chkbox_regexp=Regular exp.
search_text_chkbox_names_replaceable=Names replace
search_text_field=Search\:
search_tree_matches={0} node(s) match the search
search_text_replace=Replace by\:
Expand Down