You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2005/08/04 03:01:01 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/junit JMeterTest.java
sebb 2005/08/03 18:01:01
Modified: src/core/org/apache/jmeter/junit JMeterTest.java
Log:
Fix title check to work with shared docAnchors
Revision Changes Path
1.64 +9 -10 jakarta-jmeter/src/core/org/apache/jmeter/junit/JMeterTest.java
Index: JMeterTest.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/junit/JMeterTest.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- JMeterTest.java 12 Jul 2005 20:50:50 -0000 1.63
+++ JMeterTest.java 4 Aug 2005 01:01:01 -0000 1.64
@@ -173,11 +173,14 @@
List components = ((Element) sections.get(i)).getChildren("component");
for (int j = 0; j < components.size(); j++) {
Element comp = (Element) components.get(j);
- guiTitles.put(comp.getAttributeValue("name"), Boolean.FALSE);
+ String nm=comp.getAttributeValue("name");
+ if (!nm.equals("SSL Manager")){// Not a true GUI component
+ guiTitles.put(nm.replace(' ','_'), Boolean.FALSE);
+ }
}
}
// Add titles that don't need to be documented
- guiTitles.put("Root", Boolean.FALSE);
+ //guiTitles.put("Root", Boolean.FALSE);
guiTitles.put("Example Sampler", Boolean.FALSE);
}
@@ -235,10 +238,6 @@
while (i.hasNext()) {
Object key = i.next();
if (!m.get(key).equals(Boolean.TRUE)) {
- if (key.equals("SSL Manager"))// Not a true GUI component
- {
- continue;
- }
if (unseen == 0)// first time
{
System.out.println("\nNames remaining in " + t + " Map:");
@@ -332,13 +331,13 @@
*/
public void runGUITitle() throws Exception {
if (guiTitles.size() > 0) {
- String title = guiItem.getStaticLabel();
+ String title = guiItem.getDocAnchor();
boolean ct = guiTitles.containsKey(title);
if (ct)
guiTitles.put(title, Boolean.TRUE);// So we can detect extra
// entries
if (// Is this a work in progress or an internal GUI component?
- (title.length() > 0) // Will be "" for internal components
+ (title != null && title.length() > 0) // Will be "" for internal components
&& (title.toUpperCase().indexOf("(ALPHA") == -1) && (title.toUpperCase().indexOf("(BETA") == -1)
&& (!title.equals("Example1")) // Skip the example samplers
// ...
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org