You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by mi...@apache.org on 2011/07/11 19:40:09 UTC
svn commit: r1145254 - in /jakarta/jmeter/trunk:
src/components/org/apache/jmeter/assertions/gui/
src/components/org/apache/jmeter/extractor/gui/
src/core/org/apache/jmeter/gui/ src/core/org/apache/jmeter/util/ xdocs/
Author: milamber
Date: Mon Jul 11 17:40:09 2011
New Revision: 1145254
URL: http://svn.apache.org/viewvc?rev=1145254&view=rev
Log:
Bug 51488 - Assertion: Variable name scope is shared among all assertions (and Bug 51255)
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java?rev=1145254&r1=1145253&r2=1145254&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java Mon Jul 11 17:40:09 2011
@@ -211,7 +211,7 @@ public class AssertionGui extends Abstra
super.configure(el);
ResponseAssertion model = (ResponseAssertion) el;
- showScopeSettings(model);
+ showScopeSettings(model, true);
if (model.isContainsType()) {
containsBox.setSelected(true);
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java?rev=1145254&r1=1145253&r2=1145254&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java Mon Jul 11 17:40:09 2011
@@ -131,7 +131,7 @@ public class SizeAssertionGui extends Ab
SizeAssertion assertion = (SizeAssertion) el;
size.setText(assertion.getAllowedSize());
setState(assertion.getCompOper());
- showScopeSettings(assertion);
+ showScopeSettings(assertion, true);
if (assertion.isTestFieldResponseHeaders()) {
responseHeadersButton.setSelected(true);
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java?rev=1145254&r1=1145253&r2=1145254&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java Mon Jul 11 17:40:09 2011
@@ -81,7 +81,7 @@ public class RegexExtractorGui extends A
super.configure(el);
if (el instanceof RegexExtractor){
RegexExtractor re = (RegexExtractor) el;
- showScopeSettings(re);
+ showScopeSettings(re, true);
useHeaders.setSelected(re.useHeaders());
useBody.setSelected(re.useBody());
useUnescapedBody.setSelected(re.useUnescapedBody());
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java?rev=1145254&r1=1145253&r2=1145254&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java Mon Jul 11 17:40:09 2011
@@ -98,13 +98,24 @@ public abstract class AbstractScopedJMet
* @param testElement
*/
protected void showScopeSettings(AbstractScopedTestElement testElement) {
+ showScopeSettings(testElement, false);
+ }
+
+ /**
+ * Show the scope settings from the test element with variable scope
+ *
+ * @param testElement
+ * @param enableVariableButton
+ */
+ protected void showScopeSettings(AbstractScopedTestElement testElement,
+ boolean enableVariableButton) {
String scope = testElement.fetchScope();
if (testElement.isScopeParent(scope)) {
- scopePanel.setScopeParent();
+ scopePanel.setScopeParent(enableVariableButton);
} else if (testElement.isScopeChildren(scope)){
- scopePanel.setScopeChildren();
+ scopePanel.setScopeChildren(enableVariableButton);
} else if (testElement.isScopeAll(scope)){
- scopePanel.setScopeAll();
+ scopePanel.setScopeAll(enableVariableButton);
} else if (testElement.isScopeVariable(scope)){
scopePanel.setScopeVariable(testElement.getVariableName());
} else {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java?rev=1145254&r1=1145253&r2=1145254&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java Mon Jul 11 17:40:09 2011
@@ -102,15 +102,36 @@ public class ScopePanel extends JPanel i
}
public void setScopeAll() {
+ setScopeAll(false);
+ }
+
+ public void setScopeAll(boolean enableVariableButton) {
allButton.setSelected(true);
+ if (enableVariableButton) {
+ variableName.setText(""); //$NON-NLS-1$
+ }
}
public void setScopeChildren() {
+ setScopeChildren(false);
+ }
+
+ public void setScopeChildren(boolean enableVariableButton) {
childButton.setSelected(true);
+ if (enableVariableButton) {
+ variableName.setText(""); //$NON-NLS-1$
+ }
}
public void setScopeParent() {
+ setScopeParent(false);
+ }
+
+ public void setScopeParent(boolean enableVariableButton) {
parentButton.setSelected(true);
+ if (enableVariableButton) {
+ variableName.setText(""); //$NON-NLS-1$
+ }
}
public void setScopeVariable(String value){
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1145254&r1=1145253&r2=1145254&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Mon Jul 11 17:40:09 2011
@@ -128,6 +128,7 @@ Rather than delegating to the JMeter thr
<h3>Assertions</h3>
<ul>
+<li>Bug 51488 - Assertion: Variable name scope is shared among all assertions (and Bug 51255)</li>
</ul>
<h3>Functions</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org