tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject cvs commit: jakarta-tapestry/junit/src/org/apache/tapestry/junit BasicTestSuite.java TapestrySuite.java TapestryTestCase.java
Date Wed, 26 Mar 2003 19:50:40 GMT
hlship      2003/03/26 11:50:40

  Modified:    junit/src/org/apache/tapestry/junit TapestrySuite.java
                        TapestryTestCase.java
  Added:       junit/src/org/apache/tapestry/junit BasicTestSuite.java
  Log:
  Split Tapestry test suite into mock and non-mock (Basic).
  
  Revision  Changes    Path
  1.5       +4 -30     jakarta-tapestry/junit/src/org/apache/tapestry/junit/TapestrySuite.java
  
  Index: TapestrySuite.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/junit/src/org/apache/tapestry/junit/TapestrySuite.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TapestrySuite.java	15 Mar 2003 21:22:23 -0000	1.4
  +++ TapestrySuite.java	26 Mar 2003 19:50:40 -0000	1.5
  @@ -59,6 +59,7 @@
   import junit.framework.TestSuite;
   
   import org.apache.tapestry.junit.enhance.TestClassFabricator;
  +import org.apache.tapestry.junit.form.TestListEditMap;
   import org.apache.tapestry.junit.mock.MockTestCase;
   import org.apache.tapestry.junit.parse.TestLocation;
   import org.apache.tapestry.junit.parse.TestSpecificationParser;
  @@ -88,36 +89,9 @@
   {
       public static Test suite()
       {
  -        TestSuite suite = new TestSuite();
  +        TestSuite suite = new TestSuite("Master Tapestry Test Suite");
   
  -		suite.addTestSuite(TestTapestryFindLocation.class);
  -		suite.addTestSuite(TestStaticLink.class);
  -		suite.addTestSuite(TestEngineServiceLink.class);
  -        suite.addTestSuite(TestAdaptorRegistry.class);
  -        suite.addTestSuite(TestTapestryCoerceToIterator.class);
  -        suite.addTestSuite(TestPool.class);
  -        suite.addTestSuite(TestLocalizedNameGenerator.class);
  -        suite.addTestSuite(TestResourceLocation.class);
  -        suite.addTestSuite(TestPropertyFinder.class);
  -        suite.addTestSuite(TestListenerMap.class);
  -        suite.addTestSuite(TestIdAllocator.class);
  -        suite.addTestSuite(TestComponentStrings.class);
  -        suite.addTestSuite(TestTemplateParser.class);
  -        suite.addTestSuite(TestLocation.class);
  -        suite.addTestSuite(TestSpecificationParser.class);
  -        suite.addTestSuite(TestApplicationSpecification.class);
  -        suite.addTest(ValidSuite.suite());
  -        suite.addTestSuite(TestMultipart.class);
  -        suite.addTestSuite(TestEnum.class);
  -        suite.addTestSuite(TestDataSqueezer.class);
  -        suite.addTestSuite(TestScript.class);
  -        suite.addTestSuite(TestComponentSpecification.class);
  -        suite.addTestSuite(TestBindings.class);
  -        suite.addTestSuite(TestPropertySource.class);
  -        suite.addTestSuite(TestComponent.class);
  -        suite.addTestSuite(TestClassFabricator.class);
  -        suite.addTestSuite(TestTapestryGetClassName.class);
  -        suite.addTestSuite(TestRegexpMatcher.class);
  +		suite.addTest(BasicTestSuite.suite());	
           suite.addTest(MockTestCase.suite());
   
           return suite;
  
  
  
  1.3       +3 -3      jakarta-tapestry/junit/src/org/apache/tapestry/junit/TapestryTestCase.java
  
  Index: TapestryTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/junit/src/org/apache/tapestry/junit/TapestryTestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TapestryTestCase.java	15 Mar 2003 21:22:23 -0000	1.2
  +++ TapestryTestCase.java	26 Mar 2003 19:50:40 -0000	1.3
  @@ -163,12 +163,12 @@
           return parser.parseLibrarySpecification(location);
       }
   
  -    protected void checkList(String propertyName, String[] expected, String[] actual)
  +    protected void checkList(String propertyName, Object[] expected, Object[] actual)
       {
           checkList(propertyName, expected, Arrays.asList(actual));
       }
   
  -    protected void checkList(String propertyName, String[] expected, List actual)
  +    protected void checkList(String propertyName, Object[] expected, List actual)
       {
           int count = Tapestry.size(actual);
   
  
  
  
  1.1                  jakarta-tapestry/junit/src/org/apache/tapestry/junit/BasicTestSuite.java
  
  Index: BasicTestSuite.java
  ===================================================================
  package org.apache.tapestry.junit;
  
  import junit.framework.Test;
  import junit.framework.TestSuite;
  
  import org.apache.tapestry.junit.enhance.TestClassFabricator;
  import org.apache.tapestry.junit.form.TestListEditMap;
  import org.apache.tapestry.junit.parse.TestLocation;
  import org.apache.tapestry.junit.parse.TestSpecificationParser;
  import org.apache.tapestry.junit.parse.TestTemplateParser;
  import org.apache.tapestry.junit.script.TestScript;
  import org.apache.tapestry.junit.spec.TestApplicationSpecification;
  import org.apache.tapestry.junit.spec.TestComponentSpecification;
  import org.apache.tapestry.junit.utils.TestAdaptorRegistry;
  import org.apache.tapestry.junit.utils.TestDataSqueezer;
  import org.apache.tapestry.junit.utils.TestEnum;
  import org.apache.tapestry.junit.utils.TestIdAllocator;
  import org.apache.tapestry.junit.utils.TestLocalizedNameGenerator;
  import org.apache.tapestry.junit.utils.TestPool;
  import org.apache.tapestry.junit.utils.TestPropertyFinder;
  import org.apache.tapestry.junit.utils.TestRegexpMatcher;
  import org.apache.tapestry.junit.valid.ValidSuite;
  
  /**
   *  Used to isolate the non-mock tests from the mock Tapestry tests, since they run much
   *  faster.
   *
   *  @author Howard Lewis Ship
   *  @version $Id: BasicTestSuite.java,v 1.1 2003/03/26 19:50:40 hlship Exp $
   *  @since 2.4
   *
   **/
  
  public class BasicTestSuite extends TestSuite
  {
  
      public static Test suite()
      {
          TestSuite suite = new TestSuite("Basic Tapestry Test Suite");
  
          suite.addTestSuite(TestTapestryFindLocation.class);
          suite.addTestSuite(TestStaticLink.class);
          suite.addTestSuite(TestEngineServiceLink.class);
          suite.addTestSuite(TestAdaptorRegistry.class);
          suite.addTestSuite(TestTapestryCoerceToIterator.class);
          suite.addTestSuite(TestPool.class);
          suite.addTestSuite(TestLocalizedNameGenerator.class);
          suite.addTestSuite(TestResourceLocation.class);
          suite.addTestSuite(TestPropertyFinder.class);
          suite.addTestSuite(TestListenerMap.class);
          suite.addTestSuite(TestIdAllocator.class);
          suite.addTestSuite(TestComponentStrings.class);
          suite.addTestSuite(TestTemplateParser.class);
          suite.addTestSuite(TestLocation.class);
          suite.addTestSuite(TestSpecificationParser.class);
          suite.addTestSuite(TestApplicationSpecification.class);
          suite.addTest(ValidSuite.suite());
          suite.addTestSuite(TestMultipart.class);
          suite.addTestSuite(TestEnum.class);
          suite.addTestSuite(TestDataSqueezer.class);
          suite.addTestSuite(TestScript.class);
          suite.addTestSuite(TestComponentSpecification.class);
          suite.addTestSuite(TestBindings.class);
          suite.addTestSuite(TestPropertySource.class);
          suite.addTestSuite(TestComponent.class);
          suite.addTestSuite(TestClassFabricator.class);
          suite.addTestSuite(TestTapestryGetClassName.class);
          suite.addTestSuite(TestRegexpMatcher.class);
          suite.addTestSuite(TestListEditMap.class);
  
          return suite;
      }
  }
  
  
  

Mime
View raw message