Fixes #308869 (Update test suite to JUnit4 - Module jetty-xml).

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1597 7e9141cc-0065-0410-87d8-b60c137991c4

VERSION.txt

@@ -1,5 +1,6 @@
 jetty-7.1.0.RC1-SNAPSHOT
  + 308848 Update test suite to JUnit4 - Module jetty-ajp
+ + 308869 Update test suite to JUnit4 - Module jetty-xml
  
 jetty-7.1.0.RC0 27 April 2010
  + 294563 Websocket client connection

jetty-xml/pom.xml

@@ -73,6 +73,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit4-version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java

@@ -17,13 +17,14 @@ import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
-public class XmlConfigurationTest extends TestCase
+import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class XmlConfigurationTest
 {
-    public final static String __CRLF = "\015\012";
-    
-    /* ------------------------------------------------------------ */
+    @Test
     public static void testXmlParser() throws Exception
     {
         XmlParser parser = new XmlParser();
@@ -51,10 +52,9 @@ public class XmlConfigurationTest extends TestCase
 
         assertTrue(testDocStr.startsWith("<Configure"));
         assertTrue(testDocStr.endsWith("</Configure>"));
-        
     }
 
-    /* ------------------------------------------------------------ */
+    @Test
     public static void testXmlConfiguration() throws Exception
     {
         Map properties = new HashMap();
@@ -127,9 +127,5 @@ public class XmlConfigurationTest extends TestCase
         assertEquals("static to field",tc.testField1,77);
         assertEquals("field to field",tc.testField2,2);
         assertEquals("literal to static",TestConfiguration.VALUE,42);
-        
     }
-
-
-
 }