geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: incubator-geronimo/modules/j2ee-schema project.properties
Date Mon, 06 Sep 2004 02:16:21 GMT
dain        2004/09/05 19:16:21

  Modified:    modules/j2ee-schema/src/test/org/apache/geronimo/schema
                        SchemaConversionUtilsTest.java
               modules/j2ee-schema project.properties
  Log:
  The j2ee-schema module tests no longer need forking
  
  Revision  Changes    Path
  1.2       +18 -17    incubator-geronimo/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
  
  Index: SchemaConversionUtilsTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SchemaConversionUtilsTest.java	2 Sep 2004 06:25:08 -0000	1.1
  +++ SchemaConversionUtilsTest.java	6 Sep 2004 02:16:21 -0000	1.2
  @@ -32,6 +32,7 @@
    * @version $Revision$ $Date$
    */
   public class SchemaConversionUtilsTest extends TestCase {
  +    private static final File basedir = new File(System.getProperty("basedir", System.getProperty("user.dir")));
   
   //comment on validity of j2ee 1.4 schemas: validation doesn't work...
   //        From: "Radu Preotiuc-Pietro" <radup@bea.com>
  @@ -53,8 +54,8 @@
       //I've taken option (1) and fixed the schemas
   
       public void testApplication13ToApplication14Transform() throws Exception {
  -        File srcXml = new File("src/test-data/j2ee_1_3dtd/application-13.xml");
  -        File expectedOutputXml = new File("src/test-data/j2ee_1_3dtd/application-14.xml");
  +        File srcXml = new File(basedir, "src/test-data/j2ee_1_3dtd/application-13.xml");
  +        File expectedOutputXml = new File(basedir, "src/test-data/j2ee_1_3dtd/application-14.xml");
           XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
           XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
           SchemaConversionUtils.validateDD(expected);
  @@ -82,8 +83,8 @@
       }
   
       public void testEJB20ToEJB21Transform() throws Exception {
  -        File srcXml = new File("src/test-data/j2ee_1_3dtd/ejb-jar.xml");
  -        File expectedOutputXml = new File("src/test-data/j2ee_1_3dtd/ejb-jar-21.xml");
  +        File srcXml = new File(basedir, "src/test-data/j2ee_1_3dtd/ejb-jar.xml");
  +        File expectedOutputXml = new File(basedir, "src/test-data/j2ee_1_3dtd/ejb-jar-21.xml");
           XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
           XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
           SchemaConversionUtils.validateDD(expected);
  @@ -111,8 +112,8 @@
       }
   
       public void testMDB20To21Transform() throws Exception {
  -        File srcXml = new File("src/test-data/j2ee_1_3dtd/mdb-ejb-jar-20.xml");
  -        File expectedOutputXml = new File("src/test-data/j2ee_1_3dtd/mdb-ejb-jar-21.xml");
  +        File srcXml = new File(basedir, "src/test-data/j2ee_1_3dtd/mdb-ejb-jar-20.xml");
  +        File expectedOutputXml = new File(basedir, "src/test-data/j2ee_1_3dtd/mdb-ejb-jar-21.xml");
           XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
           XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
           SchemaConversionUtils.validateDD(expected);
  @@ -140,8 +141,8 @@
       }
   
       public void testOrderDescriptionGroup() throws Exception {
  -        File srcXml = new File("src/test-data/j2ee_1_3dtd/DescriptionGroupTestSource.xml");
  -        File expectedOutputXml = new File("src/test-data/j2ee_1_3dtd/DescriptionGroupTestExpected.xml");
  +        File srcXml = new File(basedir, "src/test-data/j2ee_1_3dtd/DescriptionGroupTestSource.xml");
  +        File expectedOutputXml = new File(basedir, "src/test-data/j2ee_1_3dtd/DescriptionGroupTestExpected.xml");
           XmlObject srcObject = XmlObject.Factory.parse(srcXml);
           XmlCursor srcCursor = srcObject.newCursor();
           XmlCursor moveable = srcObject.newCursor();
  @@ -166,8 +167,8 @@
       }
   
       public void testOrderJNDIEnvironmentRefsGroup() throws Exception {
  -        File srcXml = new File("src/test-data/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestSource.xml");
  -        File expectedOutputXml = new File("src/test-data/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestExpected.xml");
  +        File srcXml = new File(basedir, "src/test-data/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestSource.xml");
  +        File expectedOutputXml = new File(basedir, "src/test-data/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestExpected.xml");
           XmlObject srcObject = XmlObject.Factory.parse(srcXml);
           XmlCursor srcCursor = srcObject.newCursor();
           XmlCursor moveable = srcObject.newCursor();
  @@ -195,8 +196,8 @@
       }
   
       public void testWeb23To24Transform() throws Exception {
  -        File srcXml = new File("src/test-data/j2ee_1_3dtd/web-23.xml");
  -        File expectedOutputXml = new File("src/test-data/j2ee_1_3dtd/web-24.xml");
  +        File srcXml = new File(basedir, "src/test-data/j2ee_1_3dtd/web-23.xml");
  +        File expectedOutputXml = new File(basedir, "src/test-data/j2ee_1_3dtd/web-24.xml");
           XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
           xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
           XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
  @@ -209,8 +210,8 @@
       }
   
       public void testWeb23To24OtherTransform() throws Exception {
  -        File srcXml = new File("src/test-data/j2ee_1_3dtd/web-1-23.xml");
  -        File expectedOutputXml = new File("src/test-data/j2ee_1_3dtd/web-1-24.xml");
  +        File srcXml = new File(basedir, "src/test-data/j2ee_1_3dtd/web-1-23.xml");
  +        File expectedOutputXml = new File(basedir, "src/test-data/j2ee_1_3dtd/web-1-24.xml");
           XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
           xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
   //        System.out.println(xmlObject.toString());
  @@ -224,8 +225,8 @@
       }
   
       public void testEJB21To21DoesNothing() throws Exception {
  -        File srcXml = new File("src/test-data/j2ee_1_4schema/ejb-jar.xml");
  -        File expectedOutputXml = new File("src/test-data/j2ee_1_4schema/ejb-jar.xml");
  +        File srcXml = new File(basedir, "src/test-data/j2ee_1_4schema/ejb-jar.xml");
  +        File expectedOutputXml = new File(basedir, "src/test-data/j2ee_1_4schema/ejb-jar.xml");
           XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
           xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
           XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
  
  
  
  1.3       +1 -2      incubator-geronimo/modules/j2ee-schema/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/j2ee-schema/project.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.properties	5 Sep 2004 06:09:11 -0000	1.2
  +++ project.properties	6 Sep 2004 02:16:21 -0000	1.3
  @@ -4,4 +4,3 @@
   
   # Include the generated xmlbean classes in the eclipse classpath
   maven.eclipse.classpath.include=target/xmlbeans
  -maven.junit.fork=true
  
  
  

Mime
View raw message