Author: sebb
Date: Sun Jan 31 15:11:00 2010
New Revision: 905052
URL: http://svn.apache.org/viewvc?rev=905052&view=rev
Log:
Check for impossible conditions
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java?rev=905052&r1=905051&r2=905052&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java Sun Jan 31 15:11:00 2010
@@ -98,13 +98,13 @@
protected void saveScopeSettings(AbstractScopedAssertion assertion) {
if (assertionScopePanel.isScopeParent()){
assertion.setScopeParent();
- } else
- if (assertionScopePanel.isScopeChildren()){
+ } else if (assertionScopePanel.isScopeChildren()){
assertion.setScopeChildren();
- } else {
+ } else if (assertionScopePanel.isScopeAll()) {
assertion.setScopeAll();
+ } else {
+ throw new IllegalArgumentException("Unexpected scope panel state");
}
-
}
/**
@@ -118,8 +118,10 @@
assertionScopePanel.setScopeParent();
} else if (assertion.isScopeChildren(scope)){
assertionScopePanel.setScopeChildren();
- } else {
+ } else if (assertion.isScopeAll(scope)){
assertionScopePanel.setScopeAll();
+ } else {
+ throw new IllegalArgumentException("Invalid scope: "+scope);
}
}
}
\ No newline at end of file
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java?rev=905052&r1=905051&r2=905052&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java Sun Jan 31 15:11:00 2010
@@ -77,15 +77,15 @@
* @param testElement
*/
protected void saveScopeSettings(AbstractScopedTestElement testElement) {
- if (scopePanel.isScopeParent()){
+ if (scopePanel.isScopeParent()) {
testElement.setScopeParent();
- } else
- if (scopePanel.isScopeChildren()){
+ } else if (scopePanel.isScopeChildren()) {
testElement.setScopeChildren();
- } else {
+ } else if (scopePanel.isScopeAll()) {
testElement.setScopeAll();
+ } else {
+ throw new IllegalArgumentException("Unexpected scope panel state");
}
-
}
/**
@@ -99,8 +99,10 @@
scopePanel.setScopeParent();
} else if (testElement.isScopeChildren(scope)){
scopePanel.setScopeChildren();
- } else {
+ } else if (testElement.isScopeAll(scope)){
scopePanel.setScopeAll();
+ } else {
+ throw new IllegalArgumentException("Invalid scope: "+scope);
}
}
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java?rev=905052&r1=905051&r2=905052&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java Sun Jan 31 15:11:00 2010
@@ -20,8 +20,8 @@
/**
* <p>
- * Super-class for all TestElements that can be applied to main sample, sub-samples or both.
- * Test elements can use the
+ * Super-class for TestElements that can be applied to main sample, sub-samples or both.
+ * [Assertions use a different class because they use a different value for the {@link #SCOPE} constant]
* </p>
*
* <p>
@@ -38,10 +38,12 @@
private static final long serialVersionUID = 240L;
- private static final String SCOPE = "Sample.scope";
- private static final String SCOPE_PARENT = "parent";
- private static final String SCOPE_CHILDREN = "children";
- private static final String SCOPE_ALL = "all";
+ //+ JMX attributes - do not change
+ private static final String SCOPE = "Sample.scope"; // $NON-NLS-1$
+ private static final String SCOPE_PARENT = "parent"; // $NON-NLS-1$
+ private static final String SCOPE_CHILDREN = "children"; // $NON-NLS-1$
+ private static final String SCOPE_ALL = "all"; // $NON-NLS-1$
+ //- JMX
/**
* Get the scope setting
@@ -77,7 +79,7 @@
* @param scope
* @return if the assertion is to be applied to the all samples.
*/
- protected boolean isScopeAll(String scope) {
+ public boolean isScopeAll(String scope) {
return scope.equals(SCOPE_ALL);
}
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=905052&r1=905051&r2=905052&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 Sun Jan 31 15:11:00 2010
@@ -42,9 +42,9 @@
private final JRadioButton allButton;
public ScopePanel() {
- allButton = new JRadioButton(JMeterUtils.getResString("sample_scope_all"));
- parentButton = new JRadioButton(JMeterUtils.getResString("sample_scope_parent"));
- childButton = new JRadioButton(JMeterUtils.getResString("sample_scope_children"));
+ allButton = new JRadioButton(JMeterUtils.getResString("sample_scope_all")); //$NON-NLS-1$
+ parentButton = new JRadioButton(JMeterUtils.getResString("sample_scope_parent")); //$NON-NLS-1$
+ childButton = new JRadioButton(JMeterUtils.getResString("sample_scope_children")); //$NON-NLS-1$
init();
}
@@ -99,4 +99,8 @@
public boolean isScopeChildren() {
return childButton.isSelected();
}
+
+ public boolean isScopeAll() {
+ return allButton.isSelected();
+ }
}
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.