pauldick 2002/06/17 13:21:43
Modified: test/java/src/org/apache/qetest/dtm QeDtmUtils.java
Log:
Added additional test file. Check for nodes in axis before
attempting to print node info.
Revision Changes Path
1.4 +21 -8
xml-xalan/test/java/src/org/apache/qetest/dtm/QeDtmUtils.java
Index: QeDtmUtils.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/dtm/QeDtmUtils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- QeDtmUtils.java 14 Jun 2002 20:02:54 -0000 1.3
+++ QeDtmUtils.java 17 Jun 2002 20:21:43 -0000 1.4
@@ -132,6 +132,19 @@
" </Sub-Doc>"+
" </bdd:dummyDocument>\n";
+public static final String simpleFlatFile=
+ "<?xml version=\"1.0\"?>\n"+
+ "<Doc>\n"+
+ "<item>XSLT</item>\n"+
+ "<item>processors</item>\n"+
+ "<item>must</item>\n"+
+ "<item>use</item>\n"+
+ "<item>XML</item>\n"+
+ "<item>Namespaces</item>\n"+
+ "<item>mechanism</item>\n"+
+ "</Doc>";
+
+
public static final String[] TYPENAME=
{ "NULL",
"ELEMENT",
@@ -213,8 +226,7 @@
DTMAxisIterator iter = dtm.getAxisIterator(axis);
iter.setStartNode(context);
- for (atNode = iter.next(); DTM.NULL != atNode;
- atNode = iter.next())
+ for (atNode = iter.next(); DTM.NULL != atNode; atNode = iter.next())
{
lastNode = atNode;
numOfNodes = numOfNodes + 1; // Need to know that we
Iterated the whole tree
@@ -222,7 +234,8 @@
iterTime = System.currentTimeMillis() - startTime;
- getNodeInfo(dtm, lastNode, " ");
+ if (lastNode != 0)
+ getNodeInfo(dtm, lastNode, " ");
rtdata[0] = (int)iterTime;
rtdata[1] = lastNode;
@@ -243,8 +256,7 @@
DTMAxisTraverser at = dtm.getAxisTraverser(axis);
- for (atNode = at.first(context); DTM.NULL != atNode;
- atNode = at.next(context, atNode))
+ for (atNode = at.first(context); DTM.NULL != atNode; atNode =
at.next(context, atNode))
{
lastNode = atNode;
numOfNodes = numOfNodes + 1;
@@ -252,7 +264,8 @@
travTime = System.currentTimeMillis() - startTime;
- getNodeInfo(dtm, lastNode, " ");
+ if (lastNode != 0)
+ getNodeInfo(dtm, lastNode, " ");
rtdata[0] = (int)travTime;
rtdata[1] = lastNode;
@@ -273,7 +286,7 @@
// Skip outputing of text nodes. In most cases they clutter the output,
// besides I'm only interested in the elemental structure of the dtm.
if( TYPENAME[dtm.getNodeType(nodeHandle)] != "TEXT" )
- {
+ {
buf = new String(indent+
nodeHandle+": "+
TYPENAME[dtm.getNodeType(nodeHandle)]+" "+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
