svn commit: r904998 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Author: sebb
Date: Sun Jan 31 11:02:40 2010
New Revision: 904998
URL: http://svn.apache.org/viewvc?rev=904998view=rev
Log:
Simplify initTemplate() by doing our own splitting
[using amended version of ORO split() code]
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=904998r1=904997r2=904998view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Sun Jan 31 11:02:40 2010
@@ -20,8 +20,6 @@
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import org.apache.commons.lang.StringEscapeUtils;
@@ -41,7 +39,6 @@
import org.apache.oro.text.regex.PatternMatcherInput;
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
-import org.apache.oro.text.regex.Util;
// @see org.apache.jmeter.extractor.TestRegexExtractor for unit tests
@@ -83,7 +80,7 @@
private static final String UNDERSCORE = _; // $NON-NLS-1$
-private Object[] template = null;
+private ListObject template;
/**
* Parses the response data using regular expressions and saving the
results
@@ -287,14 +284,14 @@
private String generateResult(MatchResult match) {
StringBuilder result = new StringBuilder();
-for (int a = 0; a template.length; a++) {
+for (Object obj : template) {
if (log.isDebugEnabled()) {
-log.debug(RegexExtractor: Template piece # + a + = +
template[a] + +template[a].getClass().getSimpleName());
+log.debug(RegexExtractor: Template piece + obj + ( +
obj.getClass().getSimpleName() + ));
}
-if (template[a] instanceof String) {
-result.append(template[a]);
+if (obj instanceof Integer) {
+result.append(match.group(((Integer) obj).intValue()));
} else {
-result.append(match.group(((Integer) template[a]).intValue()));
+result.append(obj);
}
}
if (log.isDebugEnabled()) {
@@ -307,9 +304,8 @@
if (template != null) {
return;
}
-ListString pieces = new ArrayListString();
// Contains Strings and Integers
-ListObject combined = new LinkedListObject();
+ListObject combined = new ArrayListObject();
String rawTemplate = getTemplate();
PatternMatcher matcher = JMeterUtils.getMatcher();
Pattern templatePattern =
JMeterUtils.getPatternCache().getPattern(\\$(\\d+)\\$ // $NON-NLS-1$
@@ -319,55 +315,29 @@
log.debug(Pattern = + templatePattern.getPattern());
log.debug(template = + rawTemplate);
}
-Util.split(pieces, matcher, templatePattern, rawTemplate);
-PatternMatcherInput input = new PatternMatcherInput(rawTemplate);
-boolean startsWith = isFirstElementGroup(rawTemplate);
-if (log.isDebugEnabled()) {
-log.debug(template split into + pieces.size() + pieces,
starts with = + startsWith);
-}
-if (startsWith) {
-String dropped = pieces.remove(0);// Remove initial empty entry
-if (log.isDebugEnabled()) {
-log.debug(Dropped leading: '+dropped+');
-}
-}
-IteratorString iter = pieces.iterator();
-while (iter.hasNext()) {
-final String next = iter.next();
-boolean matchExists = matcher.contains(input, templatePattern);
-if (startsWith) {
-if (matchExists) {
-combined.add(new Integer(matcher.getMatch().group(1)));
-}
-if (next.length() 0) {
-combined.add(next);
-}
-} else {
-if (next.length() 0) {
-combined.add(next);
-}
-if (matchExists) {
-combined.add(new Integer(matcher.getMatch().group(1)));
-}
+int beginOffset = 0;
+MatchResult currentResult;
+PatternMatcherInput pinput = new PatternMatcherInput(rawTemplate);
+while(matcher.contains(pinput, templatePattern)) {
+currentResult = matcher.getMatch();
+final int beginMatch = currentResult.beginOffset(0);
+if (beginMatch beginOffset) { // string is not empty
+combined.add(rawTemplate.substring(beginOffset, beginMatch));
svn commit: r904999 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Author: sebb
Date: Sun Jan 31 11:08:28 2010
New Revision: 904999
URL: http://svn.apache.org/viewvc?rev=904999view=rev
Log:
template is created as needed, so no need to clone it
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=904999r1=904998r2=904999view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Sun Jan 31 11:08:28 2010
@@ -80,7 +80,7 @@
private static final String UNDERSCORE = _; // $NON-NLS-1$
-private ListObject template;
+private transient ListObject template;
/**
* Parses the response data using regular expressions and saving the
results
@@ -275,13 +275,6 @@
}
}
-@Override
-public Object clone() {
-RegexExtractor cloned = (RegexExtractor) super.clone();
-cloned.template = this.template;
-return cloned;
-}
-
private String generateResult(MatchResult match) {
StringBuilder result = new StringBuilder();
for (Object obj : template) {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r905000 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Author: sebb
Date: Sun Jan 31 11:10:17 2010
New Revision: 905000
URL: http://svn.apache.org/viewvc?rev=905000view=rev
Log:
Needs serialVersionUID
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=905000r1=904999r2=905000view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Sun Jan 31 11:10:17 2010
@@ -44,6 +44,7 @@
public class RegexExtractor extends AbstractScopedTestElement implements
PostProcessor, Serializable {
+private static final long serialVersionUID = 240L;
private static final Logger log = LoggingManager.getLoggerForClass();
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r905021 - in /jakarta/jmeter/trunk/test/src/org/apache/jmeter: junit/stubs/TestSampler.java protocol/http/sampler/HTTPNullSampler.java samplers/NullSampler.java threads/TestTestCompiler.ja
Author: sebb
Date: Sun Jan 31 12:51:41 2010
New Revision: 905021
URL: http://svn.apache.org/viewvc?rev=905021view=rev
Log:
Add serial version UIDs
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/NullSampler.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java?rev=905021r1=905020r2=905021view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java
Sun Jan 31 12:51:41 2010
@@ -30,6 +30,8 @@
public class TestSampler extends AbstractSampler {
+private static final long serialVersionUID = 240L;
+
private long wait = 0;
private long samples = 0; // number of samples taken
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java?rev=905021r1=905020r2=905021view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java
Sun Jan 31 12:51:41 2010
@@ -26,6 +26,8 @@
*/
public final class HTTPNullSampler extends HTTPSamplerBase {
+private static final long serialVersionUID = 240L;
+
/*
* (non-Javadoc)
*
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/NullSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/NullSampler.java?rev=905021r1=905020r2=905021view=diff
==
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/NullSampler.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/NullSampler.java
Sun Jan 31 12:51:41 2010
@@ -25,6 +25,8 @@
*/
public class NullSampler extends AbstractSampler {
+private static final long serialVersionUID = 240L;
+
public SampleResult sample(Entry e) {
return new SampleResult();
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java?rev=905021r1=905020r2=905021view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java
Sun Jan 31 12:51:41 2010
@@ -48,6 +48,8 @@
}
class TestSampler extends AbstractSampler {
+private static final long serialVersionUID = 240L;
+
public SampleResult sample(org.apache.jmeter.samplers.Entry e) {
return null;
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r905022 - in /jakarta/jmeter/trunk/src/reports/org/apache/jmeter: control/gui/ gui/ gui/util/ report/engine/ report/gui/ report/gui/tree/ report/writers/ report/writers/gui/ testelement/
Author: sebb
Date: Sun Jan 31 12:52:31 2010
New Revision: 905022
URL: http://svn.apache.org/viewvc?rev=905022view=rev
Log:
Add serial version UIDs
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFilePanel.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/StandardReportEngine.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/BarChartGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/TableGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportCellRenderer.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeNode.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/AbstractReportWriter.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/HTMLReportWriter.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/gui/HTMLReportWriterGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/AbstractChart.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/AbstractTable.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/BarChart.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/JTLData.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/LineChart.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPage.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/Table.java
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java?rev=905022r1=905021r2=905022view=diff
==
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
Sun Jan 31 12:52:31 2010
@@ -48,6 +48,8 @@
*/
public class ReportGui extends AbstractReportGui {
+private static final long serialVersionUID = 240L;
+
/** A panel to contain comments on the test plan. */
private JTextField commentPanel;
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java?rev=905022r1=905021r2=905022view=diff
==
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
(original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
Sun Jan 31 12:52:31 2010
@@ -68,6 +68,8 @@
*/
public class ReportMainFrame extends JFrame implements TestListener,
Remoteable {
+private static final long serialVersionUID = 240L;
+
private static final Logger log = LoggingManager.getLoggerForClass();
// The default title for the Menu bar
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java?rev=905022r1=905021r2=905022view=diff
==
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java
Sun Jan 31 12:52:31 2010
@@ -37,6 +37,8 @@
public class DirectoryPanel extends HorizontalPanel implements ActionListener {
+private static final long serialVersionUID = 240L;
+
private static final String ACTION_BROWSE = browse; // $NON-NSL-1$
private final JTextField filename = new JTextField(20);
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFilePanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFilePanel.java?rev=905022r1=905021r2=905022view=diff
==
---
svn commit: r905024 - in /jakarta/jmeter/trunk/src: examples/org/apache/jmeter/examples/sampler/ examples/org/apache/jmeter/examples/sampler/gui/ examples/org/apache/jmeter/examples/testbeans/example1
Author: sebb
Date: Sun Jan 31 12:55:35 2010
New Revision: 905024
URL: http://svn.apache.org/viewvc?rev=905024view=rev
Log:
Add serial version UIDs
Modified:
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/DefaultTreeTableModel.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledPasswordField.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledRadio.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/NumberRenderer.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/RateRenderer.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/RightAlignRenderer.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/layout/VerticalLayout.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/io/TextFile.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterError.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterException.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterStopTestException.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterStopTestNowException.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterStopThreadException.java
Modified:
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java?rev=905024r1=905023r2=905024view=diff
==
---
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java
(original)
+++
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java
Sun Jan 31 12:55:35 2010
@@ -40,6 +40,8 @@
*/
public class ExampleSampler extends AbstractSampler {
+private static final long serialVersionUID = 240L;
+
private static final Logger log = LoggingManager.getLoggerForClass();
// The name of the property used to hold our data
Modified:
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java?rev=905024r1=905023r2=905024view=diff
==
---
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
(original)
+++
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
Sun Jan 31 12:55:35 2010
@@ -45,6 +45,8 @@
*/
public class ExampleSamplerGui extends AbstractSamplerGui {
+private static final long serialVersionUID = 240L;
+
private JTextArea data;
public ExampleSamplerGui() {
Modified:
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java?rev=905024r1=905023r2=905024view=diff
==
---
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java
(original)
+++
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java
Sun Jan 31 12:55:35 2010
@@ -31,6 +31,8 @@
*/
public class Example1 extends AbstractSampler implements TestBean {
+private static final long serialVersionUID = 240L;
+
public SampleResult sample(Entry e) {
SampleResult res = new SampleResult();
res.setSampleLabel(getName());
Modified:
svn commit: r905029 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Author: sebb Date: Sun Jan 31 13:04:52 2010 New Revision: 905029 URL: http://svn.apache.org/viewvc?rev=905029view=rev Log: Unused Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=905029r1=905028r2=905029view=diff == --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Sun Jan 31 13:04:52 2010 @@ -182,8 +182,6 @@ // TODO do contentType and/or dataEncoding belong in HTTPSampleResult instead? -private final static String TOTAL_TIME = totalTime; // $NON-NLS-1$ - private static final boolean startTimeStamp = JMeterUtils.getPropDefault(sampleresult.timestamp.start, false); // $NON-NLS-1$ - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r905032 - /jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
Author: sebb Date: Sun Jan 31 13:10:37 2010 New Revision: 905032 URL: http://svn.apache.org/viewvc?rev=905032view=rev Log: Unused Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java?rev=905032r1=905031r2=905032view=diff == --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java Sun Jan 31 13:10:37 2010 @@ -24,7 +24,6 @@ import java.io.InputStreamReader; import java.util.ArrayList; import java.util.Collections; -import java.util.Enumeration; import java.util.Iterator; import java.util.List; import java.util.MissingResourceException; - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r905052 - in /jakarta/jmeter/trunk/src/core/org/apache/jmeter: assertions/gui/AbstractAssertionGui.java processor/gui/AbstractPostProcessorGui.java testelement/AbstractScopedTestElement.ja
Author: sebb
Date: Sun Jan 31 15:11:00 2010
New Revision: 905052
URL: http://svn.apache.org/viewvc?rev=905052view=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=905052r1=905051r2=905052view=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=905052r1=905051r2=905052view=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=905052r1=905051r2=905052view=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 =
svn commit: r905149 - in /jakarta/jmeter/trunk: docs/images/screenshots/ src/components/org/apache/jmeter/extractor/ src/components/org/apache/jmeter/extractor/gui/ src/core/org/apache/jmeter/testelem
Author: sebb
Date: Mon Feb 1 00:17:15 2010
New Revision: 905149
URL: http://svn.apache.org/viewvc?rev=905149view=rev
Log:
Add Sampler scope selection to XPathExtractor
Modified:
jakarta/jmeter/trunk/docs/images/screenshots/xpath_extractor.png
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/images/screenshots/xpath_extractor.png
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jakarta/jmeter/trunk/docs/images/screenshots/xpath_extractor.png
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/xpath_extractor.png?rev=905149r1=905148r2=905149view=diff
==
Binary files - no diff available.
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=905149r1=905148r2=905149view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Mon Feb 1 00:17:15 2010
@@ -177,17 +177,7 @@
}
private ListMatchResult processMatches(String regex, SampleResult
result, int matchNumber) {
-ListSampleResult sampleList = new ArrayListSampleResult();
-
-String scope = fetchScope();
-if (isScopeParent(scope) || isScopeAll(scope)) {
-sampleList.add(result);
-}
-if (isScopeChildren(scope) || isScopeAll(scope)) {
-for (SampleResult subResult : result.getSubResults()) {
-sampleList.add(subResult);
-}
-}
+ListSampleResult sampleList = getSampleList(result);
if (log.isDebugEnabled()) {
log.debug(Regex = + regex);
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java?rev=905149r1=905148r2=905149view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
Mon Feb 1 00:17:15 2010
@@ -22,6 +22,8 @@
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
@@ -29,7 +31,7 @@
import org.apache.jmeter.assertions.AssertionResult;
import org.apache.jmeter.processor.PostProcessor;
import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.testelement.AbstractTestElement;
+import org.apache.jmeter.testelement.AbstractScopedTestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.threads.JMeterContext;
import org.apache.jmeter.threads.JMeterVariables;
@@ -77,7 +79,7 @@
*
* See Bugzilla: 37183
*/
-public class XPathExtractor extends AbstractTestElement implements
+public class XPathExtractor extends AbstractScopedTestElement implements
PostProcessor, Serializable {
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -105,6 +107,10 @@
return new StringBuilder(s1).append(_).append(s2).toString(); //
$NON-NLS-1$
}
+private String concat(String s1, int i){
+return new StringBuilder(s1).append(_).append(i).toString(); //
$NON-NLS-1$
+}
+
/**
* Do the job - extract value from (X)HTML response using XPath Query.
* Return value as variable defined by REFNAME. Returns DEFAULT value
@@ -119,12 +125,42 @@
JMeterVariables vars = context.getVariables();
String refName = getRefName();
vars.put(refName, getDefaultValue());
-vars.put(concat(refName,MATCH_NR), 0); // In case parse fails //
$NON-NLS-1$
+final String matchNR = concat(refName,MATCH_NR);
+int prevCount=0; // number of previous matches
+try {
+
