commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ebo...@apache.org
Subject svn commit: r652845 [4/4] - in /commons/proper/jxpath/trunk: ./ src/java/org/apache/commons/jxpath/ src/java/org/apache/commons/jxpath/functions/ src/java/org/apache/commons/jxpath/ri/ src/java/org/apache/commons/jxpath/ri/axes/ src/java/org/apache/com...
Date Fri, 02 May 2008 17:46:50 GMT
Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/XMLParser2.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/XMLParser2.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/XMLParser2.java (original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/xml/XMLParser2.java Fri May  2 10:46:46 2008
@@ -20,7 +20,7 @@
 
 /**
  * The abstract superclass of XML parsers that produce DOM Documents.
- * The features have the same defaults as DocumentBuilderFactory.
+ * The features have the same defaults as {@link javax.xml.parsers.DocumentBuilderFactory}.
  *
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
@@ -36,7 +36,7 @@
     /**
      * Set whether the underlying parser should be validating.
      * @param validating flag
-     * @see DocumentBuilderFactory#setValidating(boolean)
+     * @see javax.xml.parsers.DocumentBuilderFactory#setValidating(boolean)
      */
     public void setValidating(boolean validating) {
         this.validating = validating;
@@ -45,7 +45,7 @@
     /**
      * Learn whether the underlying parser is validating.
      * @return boolean
-     * @see DocumentBuilderFactory#isValidating()
+     * @see javax.xml.parsers.DocumentBuilderFactory#isValidating()
      */
     public boolean isValidating() {
         return validating;
@@ -54,7 +54,7 @@
     /**
      * Learn whether the underlying parser is ns-aware.
      * @return boolean
-     * @see DocumentBuilderFactory#isNamespaceAware()
+     * @see javax.xml.parsers.DocumentBuilderFactory#isNamespaceAware()
      */
     public boolean isNamespaceAware() {
         return namespaceAware;
@@ -63,7 +63,7 @@
     /**
      * Set whether the underlying parser is ns-aware.
      * @param namespaceAware flag
-     * @see DocumentBuilderFactory#setNamespaceAware(boolean)
+     * @see javax.xml.parsers.DocumentBuilderFactory#setNamespaceAware(boolean)
      */
     public void setNamespaceAware(boolean namespaceAware) {
         this.namespaceAware = namespaceAware;
@@ -72,7 +72,7 @@
     /**
      * Set whether the underlying parser is ignoring whitespace.
      * @param whitespace flag
-     * @see DocumentBuilderFactory#setIgnoringElementContentWhitespace(boolean)
+     * @see javax.xml.parsers.DocumentBuilderFactory#setIgnoringElementContentWhitespace(boolean)
      */
     public void setIgnoringElementContentWhitespace(boolean whitespace) {
         this.whitespace = whitespace;
@@ -81,7 +81,7 @@
     /**
      * Learn whether the underlying parser is ignoring whitespace.
      * @return boolean
-     * @see DocumentBuilderFactory#isIgnoringElementContentWhitespace()
+     * @see javax.xml.parsers.DocumentBuilderFactory#isIgnoringElementContentWhitespace()
      */
     public boolean isIgnoringElementContentWhitespace() {
         return whitespace;
@@ -90,7 +90,7 @@
     /**
      * Learn whether the underlying parser expands entity references.
      * @return boolean
-     * @see DocumentBuilderFactory#isExpandEntityReferences()
+     * @see javax.xml.parsers.DocumentBuilderFactory#isExpandEntityReferences()
      */
     public boolean isExpandEntityReferences() {
         return expandEntityRef;
@@ -99,7 +99,7 @@
     /**
      * Set whether the underlying parser expands entity references.
      * @param expandEntityRef flag
-     * @see DocumentBuilderFactory#setExpandEntityReferences(boolean)
+     * @see javax.xml.parsers.DocumentBuilderFactory#setExpandEntityReferences(boolean)
      */
     public void setExpandEntityReferences(boolean expandEntityRef) {
         this.expandEntityRef = expandEntityRef;
@@ -108,7 +108,7 @@
     /**
      * Learn whether the underlying parser ignores comments.
      * @return boolean
-     * @see DocumentBuilderFactory#isIgnoringComments()
+     * @see javax.xml.parsers.DocumentBuilderFactory#isIgnoringComments()
      */
     public boolean isIgnoringComments() {
         return ignoreComments;
@@ -117,7 +117,7 @@
     /**
      * Set whether the underlying parser ignores comments.
      * @param ignoreComments flag
-     * @see DocumentBuilderFactory#setIgnoringComments(boolean)
+     * @see javax.xml.parsers.DocumentBuilderFactory#setIgnoringComments(boolean)
      */
     public void setIgnoringComments(boolean ignoreComments) {
         this.ignoreComments = ignoreComments;
@@ -126,7 +126,7 @@
     /**
      * Learn whether the underlying parser is coalescing.
      * @return boolean
-     * @see DocumentBuilderFactory#isCoalescing()
+     * @see javax.xml.parsers.DocumentBuilderFactory#isCoalescing()
      */
     public boolean isCoalescing() {
         return coalescing;
@@ -135,14 +135,11 @@
     /**
      * Set whether the underlying parser is coalescing.
      * @param coalescing flag
-     * @see DocumentBuilderFactory#setCoalescing(boolean)
+     * @see javax.xml.parsers.DocumentBuilderFactory#setCoalescing(boolean)
      */
     public void setCoalescing(boolean coalescing) {
         this.coalescing = coalescing;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public abstract Object parseXML(InputStream stream);
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/BasicNodeSetTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/BasicNodeSetTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/BasicNodeSetTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/BasicNodeSetTest.java Fri May  2 10:46:46 2008
@@ -36,18 +36,6 @@
     /** BasicNodeSet */
     protected BasicNodeSet nodeSet;
 
-    /**
-     * Create a new BasicNodeSetTest.
-     * 
-     * @param name testcase name
-     */
-    public BasicNodeSetTest(String name) {
-        super(name);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     protected void setUp() throws Exception {
         super.setUp();
         context = JXPathContext.newContext(new TestMixedModelBean());

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/JXPathTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/JXPathTestCase.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/JXPathTestCase.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/JXPathTestCase.java Fri May  2 10:46:46 2008
@@ -35,15 +35,12 @@
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
  */
-
 public abstract class JXPathTestCase extends TestCase {
+
     /**
      * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
      */
-    public JXPathTestCase(String name) {
-        super(name);
+    public JXPathTestCase() {
         Locale.setDefault(Locale.US);
     }
     

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/JXPathCompiledExpressionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/JXPathCompiledExpressionTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/JXPathCompiledExpressionTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/JXPathCompiledExpressionTest.java Fri May  2 10:46:46 2008
@@ -49,15 +49,6 @@
  */
 
 public class JXPathCompiledExpressionTest extends JXPathTestCase {
-    
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public JXPathCompiledExpressionTest(String name) {
-        super(name);
-    }
 
     public void testConstant() {
         assertXPathExpression("1", Constant.class);
@@ -102,179 +93,78 @@
     }
     
     public void testCoreOperationAnd() {
-        assertXPathExpression(
-            "2 and 4",
-            CoreOperationAnd.class);
-
-        assertXPathExpression(
-            "2 > 1 and 4 < 5",
-            CoreOperationAnd.class);            
+        assertXPathExpression("2 and 4", CoreOperationAnd.class);
+        assertXPathExpression("2 > 1 and 4 < 5", CoreOperationAnd.class);
     }
         
     public void testCoreOperationOr() {
-        assertXPathExpression(
-            "2 or 4",
-            CoreOperationOr.class);
-
-        assertXPathExpression(
-            "2 > 1 or 4 < 5",
-            CoreOperationOr.class);
-
-        assertXPathExpression(
-            "1 > 1 and 2 <= 2 or 3 = 4",
-            CoreOperationOr.class);
+        assertXPathExpression("2 or 4", CoreOperationOr.class);
+        assertXPathExpression("2 > 1 or 4 < 5", CoreOperationOr.class);
+        assertXPathExpression("1 > 1 and 2 <= 2 or 3 = 4", CoreOperationOr.class);
     }
 
     public void testCoreOperationEqual() {
-        assertXPathExpression(
-            "2 = 4",
-            CoreOperationEqual.class);
-
-        assertXPathExpression(
-            "2 + 1 = 3",
-            CoreOperationEqual.class);
+        assertXPathExpression("2 = 4", CoreOperationEqual.class);
+        assertXPathExpression("2 + 1 = 3", CoreOperationEqual.class);
     }
     
     public void testCoreOperationNameAttributeTest() {
-        assertXPathExpression(
-            "@name = 'bar'",
-            NameAttributeTest.class);
+        assertXPathExpression("@name = 'bar'", NameAttributeTest.class);
     }
 
     public void testCoreOperationNotEqual() {
-        assertXPathExpression(
-            "2 != 4",
-            CoreOperationNotEqual.class);
-
-        assertXPathExpression(
-            "2 + 1 != 3",
-            CoreOperationNotEqual.class);
+        assertXPathExpression("2 != 4", CoreOperationNotEqual.class);
+        assertXPathExpression("2 + 1 != 3", CoreOperationNotEqual.class);
     }
 
     public void testCoreOperationLessThan() {
-        assertXPathExpression(
-            "3<4",
-            CoreOperationLessThan.class,
-            "3 < 4");
-
-        assertXPathExpression(
-            "3<(2>=1)",
-            CoreOperationLessThan.class,
-            "3 < (2 >= 1)");
+        assertXPathExpression("3<4", CoreOperationLessThan.class, "3 < 4");
+        assertXPathExpression("3<(2>=1)", CoreOperationLessThan.class, "3 < (2 >= 1)");
     }
     
     public void testCoreOperationLessThanOrEqual() {
-        assertXPathExpression(
-            "3<=4",
-            CoreOperationLessThanOrEqual.class,
-            "3 <= 4");
-
-        assertXPathExpression(
-            "3<=(2>=1)",
-            CoreOperationLessThanOrEqual.class,
-            "3 <= (2 >= 1)");
+        assertXPathExpression("3<=4", CoreOperationLessThanOrEqual.class, "3 <= 4");
+        assertXPathExpression("3<=(2>=1)", CoreOperationLessThanOrEqual.class, "3 <= (2 >= 1)");
     }
 
     public void testCoreOperationGreaterThan() {
-        assertXPathExpression(
-            "3>4",
-            CoreOperationGreaterThan.class,
-            "3 > 4");
-
-        assertXPathExpression(
-            "3>(2>=1)",
-            CoreOperationGreaterThan.class,
-            "3 > (2 >= 1)");
-
-        assertXPathExpression(
-            "1 > (1 and 2 <= (2 or 3) = 4)",
-            CoreOperationGreaterThan.class);
+        assertXPathExpression("3>4", CoreOperationGreaterThan.class, "3 > 4");
+        assertXPathExpression("3>(2>=1)", CoreOperationGreaterThan.class, "3 > (2 >= 1)");
+        assertXPathExpression("1 > (1 and 2 <= (2 or 3) = 4)", CoreOperationGreaterThan.class);
     }
     
     public void testCoreOperationGreaterThanOrEqual() {
-        assertXPathExpression(
-            "3>=4",
-            CoreOperationGreaterThanOrEqual.class,
-            "3 >= 4");
-
-        assertXPathExpression(
-            "3>=(2>=1)",
-            CoreOperationGreaterThanOrEqual.class,
-            "3 >= (2 >= 1)");
+        assertXPathExpression("3>=4", CoreOperationGreaterThanOrEqual.class, "3 >= 4");
+        assertXPathExpression("3>=(2>=1)", CoreOperationGreaterThanOrEqual.class, "3 >= (2 >= 1)");
     }
 
     public void testCoreOperationDivide() {
-        assertXPathExpression(
-            "2 div 4",
-            CoreOperationDivide.class);
-
-        assertXPathExpression(
-            "2|3 div -3",
-            CoreOperationDivide.class,
-            "2 | 3 div -3");
+        assertXPathExpression("2 div 4", CoreOperationDivide.class);
+        assertXPathExpression("2|3 div -3", CoreOperationDivide.class, "2 | 3 div -3");
     }
 
     public void testCoreOperationMod() {
-        assertXPathExpression(
-            "2 mod 4",
-            CoreOperationMod.class);
-
-        assertXPathExpression(
-            "2|3 mod -3",
-            CoreOperationMod.class,
-            "2 | 3 mod -3");
+        assertXPathExpression("2 mod 4", CoreOperationMod.class);
+        assertXPathExpression("2|3 mod -3", CoreOperationMod.class, "2 | 3 mod -3");
     }
 
     public void testCoreOperationMultiply() {
-        assertXPathExpression(
-            "2*4",
-            CoreOperationMultiply.class,
-            "2 * 4");
-            
-        assertXPathExpression(
-            "2*(3 + 1)",
-            CoreOperationMultiply.class,
-            "2 * (3 + 1)");
+        assertXPathExpression("2*4", CoreOperationMultiply.class, "2 * 4");
+        assertXPathExpression("2*(3 + 1)", CoreOperationMultiply.class, "2 * (3 + 1)");
     }
     
     public void testCoreOperationMinus() {
-        assertXPathExpression(
-            "1 - 1",
-            CoreOperationSubtract.class);
-            
-        assertXPathExpression(
-            "1 - 1 - 2",
-            CoreOperationSubtract.class);
-            
-        assertXPathExpression(
-            "1 - (1 - 2)",
-            CoreOperationSubtract.class);
+        assertXPathExpression("1 - 1", CoreOperationSubtract.class);
+        assertXPathExpression("1 - 1 - 2", CoreOperationSubtract.class);
+        assertXPathExpression("1 - (1 - 2)", CoreOperationSubtract.class);
     }
     
     public void testCoreOperationSum() {
-        assertXPathExpression(
-            "3 + 1 + 4", 
-            CoreOperationAdd.class);
-            
-        assertXPathExpression(
-            "(3 + 1) + 4",
-            CoreOperationAdd.class,
-            "3 + 1 + 4");
-            
-        assertXPathExpression(
-            "3 + (1 + 4)",
-            CoreOperationAdd.class,
-            "3 + 1 + 4");
-            
-        assertXPathExpression(
-            "3 + -1", 
-            CoreOperationAdd.class, 
-            "3 + -1");
-            
-        assertXPathExpression(
-            "2*-3 + -1",
-            CoreOperationAdd.class,
-            "2 * -3 + -1");
+        assertXPathExpression("3 + 1 + 4", CoreOperationAdd.class);
+        assertXPathExpression("(3 + 1) + 4", CoreOperationAdd.class, "3 + 1 + 4");
+        assertXPathExpression("3 + (1 + 4)", CoreOperationAdd.class, "3 + 1 + 4");
+        assertXPathExpression("3 + -1", CoreOperationAdd.class, "3 + -1");
+        assertXPathExpression("2*-3 + -1", CoreOperationAdd.class, "2 * -3 + -1");
     }
     
     public void testCoreOperationUnaryMinus() {
@@ -283,180 +173,77 @@
     }
 
     public void testCoreOperationUnion() {
-        assertXPathExpression(
-            "3 | 1 | 4",
-            CoreOperationUnion.class);
+        assertXPathExpression("3 | 1 | 4", CoreOperationUnion.class);
     }
     
     public void testExpressionPath() {
-        assertXPathExpression(
-            "$x/foo/bar",
-            ExpressionPath.class);        
-        assertXPathExpression(
-            "(2 + 2)/foo/bar",
-            ExpressionPath.class);        
-        assertXPathExpression(
-            "$x[3][2 + 2]/foo/bar",
-            ExpressionPath.class);        
+        assertXPathExpression("$x/foo/bar", ExpressionPath.class);
+        assertXPathExpression("(2 + 2)/foo/bar", ExpressionPath.class);
+        assertXPathExpression("$x[3][2 + 2]/foo/bar", ExpressionPath.class);
     }
     
     public void testExtensionFunction() {
-        assertXPathExpression(
-            "my:function(3, other.function())",
-            ExtensionFunction.class);        
+        assertXPathExpression("my:function(3, other.function())", ExtensionFunction.class);
     }
  
     public void testLocationPathAxisSelf() {
-        assertXPathExpression(
-            "self::foo:bar",
-            LocationPath.class);
-                 
-        assertXPathExpression(
-            ".",
-            LocationPath.class);     
+        assertXPathExpression("self::foo:bar", LocationPath.class);
+        assertXPathExpression(".", LocationPath.class);
     }
     
     public void testLocationPathAxisChild() {
-        assertXPathExpression(
-            "child::foo:bar",
-            LocationPath.class,
-            "foo:bar");
-                 
-        assertXPathExpression(
-            "foo:bar",
-            LocationPath.class);
-                 
-        assertXPathExpression(
-            "/foo:bar",
-            LocationPath.class);
-                 
-        assertXPathExpression(
-            "/foo/bar",
-            LocationPath.class);     
-
-        assertXPathExpression(
-            "*",
-            LocationPath.class);
-                 
-        assertXPathExpression(
-            "foo:*",
-            LocationPath.class);
-                 
+        assertXPathExpression("child::foo:bar", LocationPath.class, "foo:bar");
+        assertXPathExpression("foo:bar", LocationPath.class);
+        assertXPathExpression("/foo:bar", LocationPath.class);
+        assertXPathExpression("/foo/bar", LocationPath.class);
+        assertXPathExpression("*", LocationPath.class);
+        assertXPathExpression("foo:*", LocationPath.class);
     }
     
     public void testLocationPathAxisParent() {
-        assertXPathExpression(
-            "parent::foo:bar",
-            LocationPath.class);
-                 
-        assertXPathExpression(
-            "..",
-            LocationPath.class);     
+        assertXPathExpression("parent::foo:bar", LocationPath.class);
+        assertXPathExpression("..", LocationPath.class);
     }
     
     public void testLocationPathAxisAttribute() {
-        assertXPathExpression(
-            "attribute::foo:bar",
-            LocationPath.class,
-            "@foo:bar");
-
-        assertXPathExpression(
-            "@foo:bar",
-            LocationPath.class);
-
-        assertXPathExpression(
-            "../@foo:bar",
-            LocationPath.class);
-
-        assertXPathExpression(
-            "@*",
-            LocationPath.class);
-
-        assertXPathExpression(
-            "@*[last()]",
-            LocationPath.class);
+        assertXPathExpression("attribute::foo:bar", LocationPath.class, "@foo:bar");
+        assertXPathExpression("@foo:bar", LocationPath.class);
+        assertXPathExpression("../@foo:bar", LocationPath.class);
+        assertXPathExpression("@*", LocationPath.class);
+        assertXPathExpression("@*[last()]", LocationPath.class);
     }
     
     public void testLocationPathAxisDescendant() {
-        assertXPathExpression(
-            "descendant::foo:bar",
-            LocationPath.class);
+        assertXPathExpression("descendant::foo:bar", LocationPath.class);
     }
     
     public void testLocationPathAxisDescendantOrSelf() {
-        assertXPathExpression(
-            "descendant-or-self::foo:bar",
-            LocationPath.class);
-
-        assertXPathExpression(
-            "//foo", 
-            LocationPath.class);
-
-        assertXPathExpression(
-            "foo//bar", 
-            LocationPath.class);
+        assertXPathExpression("descendant-or-self::foo:bar", LocationPath.class);
+        assertXPathExpression("//foo", LocationPath.class);
+        assertXPathExpression("foo//bar", LocationPath.class);
     }
     
     public void testLocationPathAxisOther() {
-        assertXPathExpression(
-            "ancestor::foo:bar",
-            LocationPath.class);
-            
-        assertXPathExpression(
-            "ancestor-or-self::foo:bar",
-            LocationPath.class);
-            
-        assertXPathExpression(
-            "namespace::foo:bar",
-            LocationPath.class);
-
-        assertXPathExpression(
-            "preceding::foo:bar",
-            LocationPath.class);
-
-        assertXPathExpression(
-            "preceding-sibling::foo:bar",
-            LocationPath.class);
-
-        assertXPathExpression(
-            "following::foo:bar",
-            LocationPath.class);
-
-        assertXPathExpression(
-            "following-sibling::foo:bar",
-            LocationPath.class);
+        assertXPathExpression("ancestor::foo:bar", LocationPath.class);
+        assertXPathExpression("ancestor-or-self::foo:bar", LocationPath.class);
+        assertXPathExpression("namespace::foo:bar", LocationPath.class);
+        assertXPathExpression("preceding::foo:bar", LocationPath.class);
+        assertXPathExpression("preceding-sibling::foo:bar", LocationPath.class);
+        assertXPathExpression("following::foo:bar", LocationPath.class);
+        assertXPathExpression("following-sibling::foo:bar", LocationPath.class);
     }
     
     public void testLocationPathNodeTest() {
-        assertXPathExpression(
-            "node()",
-            LocationPath.class);
-
-        assertXPathExpression(
-            "text()",
-            LocationPath.class);
-
-        assertXPathExpression(
-            "comment()",
-            LocationPath.class);
-
-        assertXPathExpression(
-            "processing-instruction()",
-            LocationPath.class);
-
-        assertXPathExpression(
-            "processing-instruction('test')",
-            LocationPath.class);
+        assertXPathExpression("node()", LocationPath.class);
+        assertXPathExpression("text()", LocationPath.class);
+        assertXPathExpression("comment()", LocationPath.class);
+        assertXPathExpression("processing-instruction()", LocationPath.class);
+        assertXPathExpression("processing-instruction('test')", LocationPath.class);
     }
     
     public void testVariableReference() {
-        assertXPathExpression(
-            "$x",
-            VariableReference.class);                
-
-        assertXPathExpression(
-            "$x:y",
-            VariableReference.class);
+        assertXPathExpression("$x", VariableReference.class);
+        assertXPathExpression("$x:y", VariableReference.class);
     }
     
     /**
@@ -464,30 +251,15 @@
      * class, converts the expression to string and checks that the string
      * matches the expected one.
      */
-    private void assertXPathExpression(
-        String xpath,
-        Class expectedClass,
-        String expected) 
-    {
-        JXPathCompiledExpression expression =
-            (JXPathCompiledExpression) JXPathContext.compile(xpath);
+    private void assertXPathExpression(String xpath, Class expectedClass, String expected) {
+        JXPathCompiledExpression expression = (JXPathCompiledExpression) JXPathContext.compile(xpath);
         
-        assertEquals(
-            "Expression class for " + xpath,
-            expectedClass,
-            expression.getExpression().getClass());
-            
-        assertEquals(
-            "Expression toString() for " + xpath,
-            expected,
-            expression.getExpression().toString());
+        assertEquals("Expression class for " + xpath, expectedClass, expression.getExpression().getClass());
+        assertEquals("Expression toString() for " + xpath, expected, expression.getExpression().toString());
     }
     
-    private void assertXPathExpression(
-        String xpath,
-        Class expectedClass) 
-    {
+    private void assertXPathExpression(String xpath, Class expectedClass) {
         assertXPathExpression(xpath, expectedClass, xpath);
     }
     
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/StressTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/StressTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/StressTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/StressTest.java Fri May  2 10:46:46 2008
@@ -26,7 +26,6 @@
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
  */
-
 public class StressTest extends TestCase {
     
     private static final int THREAD_COUNT = 50;
@@ -34,15 +33,6 @@
     private static JXPathContext context;
     private static int count;
     private static Throwable exception;
-        
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public StressTest(String name) {
-        super(name);
-    }
 
     public void testThreads() throws Throwable {
         context = JXPathContext.newContext(null, new Double(100));
@@ -89,4 +79,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/axes/RecursiveAxesTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/axes/RecursiveAxesTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/axes/RecursiveAxesTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/axes/RecursiveAxesTest.java Fri May  2 10:46:46 2008
@@ -28,14 +28,6 @@
     private RecursiveBean bean;
     private JXPathContext context;
 
-    public RecursiveAxesTest(String name) {
-        super(name);
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(RecursiveAxesTest.class);
-    }
-
     protected void setUp() throws Exception {
         bean = new RecursiveBean("zero");
         RecursiveBean bean1 = new RecursiveBean("one");
@@ -57,4 +49,3 @@
             "/first/first/second");
     }
 }
-

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/axes/SimplePathInterpreterTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/axes/SimplePathInterpreterTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/axes/SimplePathInterpreterTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/axes/SimplePathInterpreterTest.java Fri May  2 10:46:46 2008
@@ -42,20 +42,6 @@
     private TestBeanWithNode bean;
     private JXPathContext context;
 
-    /**
-     * Constructor for SimplePathInterpreterTest.
-     */
-    public SimplePathInterpreterTest(String name) {
-        super(name);
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(SimplePathInterpreterTest.class);
-    }
-
-    /**
-     * @see TestCase#setUp()
-     */
     protected void setUp() throws Exception {
         bean = TestBeanWithNode.createTestBeanWithDOM();
         HashMap submap = new HashMap();

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/ContextDependencyTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/ContextDependencyTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/ContextDependencyTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/ContextDependencyTest.java Fri May  2 10:46:46 2008
@@ -25,11 +25,7 @@
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
  */
-
 public class ContextDependencyTest extends JXPathTestCase {
-    public ContextDependencyTest(String name) {
-        super(name);
-    }
 
     public void testContextDependency() {
         testContextDependency("1", false);
@@ -45,12 +41,8 @@
     }
 
     public void testContextDependency(String xpath, boolean expected) {
-        Expression expr =
-            (Expression) Parser.parseExpression(xpath, new TreeCompiler());
+        Expression expr = (Expression) Parser.parseExpression(xpath, new TreeCompiler());
 
-        assertEquals(
-            "Context dependency <" + xpath + ">",
-            expected,
-            expr.isContextDependent());
+        assertEquals("Context dependency <" + xpath + ">", expected, expr.isContextDependent());
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/CoreFunctionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/CoreFunctionTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/CoreFunctionTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/CoreFunctionTest.java Fri May  2 10:46:46 2008
@@ -37,19 +37,9 @@
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
  */
-
 public class CoreFunctionTest extends JXPathTestCase {
     private JXPathContext context;
 
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public CoreFunctionTest(String name) {
-        super(name);
-    }
-
     public void setUp() {
         if (context == null) {
             context = JXPathContext.newContext(new TestMixedModelBean());

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/CoreOperationTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/CoreOperationTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/CoreOperationTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/CoreOperationTest.java Fri May  2 10:46:46 2008
@@ -27,19 +27,9 @@
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
  */
-
 public class CoreOperationTest extends JXPathTestCase {
     private JXPathContext context;
 
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public CoreOperationTest(String name) {
-        super(name);
-    }
-
     public void setUp() {
         if (context == null) {
             context = JXPathContext.newContext(null);

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/ExtensionFunctionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/ExtensionFunctionTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/ExtensionFunctionTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/ExtensionFunctionTest.java Fri May  2 10:46:46 2008
@@ -21,8 +21,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import junit.textui.TestRunner;
-
 import org.apache.commons.jxpath.ClassFunctions;
 import org.apache.commons.jxpath.ExpressionContext;
 import org.apache.commons.jxpath.Function;
@@ -46,26 +44,12 @@
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
  */
-
 public class ExtensionFunctionTest extends JXPathTestCase {
     private Functions functions;
     private JXPathContext context;
     private TestBean testBean;
     private TypeConverter typeConverter;
 
-    public static void main(String[] args) {
-        TestRunner.run(ExtensionFunctionTest.class);
-    }
-    
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public ExtensionFunctionTest(String name) {
-        super(name);
-    }
-
     public void setUp() {
         if (context == null) {
             testBean = new TestBean();

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/VariableTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/VariableTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/VariableTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/compiler/VariableTest.java Fri May  2 10:46:46 2008
@@ -28,19 +28,9 @@
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
  */
-
 public class VariableTest extends JXPathTestCase {
     private JXPathContext context;
 
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public VariableTest(String name) {
-        super(name);
-    }
-
     public void setUp() {
         if (context == null) {
             context = JXPathContext.newContext(new TestMixedModelBean());

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/BeanModelTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/BeanModelTestCase.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/BeanModelTestCase.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/BeanModelTestCase.java Fri May  2 10:46:46 2008
@@ -41,19 +41,9 @@
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
  */
-
 public abstract class BeanModelTestCase extends JXPathTestCase {
     private JXPathContext context;
 
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public BeanModelTestCase(String name) {
-        super(name);
-    }
-
     public void setUp() {
 //        if (context == null) {
             context = JXPathContext.newContext(createContextBean());

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/EmbeddedColonMapKeysTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/EmbeddedColonMapKeysTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/EmbeddedColonMapKeysTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/EmbeddedColonMapKeysTest.java Fri May  2 10:46:46 2008
@@ -30,11 +30,6 @@
 public class EmbeddedColonMapKeysTest extends JXPathTestCase {
     private JXPathContext context;
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see junit.framework.TestCase#setUp()
-     */
     protected void setUp() throws Exception {
         super.setUp();
         HashMap m = new HashMap();
@@ -43,13 +38,6 @@
         context.setLenient(true);
     }
 
-    /**
-     * Create a new EmbeddedColonMapKeysTest.
-     */
-    public EmbeddedColonMapKeysTest(String name) {
-        super(name);
-    }
-
     public void testSelectNodes() throws Exception {
         assertXPathValueIterator(context, "/.[@name='foo:key']", list("value"));
         assertXPathValueIterator(context, "/foo:key", list());

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/EmptyCollectionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/EmptyCollectionTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/EmptyCollectionTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/EmptyCollectionTest.java Fri May  2 10:46:46 2008
@@ -42,13 +42,6 @@
         }
     }
 
-    /**
-     * Construct a new EmptyCollectionTest instance.
-     */
-    public EmptyCollectionTest(String s) {
-        super(s);
-    }
-
     public void testEmptyList() {
         assertXPathPointerIterator(JXPathContext.newContext(Collections.EMPTY_LIST), "/*",
                 Collections.EMPTY_LIST);

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/ExternalXMLNamespaceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/ExternalXMLNamespaceTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/ExternalXMLNamespaceTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/ExternalXMLNamespaceTest.java Fri May  2 10:46:46 2008
@@ -29,15 +29,6 @@
 public class ExternalXMLNamespaceTest extends JXPathTestCase {
     protected JXPathContext context;
 
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public ExternalXMLNamespaceTest(String name) {
-        super(name);
-    }
-
     protected DocumentContainer createDocumentContainer(String model) {
         DocumentContainer result = new DocumentContainer(JXPathTestCase.class
                 .getResource("ExternalNS.xml"), model);
@@ -83,4 +74,4 @@
         doTestCreateAndSetAttribute(DocumentContainer.MODEL_DOM);
     }
 
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/MixedModelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/MixedModelTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/MixedModelTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/MixedModelTest.java Fri May  2 10:46:46 2008
@@ -25,10 +25,6 @@
 import java.util.Map;
 import java.util.Vector;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
 import org.apache.commons.jxpath.JXPathContext;
 import org.apache.commons.jxpath.JXPathTestCase;
 import org.apache.commons.jxpath.Pointer;
@@ -43,30 +39,9 @@
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
  */
-
 public class MixedModelTest extends JXPathTestCase {
     private JXPathContext context;
 
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public MixedModelTest(String name) {
-        super(name);
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(new MixedModelTest("testContainerWithCollection"));
-    }
-    
-    /**
-     * Return the tests included in this test suite.
-     */
-    public static Test suite() {
-        return (new TestSuite(MixedModelTest.class));
-    }
-
     public void setUp() {
         TestMixedModelBean bean = new TestMixedModelBean();
         context = JXPathContext.newContext(bean);

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java Fri May  2 10:46:46 2008
@@ -37,15 +37,6 @@
 public abstract class XMLModelTestCase extends JXPathTestCase {
     protected JXPathContext context;
 
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public XMLModelTestCase(String name) {
-        super(name);
-    }
-
     public void setUp() {
         if (context == null) {
             DocumentContainer docCtr = createDocumentContainer();
@@ -53,9 +44,7 @@
             Variables vars = context.getVariables();
             vars.declareVariable("document", docCtr.getValue());
             vars.declareVariable("container", docCtr);
-            vars.declareVariable(
-                "element",
-                context.getPointer("vendor/location/address/street").getNode());
+            vars.declareVariable("element", context.getPointer("vendor/location/address/street").getNode());
         }
     }
 

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLPreserveSpaceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLPreserveSpaceTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLPreserveSpaceTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLPreserveSpaceTest.java Fri May  2 10:46:46 2008
@@ -29,15 +29,6 @@
 public class XMLPreserveSpaceTest extends JXPathTestCase {
     protected JXPathContext context;
 
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public XMLPreserveSpaceTest(String name) {
-        super(name);
-    }
-
     protected DocumentContainer createDocumentContainer(String model) {
         return new DocumentContainer(JXPathTestCase.class
                 .getResource("XmlPreserveSpace.xml"), model);

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLSpaceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLSpaceTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLSpaceTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLSpaceTest.java Fri May  2 10:46:46 2008
@@ -29,15 +29,6 @@
 public class XMLSpaceTest extends JXPathTestCase {
     protected JXPathContext context;
 
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public XMLSpaceTest(String name) {
-        super(name);
-    }
-
     protected DocumentContainer createDocumentContainer(String model) {
         return new DocumentContainer(JXPathTestCase.class
                 .getResource("XmlSpace.xml"), model);

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/beans/BadlyImplementedFactoryTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/beans/BadlyImplementedFactoryTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/beans/BadlyImplementedFactoryTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/beans/BadlyImplementedFactoryTest.java Fri May  2 10:46:46 2008
@@ -37,15 +37,6 @@
 
     private JXPathContext context;
 
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public BadlyImplementedFactoryTest(String name) {
-        super(name);
-    }
-
     public void setUp() {
         context = JXPathContext.newContext(new HashMap());
         context.setFactory(new AbstractFactory() {

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/beans/BeanModelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/beans/BeanModelTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/beans/BeanModelTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/beans/BeanModelTest.java Fri May  2 10:46:46 2008
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.jxpath.ri.model.beans;
 
-import junit.framework.TestSuite;
-
 import org.apache.commons.jxpath.AbstractFactory;
 import org.apache.commons.jxpath.JXPathContext;
 import org.apache.commons.jxpath.TestBean;
@@ -29,23 +27,7 @@
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
  */
-
 public class BeanModelTest extends BeanModelTestCase {
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public BeanModelTest(String name) {
-        super(name);
-    }
-
-    /**
-     * Return the tests included in this test suite.
-     */
-    public static TestSuite suite() {
-        return (new TestSuite(BeanModelTest.class));
-    }
 
     protected Object createContextBean() {
         return new TestBean();

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/container/ContainerModelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/container/ContainerModelTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/container/ContainerModelTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/container/ContainerModelTest.java Fri May  2 10:46:46 2008
@@ -21,10 +21,6 @@
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
 import org.apache.commons.jxpath.Container;
 import org.apache.commons.jxpath.JXPathContext;
 import org.apache.commons.jxpath.JXPathTestCase;
@@ -38,27 +34,6 @@
 
 public class ContainerModelTest extends JXPathTestCase {
 
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public ContainerModelTest(String name) {
-        super(name);
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-    
-    /**
-     * Return the tests included in this test suite.
-     */
-    public static Test suite() {
-        return (new TestSuite(ContainerModelTest.class));
-    }
-
-    
     private class ArrayContainer implements Container
     {
         private String[] array = new String[]{"foo", "bar"};

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java Fri May  2 10:46:46 2008
@@ -16,12 +16,10 @@
  */
 package org.apache.commons.jxpath.ri.model.dom;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.jxpath.AbstractFactory;
 import org.apache.commons.jxpath.ri.model.XMLModelTestCase;
 import org.apache.commons.jxpath.xml.DocumentContainer;
+
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -36,22 +34,6 @@
  */
 
 public class DOMModelTest extends XMLModelTestCase {
-    
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public DOMModelTest(String name) {
-        super(name);
-    }
-
-    /**
-     * Return the tests included in this test suite.
-     */
-    public static Test suite() {
-        return (new TestSuite(DOMModelTest.class));
-    }
 
     protected String getModel() {
         return DocumentContainer.MODEL_DOM;

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanModelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanModelTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanModelTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanModelTest.java Fri May  2 10:46:46 2008
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.jxpath.ri.model.dynabeans;
 
-import junit.framework.TestSuite;
-
 import org.apache.commons.beanutils.WrapDynaBean;
 import org.apache.commons.jxpath.AbstractFactory;
 import org.apache.commons.jxpath.TestBean;
@@ -31,16 +29,6 @@
  */
 
 public class DynaBeanModelTest extends BeanModelTestCase {
-    public DynaBeanModelTest(String name) {
-        super(name);
-    }
-
-    public static TestSuite suite() {
-        return new TestSuite(DynaBeanModelTest.class);
-//        TestSuite s = new TestSuite();
-//        s.addTest(new DynaBeanModelTest("testAxisParent"));
-//        return s;
-    }
 
     protected Object createContextBean() {
         return new WrapDynaBean(new TestBean());
@@ -49,4 +37,4 @@
     protected AbstractFactory getAbstractFactory() {
         return new TestDynaBeanFactory();
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertiesModelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertiesModelTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertiesModelTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertiesModelTest.java Fri May  2 10:46:46 2008
@@ -35,15 +35,6 @@
 public class DynamicPropertiesModelTest extends JXPathTestCase {
     private JXPathContext context;
 
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public DynamicPropertiesModelTest(String name) {
-        super(name);
-    }
-
     public void setUp() {
         if (context == null) {
             context = JXPathContext.newContext(new TestBean());

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java Fri May  2 10:46:46 2008
@@ -18,12 +18,10 @@
 
 import java.util.List;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.jxpath.AbstractFactory;
 import org.apache.commons.jxpath.ri.model.XMLModelTestCase;
 import org.apache.commons.jxpath.xml.DocumentContainer;
+
 import org.jdom.Attribute;
 import org.jdom.CDATA;
 import org.jdom.Document;
@@ -36,23 +34,7 @@
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
  */
-
 public class JDOMModelTest extends XMLModelTestCase {
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public JDOMModelTest(String name) {
-        super(name);
-    }
-
-    /**
-     * Return the tests included in this test suite.
-     */
-    public static Test suite() {
-        return (new TestSuite(JDOMModelTest.class));
-    }
 
     protected String getModel() {
         return DocumentContainer.MODEL_JDOM;

Modified: commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/util/BasicTypeConverterTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/util/BasicTypeConverterTest.java?rev=652845&r1=652844&r2=652845&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/util/BasicTypeConverterTest.java (original)
+++ commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/util/BasicTypeConverterTest.java Fri May  2 10:46:46 2008
@@ -35,16 +35,7 @@
  * @author Dmitri Plotnikov
  * @version $Revision$ $Date$
  */
-
 public class BasicTypeConverterTest extends TestCase {
-    /**
-     * Construct a new instance of this test case.
-     *
-     * @param name Name of the test case
-     */
-    public BasicTypeConverterTest(String name) {
-        super(name);
-    }
 
     public void testPrimitiveToString() {
         assertConversion(new Integer(1), String.class, "1");



Mime
View raw message