kevinoneill    2003/08/06 20:00:12

  Modified:    java/tests/src/org/apache/xindice UnitTests.java
  Log:
  Added main method so that the test suite can be run from within eclipse.
  
  Revision  Changes    Path
  1.14      +56 -53    
xml-xindice/java/tests/src/org/apache/xindice/UnitTests.java
  
  Index: UnitTests.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/UnitTests.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- UnitTests.java    27 Jun 2003 13:25:06 -0000      1.13
  +++ UnitTests.java    7 Aug 2003 03:00:12 -0000       1.14
  @@ -63,6 +63,7 @@
   
   import junit.framework.Test;
   import junit.framework.TestSuite;
  +import junit.textui.TestRunner;
   import junitx.extensions.TestSetup;
   
   import org.apache.xindice.client.xmldb.DatabaseImplTest;
  @@ -89,58 +90,60 @@
    */
   public class UnitTests {
   
  -   public static Test suite() {
  -      TestSuite suite = new TestSuite("Xindice unit tests");
  +    public static void main(String[] args) {
  +        TestRunner.run(UnitTests.suite());
  +    }
   
  -      suite.addTest(new TestSuite(KeyTest.class));
  -      suite.addTest(new TestSuite(ValueTest.class));
  -      
  -      suite.addTest(new TestSuite(XPathQueryResolverTest.class));
  -      suite.addTest(InlineMetaTests.suite());
  -
  -      suite.addTest(new FilerTestSetup(new TestSuite(FilerTestCase.class), 
new BTreeFiler()));
  -      suite.addTest(new FilerTestSetup(new TestSuite(FilerTestCase.class), 
new FSFiler()));
  -      // todo see what to do with the HashFiler
  -      suite.addTest(new FilerTestSetup(new TestSuite(FilerTestCase.class), 
new HashFiler()));
  -      suite.addTest(new FilerTestSetup(new TestSuite(FilerTestCase.class), 
new MemFiler()));
  -
  -      // If the Berkeley filer was built in then test it too.
  -      try {
  -         Class filerClass = 
Class.forName("org.apache.xindice.core.filer.BerkeleyBTreeFiler");
  -         Filer filer = (Filer) filerClass.newInstance();
  -         suite.addTest(new FilerTestSetup(new 
TestSuite(FilerTestCase.class), filer));
  -      }
  -      catch (Exception e) {
  -         // If the class wasn't built just ignore it.
  -      }
  -
  -
  -      suite.addTest(new TestSuite(DatabaseImplTest.class));
  -      suite.addTest(new TestSuite(ResourceIteratorImplTest.class));
  -
  -      suite.addTest(new TestSuite(XMLToolsTest.class));
  -
  -      suite.addTest(new TestSuite(ConfigurationTest.class));
  -      
  -      suite.addTest(new TestSuite(MetaTest.class));
  -
  -      return new TestSetup(suite) {
  -
  -         private File root = new File(FilerTestCase.TEST_COLLECTION_NAME);
  -
  -         public void setUp() {
  -            // Create the directory to hold the tests.
  -            root.mkdir();
  -         }
  -
  -         public void tearDown() {
  -            String[] files = root.list();
  -            for (int i = 0; i < files.length; i++) {
  -               new File(root, files[i]).delete();
  +    public static Test suite() {
  +        TestSuite suite = new TestSuite("Xindice unit tests");
  +
  +        suite.addTest(new TestSuite(KeyTest.class));
  +        suite.addTest(new TestSuite(ValueTest.class));
  +
  +        suite.addTest(new TestSuite(XPathQueryResolverTest.class));
  +        suite.addTest(InlineMetaTests.suite());
  +
  +        suite.addTest(new FilerTestSetup(new TestSuite(FilerTestCase.class), 
new BTreeFiler()));
  +        suite.addTest(new FilerTestSetup(new TestSuite(FilerTestCase.class), 
new FSFiler()));
  +        // todo see what to do with the HashFiler
  +        suite.addTest(new FilerTestSetup(new TestSuite(FilerTestCase.class), 
new HashFiler()));
  +        suite.addTest(new FilerTestSetup(new TestSuite(FilerTestCase.class), 
new MemFiler()));
  +
  +        // If the Berkeley filer was built in then test it too.
  +        try {
  +            Class filerClass = 
Class.forName("org.apache.xindice.core.filer.BerkeleyBTreeFiler");
  +            Filer filer = (Filer) filerClass.newInstance();
  +            suite.addTest(new FilerTestSetup(new 
TestSuite(FilerTestCase.class), filer));
  +        } catch (Exception e) {
  +            // If the class wasn't built just ignore it.
  +        }
  +
  +        suite.addTest(new TestSuite(DatabaseImplTest.class));
  +        suite.addTest(new TestSuite(ResourceIteratorImplTest.class));
  +
  +        suite.addTest(new TestSuite(XMLToolsTest.class));
  +
  +        suite.addTest(new TestSuite(ConfigurationTest.class));
  +
  +        suite.addTest(new TestSuite(MetaTest.class));
  +
  +        return new TestSetup(suite) {
  +
  +            private File root = new File(FilerTestCase.TEST_COLLECTION_NAME);
  +
  +            public void setUp() {
  +                // Create the directory to hold the tests.
  +                root.mkdir();
  +            }
  +
  +            public void tearDown() {
  +                String[] files = root.list();
  +                for (int i = 0; i < files.length; i++) {
  +                    new File(root, files[i]).delete();
  +                }
  +                root.delete();
               }
  -            root.delete();
  -         }
  -      };
  -   }
  +        };
  +    }
   
   }
  
  
  

Reply via email to