mkwan 2003/11/06 06:48:09
Modified: test/java/src/org/apache/qetest ConsoleLogger.java
FileBasedTest.java FileDatalet.java
FileTestletDriver.java Reporter.java
XMLFileLogger.java
test/java/src/org/apache/qetest/rwapi XPathASTTestlet.java
test/java/src/org/apache/qetest/trax Minitest.java
OutputPropertiesTest.java TransformerAPITest.java
test/java/src/org/apache/qetest/xsl
BugzillaTestletDriver.java
StylesheetErrorTestlet.java
StylesheetTestletDriver.java
XHTFileCheckService.java XSLTestAntTask.java
test/java/src/org/apache/qetest/xslwrapper
TransformWrapperHelper.java
Log:
Fix for bugzilla 22342
Rename variables with name "enum" under the test source, because
enum is a keyword in JDK 1.5.
Revision Changes Path
1.9 +7 -7
xml-xalan/test/java/src/org/apache/qetest/ConsoleLogger.java
Index: ConsoleLogger.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/ConsoleLogger.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ConsoleLogger.java 31 Jan 2003 15:47:15 -0000 1.8
+++ ConsoleLogger.java 6 Nov 2003 14:48:08 -0000 1.9
@@ -454,10 +454,10 @@
outStream.println(sIndent + element);
indent();
- for (Enumeration enum = attrs.keys();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration keys = attrs.keys();
+ keys.hasMoreElements(); /* no increment portion */ )
{
- Object key = enum.nextElement();
+ Object key = keys.nextElement();
outStream.println(sIndent + key.toString() + "="
+ attrs.get(key).toString());
@@ -496,10 +496,10 @@
{
// Fake the Properties-like output
- for (Enumeration enum = hash.keys();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration keys = hash.keys();
+ keys.hasMoreElements(); /* no increment portion */ )
{
- Object key = enum.nextElement();
+ Object key = keys.nextElement();
outStream.println(sIndent + key.toString() + "="
+ hash.get(key).toString());
1.6 +3 -3
xml-xalan/test/java/src/org/apache/qetest/FileBasedTest.java
Index: FileBasedTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/FileBasedTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FileBasedTest.java 31 Jan 2003 15:47:15 -0000 1.5
+++ FileBasedTest.java 6 Nov 2003 14:48:08 -0000 1.6
@@ -441,10 +441,10 @@
// have to get updated when we have new properties
// Note that this may result in duplicates since we
// re-set many of the things from bleow
- for (Enumeration enum = props.propertyNames();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration names = props.propertyNames();
+ names.hasMoreElements(); /* no increment portion */ )
{
- Object key = enum.nextElement();
+ Object key = names.nextElement();
testProps.put(key, props.get(key));
}
1.9 +4 -4
xml-xalan/test/java/src/org/apache/qetest/FileDatalet.java
Index: FileDatalet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/FileDatalet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FileDatalet.java 27 Jan 2003 18:32:34 -0000 1.8
+++ FileDatalet.java 6 Nov 2003 14:48:08 -0000 1.9
@@ -393,11 +393,11 @@
// Also copy over all items in hash to options
options = new Properties();
- for (Enumeration enum = h.keys();
- enum.hasMoreElements();
+ for (Enumeration keys = h.keys();
+ keys.hasMoreElements();
/* no increment portion */)
{
- String key = (String)enum.nextElement();
+ String key = (String)keys.nextElement();
options.put(key, h.get(key));
}
}
1.8 +4 -4
xml-xalan/test/java/src/org/apache/qetest/FileTestletDriver.java
Index: FileTestletDriver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/FileTestletDriver.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FileTestletDriver.java 31 Jan 2003 15:47:15 -0000 1.7
+++ FileTestletDriver.java 6 Nov 2003 14:48:08 -0000 1.8
@@ -517,13 +517,13 @@
// For every file in the vector, construct the matching
// out, gold, and xml/xsl files
- for (Enumeration enum = files.elements();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration elements = files.elements();
+ elements.hasMoreElements(); /* no increment portion */ )
{
String file = null;
try
{
- file = (String)enum.nextElement();
+ file = (String)elements.nextElement();
}
catch (ClassCastException cce)
{
1.15 +4 -4 xml-xalan/test/java/src/org/apache/qetest/Reporter.java
Index: Reporter.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/Reporter.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Reporter.java 31 Jan 2003 15:47:15 -0000 1.14
+++ Reporter.java 6 Nov 2003 14:48:08 -0000 1.15
@@ -1670,10 +1670,10 @@
// we add an XML header so this is a legal XML doc
printWriter.println("<?xml version=\"1.0\"?>");
printWriter.println("<" + elementName);
- for (Enumeration enum = resultsHash.keys();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration keys = resultsHash.keys();
+ keys.hasMoreElements(); /* no increment portion */ )
{
- Object key = enum.nextElement();
+ Object key = keys.nextElement();
printWriter.println(key + "=\"" + resultsHash.get(key) +
"\"");
}
printWriter.println(">");
1.14 +7 -7
xml-xalan/test/java/src/org/apache/qetest/XMLFileLogger.java
Index: XMLFileLogger.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/XMLFileLogger.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XMLFileLogger.java 31 Jan 2003 15:47:15 -0000 1.13
+++ XMLFileLogger.java 6 Nov 2003 14:48:08 -0000 1.14
@@ -706,10 +706,10 @@
reportPrinter.println("<" + element + " " + ATTR_LEVEL + "=\""
+ level + "\"");
- for (Enumeration enum = attrs.keys();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration keys = attrs.keys();
+ keys.hasMoreElements(); /* no increment portion */ )
{
- Object key = enum.nextElement();
+ Object key = keys.nextElement();
reportPrinter.println(key.toString() + "=\""
+
escapeString(attrs.get(key).toString()) + "\"");
@@ -761,10 +761,10 @@
try
{
- for (Enumeration enum = hash.keys();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration keys = hash.keys();
+ keys.hasMoreElements(); /* no increment portion */ )
{
- Object key = enum.nextElement();
+ Object key = keys.nextElement();
// Ensure we'll have clean output by pre-fetching value
before outputting anything
String value = escapeString(hash.get(key).toString());
1.4 +7 -7
xml-xalan/test/java/src/org/apache/qetest/rwapi/XPathASTTestlet.java
Index: XPathASTTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/rwapi/XPathASTTestlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XPathASTTestlet.java 18 Feb 2003 19:04:52 -0000 1.3
+++ XPathASTTestlet.java 6 Nov 2003 14:48:08 -0000 1.4
@@ -256,18 +256,18 @@
// Cheap-o validation: ensure non-null, dump contents
if (null != matchpats)
{
- for (Enumeration enum = matchpats.elements();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration elements = matchpats.elements();
+ elements.hasMoreElements(); /* no increment portion */ )
{
- logXPath((String)enum.nextElement(),
datalet.getDescription());
+ logXPath((String)elements.nextElement(),
datalet.getDescription());
}
}
if (null != selectpats)
{
- for (Enumeration enum = selectpats.elements();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration elements = selectpats.elements();
+ elements.hasMoreElements(); /* no increment portion */ )
{
- logXPath((String)enum.nextElement(),
datalet.getDescription());
+ logXPath((String)elements.nextElement(),
datalet.getDescription());
}
}
}
1.7 +7 -7
xml-xalan/test/java/src/org/apache/qetest/trax/Minitest.java
Index: Minitest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/Minitest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Minitest.java 31 Jan 2003 15:47:17 -0000 1.6
+++ Minitest.java 6 Nov 2003 14:48:08 -0000 1.7
@@ -510,18 +510,18 @@
// Log a big message at the very end to make it easier to see
StringBuffer buf = new StringBuffer("Minitest.testCase5
PERFORMANCE NUMBERS\n");
buf.append(" STREAM OVERALL TIMES: ");
- for (Enumeration enum = streamTimes.elements();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration elements = streamTimes.elements();
+ elements.hasMoreElements(); /* no increment portion */ )
{
- buf.append(enum.nextElement());
+ buf.append(elements.nextElement());
buf.append(", ");
}
buf.append("\n");
buf.append(" DOM OVERALL TIMES: ");
- for (Enumeration enum = domTimes.elements();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration elements = domTimes.elements();
+ elements.hasMoreElements(); /* no increment portion */ )
{
- buf.append(enum.nextElement());
+ buf.append(elements.nextElement());
buf.append(", ");
}
buf.append("\n");
1.6 +4 -4
xml-xalan/test/java/src/org/apache/qetest/trax/OutputPropertiesTest.java
Index: OutputPropertiesTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/OutputPropertiesTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OutputPropertiesTest.java 31 Jan 2003 15:47:17 -0000 1.5
+++ OutputPropertiesTest.java 6 Nov 2003 14:48:08 -0000 1.6
@@ -294,10 +294,10 @@
// Second, set the properties individually and transform
Transformer transformer2 = templates.newTransformer();
- for (Enumeration enum = setProps.propertyNames();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration names = setProps.propertyNames();
+ names.hasMoreElements(); /* no increment portion */ )
{
- String key = (String)enum.nextElement();
+ String key = (String)names.nextElement();
String value = setProps.getProperty(key);
transformer2.setOutputProperty(key, value);
}
1.21 +3 -3
xml-xalan/test/java/src/org/apache/qetest/trax/TransformerAPITest.java
Index: TransformerAPITest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/TransformerAPITest.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TransformerAPITest.java 16 Oct 2003 20:05:28 -0000 1.20
+++ TransformerAPITest.java 6 Nov 2003 14:48:08 -0000 1.21
@@ -582,10 +582,10 @@
// Validate the two have the same properties (which they
// should, since we just got the templates now)
- for (Enumeration enum = tmpltProps.propertyNames();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration names = tmpltProps.propertyNames();
+ names.hasMoreElements(); /* no increment portion */ )
{
- String key = (String)enum.nextElement();
+ String key = (String)names.nextElement();
String value = tmpltProps.getProperty(key);
reporter.check(value, outProps.getProperty(key),
"Template, transformer identical outProp:
" + key);
1.7 +4 -4
xml-xalan/test/java/src/org/apache/qetest/xsl/BugzillaTestletDriver.java
Index: BugzillaTestletDriver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/BugzillaTestletDriver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BugzillaTestletDriver.java 31 Jan 2003 15:47:21 -0000 1.6
+++ BugzillaTestletDriver.java 6 Nov 2003 14:48:08 -0000 1.7
@@ -302,13 +302,13 @@
// For every file in the vector, construct the matching
// out, gold, and xml/xsl files; plus see if we have
// a .java file as well
- for (Enumeration enum = files.elements();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration elements = files.elements();
+ elements.hasMoreElements(); /* no increment portion */ )
{
String file = null;
try
{
- file = (String)enum.nextElement();
+ file = (String)elements.nextElement();
}
catch (ClassCastException cce)
{
1.6 +4 -4
xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetErrorTestlet.java
Index: StylesheetErrorTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetErrorTestlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StylesheetErrorTestlet.java 31 Jan 2003 15:47:21 -0000 1.5
+++ StylesheetErrorTestlet.java 6 Nov 2003 14:48:08 -0000 1.6
@@ -167,12 +167,12 @@
{
// Attempt to see if our throwable matches any gold data
boolean foundExpected = false;
- for (Enumeration enum = expectedExceptions.elements();
- enum.hasMoreElements();
+ for (Enumeration elements = expectedExceptions.elements();
+ elements.hasMoreElements();
/* no increment portion */)
{
// Maintenance Note: Ensure this will always be String data
- String expExc = (String)enum.nextElement();
+ String expExc = (String)elements.nextElement();
if (t.toString().indexOf(expExc) > -1)
{
foundExpected = true;
1.13 +4 -4
xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetTestletDriver.java
Index: StylesheetTestletDriver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetTestletDriver.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- StylesheetTestletDriver.java 16 Jun 2003 21:45:07 -0000 1.12
+++ StylesheetTestletDriver.java 6 Nov 2003 14:48:08 -0000 1.13
@@ -626,13 +626,13 @@
// For every file in the vector, construct the matching
// out, gold, and xml/xsl files
- for (Enumeration enum = files.elements();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration elements = files.elements();
+ elements.hasMoreElements(); /* no increment portion */ )
{
String file = null;
try
{
- file = (String)enum.nextElement();
+ file = (String)elements.nextElement();
}
catch (ClassCastException cce)
{
1.16 +4 -4
xml-xalan/test/java/src/org/apache/qetest/xsl/XHTFileCheckService.java
Index: XHTFileCheckService.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XHTFileCheckService.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XHTFileCheckService.java 31 Jan 2003 15:47:22 -0000 1.15
+++ XHTFileCheckService.java 6 Nov 2003 14:48:09 -0000 1.16
@@ -420,10 +420,10 @@
public void applyAttributes(Properties attrs)
{
attributes = null;
- for (Enumeration enum = attrs.propertyNames();
- enum.hasMoreElements(); /* no increment portion */ )
+ for (Enumeration names = attrs.propertyNames();
+ names.hasMoreElements(); /* no increment portion */ )
{
- String key = (String)enum.nextElement();
+ String key = (String)names.nextElement();
if (key.startsWith(URN_XHTFILECHECKSERVICE))
{
setAttribute(key, attrs.getProperty(key));
1.9 +8 -8
xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestAntTask.java
Index: XSLTestAntTask.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestAntTask.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSLTestAntTask.java 2 Apr 2003 16:15:07 -0000 1.8
+++ XSLTestAntTask.java 6 Nov 2003 14:48:09 -0000 1.9
@@ -348,11 +348,11 @@
Properties passThru = new Properties();
// Passthru any of the default prefixed properties..
- for (Enumeration enum = antProps.keys();
- enum.hasMoreElements();
+ for (Enumeration keys = antProps.keys();
+ keys.hasMoreElements();
/* no increment portion */ )
{
- String key = enum.nextElement().toString();
+ String key = keys.nextElement().toString();
if (key.startsWith(ANT_PASSTHRU_PREFIX))
{
// Move any of these properties into the test;
@@ -362,11 +362,11 @@
}
//.. Then also passthru any alternate prefix properties
// this ensures alternate prefixes will overwrite default ones
- for (Enumeration enum = antProps.keys();
- enum.hasMoreElements();
+ for (Enumeration keys = antProps.keys();
+ keys.hasMoreElements();
/* no increment portion */ )
{
- String key = enum.nextElement().toString();
+ String key = keys.nextElement().toString();
if (key.startsWith(altPrefix))
{
// Also move alternate prefixed properties too
1.5 +4 -4
xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TransformWrapperHelper.java
Index: TransformWrapperHelper.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TransformWrapperHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TransformWrapperHelper.java 27 Jan 2003 18:33:07 -0000 1.4
+++ TransformWrapperHelper.java 6 Nov 2003 14:48:09 -0000 1.5
@@ -294,13 +294,13 @@
if (null == m_params)
return;
- for (Enumeration enum = m_params.keys();
- enum.hasMoreElements();
+ for (Enumeration keys = m_params.keys();
+ keys.hasMoreElements();
/* no increment portion */ )
{
String namespace = null;
String name = null;
- String key = enum.nextElement().toString();
+ String key = keys.nextElement().toString();
//@todo compare with TransformerImpl.setParameter's use of a
StringTokenizer(..., "{}"...
// Decode the namespace, if present
if (key.startsWith("{"))
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
