svn commit: r729250 - /commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterPatternStackTest.java

[ra...@apache.org]

Author: rahul
Date: Tue Dec 23 22:33:52 2008
New Revision: 729250

URL: http://svn.apache.org/viewvc?rev=729250&view=rev
Log:
Make tests pass on all JDK 1.5 and 1.6 versions. In earlier (Sun) JDK 1.5 versions, this test class fails to compile with the following message:

  DigesterPatternStackTest.java:[54,22] incompatible types
  found   : org.apache.commons.digester.xmlrules.DigesterRuleParser.PatternStack<java.lang.String>
  required: org.apache.commons.digester.xmlrules.DigesterRuleParser.PatternStack<java.lang.String>

There seems to be issues with signatures of generic inner classes with non-generic (or otherwise as well, perhaps) outers. For more, see SDN bugs 6343995 and 6356636:
  http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6343995
  http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6356636

Modified:
    commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterPatternStackTest.java

Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterPatternStackTest.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterPatternStackTest.java?rev=729250&r1=729249&r2=729250&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterPatternStackTest.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterPatternStackTest.java Tue Dec 23 22:33:52 2008
@@ -47,70 +47,69 @@
         return suite;
     }
 
-    private DigesterRuleParser.PatternStack<String> stack;
+    private DigesterRuleParser parser;
 
     public void setUp() {
-        DigesterRuleParser parser = new DigesterRuleParser();
-        stack = parser.patternStack;
+        parser = new DigesterRuleParser();
     }
 
     public void test1() throws Exception {
-        assertEquals("", stack.toString());
+        assertEquals("", parser.patternStack.toString());
     }
 
     public void test2() throws Exception {
-        stack.push("A");
-        assertEquals("A", stack.toString());
-        stack.pop();
-        assertEquals("", stack.toString());
+        parser.patternStack.push("A");
+        assertEquals("A", parser.patternStack.toString());
+        parser.patternStack.pop();
+        assertEquals("", parser.patternStack.toString());
     }
 
     public void test3() throws Exception {
-        stack.push("A");
-        stack.push("B");
-        assertEquals("A/B", stack.toString());
+        parser.patternStack.push("A");
+        parser.patternStack.push("B");
+        assertEquals("A/B", parser.patternStack.toString());
 
-        stack.pop();
-        assertEquals("A", stack.toString());
+        parser.patternStack.pop();
+        assertEquals("A", parser.patternStack.toString());
     }
 
     public void test4() throws Exception {
-        stack.push("");
-        assertEquals("", stack.toString());
+        parser.patternStack.push("");
+        assertEquals("", parser.patternStack.toString());
 
-        stack.push("");
-        assertEquals("", stack.toString());
+        parser.patternStack.push("");
+        assertEquals("", parser.patternStack.toString());
     }
 
     public void test5() throws Exception {
-        stack.push("A");
-        assertEquals("A", stack.toString());
+        parser.patternStack.push("A");
+        assertEquals("A", parser.patternStack.toString());
 
-        stack.push("");
-        stack.push("");
-        assertEquals("A", stack.toString());
+        parser.patternStack.push("");
+        parser.patternStack.push("");
+        assertEquals("A", parser.patternStack.toString());
 
     }
 
     public void test6() throws Exception {
-        stack.push("A");
-        stack.push("B");
-        stack.clear();
-        assertEquals("", stack.toString());
+        parser.patternStack.push("A");
+        parser.patternStack.push("B");
+        parser.patternStack.clear();
+        assertEquals("", parser.patternStack.toString());
     }
 
     public void test7() throws Exception {
-        stack.push("///");
-        assertEquals("///", stack.toString());
+        parser.patternStack.push("///");
+        assertEquals("///", parser.patternStack.toString());
 
-        stack.push("/");
-        assertEquals("/////", stack.toString());
+        parser.patternStack.push("/");
+        assertEquals("/////", parser.patternStack.toString());
 
-        stack.pop();
-        assertEquals("///", stack.toString());
+        parser.patternStack.pop();
+        assertEquals("///", parser.patternStack.toString());
 
-        stack.pop();
-        assertEquals("", stack.toString());
+        parser.patternStack.pop();
+        assertEquals("", parser.patternStack.toString());
     }
 
 }