Author: sebb
Date: Tue Sep 4 12:58:54 2007
New Revision: 572800
URL: http://svn.apache.org/viewvc?rev=572800&view=rev
Log:
Add nameSpace option to XPath extractor
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/XPathExtractor.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/XPathExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/XPathExtractor.java?rev=572800&r1=572799&r2=572800&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/XPathExtractor.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/XPathExtractor.java
Tue Sep 4 12:58:54 2007
@@ -68,10 +68,11 @@
private static final Logger log = LoggingManager.getLoggerForClass();
private static final String MATCH_NR = "matchNr"; // $NON-NLS-1$
protected static final String KEY_PREFIX = "XPathExtractor."; //
$NON-NLS-1$
- public static final String XPATH_QUERY = KEY_PREFIX +"xpathQuery"; //
$NON-NLS-1$
- public static final String REFNAME = KEY_PREFIX +"refname"; //
$NON-NLS-1$
- public static final String DEFAULT = KEY_PREFIX +"default"; //
$NON-NLS-1$
- public static final String TOLERANT = KEY_PREFIX +"tolerant"; //
$NON-NLS-1$
+ private static final String XPATH_QUERY = KEY_PREFIX +"xpathQuery"; //
$NON-NLS-1$
+ private static final String REFNAME = KEY_PREFIX +"refname"; //
$NON-NLS-1$
+ private static final String DEFAULT = KEY_PREFIX +"default"; //
$NON-NLS-1$
+ private static final String TOLERANT = KEY_PREFIX +"tolerant"; //
$NON-NLS-1$
+ private static final String NAMESPACE = KEY_PREFIX +"namespace"; //
$NON-NLS-1$
private String concat(String s1,String s2){
@@ -149,7 +150,15 @@
public boolean isTolerant() {
return getPropertyAsBoolean(TOLERANT);
}
-
+
+ public void setNameSpace(boolean val) {
+ setProperty(new BooleanProperty(NAMESPACE, val));
+ }
+
+ public boolean useNameSpace() {
+ return getPropertyAsBoolean(NAMESPACE);
+ }
+
/*================= internal business =================*/
/**
* Converts (X)HTML response to DOM object Tree.
@@ -172,7 +181,7 @@
byte[] utf8data = unicodeData.getBytes("UTF-8"); // $NON-NLS-1$
ByteArrayInputStream in = new ByteArrayInputStream(utf8data);
// this method assumes UTF-8 input data
- return XPathUtil.makeDocument(in,false,false,false,isTolerant());
+ return
XPathUtil.makeDocument(in,false,false,useNameSpace(),isTolerant());
}
/**
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java?rev=572800&r1=572799&r2=572800&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
Tue Sep 4 12:58:54 2007
@@ -48,9 +48,14 @@
private JLabeledTextField refNameField;
- private JCheckBox tolerant;
-
- public String getLabelResource() {
+ private JCheckBox tolerant; // Should Tidy be run?
+
+ private JCheckBox nameSpace; // Should parser be namespace aware?
+
+ // We could perhaps add validate/whitespace options, but they're
probably not necessary for
+ // the XPathExtractor
+
+ public String getLabelResource() {
return "xpath_extractor_title"; //$NON-NLS-1$
}
@@ -61,10 +66,12 @@
public void configure(TestElement el) {
super.configure(el);
-
xpathQueryField.setText(el.getPropertyAsString(XPathExtractor.XPATH_QUERY));
-
defaultField.setText(el.getPropertyAsString(XPathExtractor.DEFAULT));
-
refNameField.setText(el.getPropertyAsString(XPathExtractor.REFNAME));
-
tolerant.setSelected(el.getPropertyAsBoolean(XPathExtractor.TOLERANT));
+ XPathExtractor xpe = (XPathExtractor) el;
+ xpathQueryField.setText(xpe.getXPathQuery());
+ defaultField.setText(xpe.getDefaultValue());
+ refNameField.setText(xpe.getRefName());
+ tolerant.setSelected(xpe.isTolerant());
+ nameSpace.setSelected(xpe.useNameSpace());
}
@@ -85,6 +92,7 @@
xpath.setRefName(refNameField.getText());
xpath.setXPathQuery(xpathQueryField.getText());
xpath.setTolerant(tolerant.isSelected());
+ xpath.setNameSpace(nameSpace.isSelected());
}
}
@@ -98,6 +106,7 @@
defaultField.setText(""); // $NON-NLS-1$
refNameField.setText(""); // $NON-NLS-1$
tolerant.setSelected(false);
+ nameSpace.setSelected(true);
}
private void init() {
@@ -106,8 +115,12 @@
Box box = Box.createVerticalBox();
box.add(makeTitlePanel());
+ Box options = Box.createHorizontalBox();
tolerant = new
JCheckBox(JMeterUtils.getResString("xpath_extractor_tolerant"));//$NON-NLS-1$
- box.add(tolerant);
+ nameSpace = new
JCheckBox(JMeterUtils.getResString("xpath_extractor_namespace"),true);//$NON-NLS-1$
+ options.add(tolerant);
+ options.add(nameSpace);
+ box.add(options);
add(box, BorderLayout.NORTH);
add(makeParameterPanel(), BorderLayout.CENTER);
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties?rev=572800&r1=572799&r2=572800&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
Tue Sep 4 12:58:54 2007
@@ -833,6 +833,7 @@
xpath_assertion_validation=Validate the XML against the DTD
xpath_assertion_whitespace=Ignore whitespace
xpath_expression=XPath expression to match against
+xpath_extractor_namespace=Use Namespaces?
xpath_extractor_query=XPath query:
xpath_extractor_title=XPath Extractor
xpath_extractor_tolerant=Use Tidy ?
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?rev=572800&r1=572799&r2=572800&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Tue Sep 4 12:58:54 2007
@@ -27,6 +27,12 @@
<!-- =================== -->
+<h3>Version 2.31</h3>
+
+<h4>Improvements</h4>
+<ul>
+<li>Add nameSpace option to XPath extractor</li>
+</ul>
<h3>Version 2.3</h3>
<h4>Fixes since 2.3RC3</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
