dion        02/05/15 18:48:49

  Modified:    src/test/org/apache/maven/j2ee WarValidatorTest.java
  Log:
  Added dummy-servlet jar tests
  
  Revision  Changes    Path
  1.11      +26 -5     
jakarta-turbine-maven/src/test/org/apache/maven/j2ee/WarValidatorTest.java
  
  Index: WarValidatorTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/j2ee/WarValidatorTest.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- WarValidatorTest.java     15 May 2002 07:18:19 -0000      1.10
  +++ WarValidatorTest.java     16 May 2002 01:48:49 -0000      1.11
  @@ -61,19 +61,21 @@
    * Unit test for <code>WarValidator</code>.
    * 
    * @author <a href="mailto:[EMAIL PROTECTED]";>dIon Gillard</a>
  - * @version $Id: WarValidatorTest.java,v 1.10 2002/05/15 07:18:19 dion Exp $
  + * @version $Id: WarValidatorTest.java,v 1.11 2002/05/16 01:48:49 dion Exp $
    */
   public class WarValidatorTest extends TestCase
   {
       
  -    /** the validator used in testing */
  +    /** the validator being tested */
       private WarValidator validator = null;
  -    /** file name for the empty war used during testing */
  +    /** file name for the empty war*/
       private String emptyWarFile = null;
  -    /** file name for manifest-only war used during testing */
  +    /** file name for manifest-only war */
       private String manifestOnlyWarFile = null;
  -    /** file name for simple war (manifest & web.xml) used during testing */
  +    /** file name for simple war (manifest & web.xml)*/
       private String simpleWarFile = null;
  +    /** file name for dummy war */
  +    private String dummyWarFile = null;
   
       
       /** 
  @@ -100,6 +102,7 @@
           emptyWarFile = baseDir + fs + "src/test-j2ee/empty.war";
           manifestOnlyWarFile = baseDir + fs + "src/test-j2ee/manifest-only.war";
           simpleWarFile = baseDir + fs + "src/test-j2ee/simple.war";
  +        dummyWarFile = baseDir + fs + "src/test-j2ee/dummy-servlet.war";
       }
       
       /** 
  @@ -190,6 +193,24 @@
               !validator.getStatus().isWarning());
           assertTrue("Simple war file has generated an error", 
               !validator.getStatus().isError());
  +    }
  +
  +    /** 
  +     * test that a dummy war file produces no warning and an error
  +     * (as there is an intentionally bad class (java.servlet.Servlet) in
  +     * web.xml)
  +     * @throws Exception when there is an unexpected problem
  +     */
  +    public void testDummyWar() throws Exception
  +    {
  +        validator.setWarFileName(dummyWarFile);
  +        validator.addFormatter(new ValidationFormatter());
  +        validator.setFailOnError(false);
  +        validator.execute();
  +        assertTrue("Dummy war file has generated a warning", 
  +            !validator.getStatus().isWarning());
  +        assertTrue("Dummy war file has not generated an error", 
  +            validator.getStatus().isError());
       }
   
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to