[Cdk-commits] SF.net SVN: cdk: [5932] trunk/cdk/src/org/openscience/cdk/test

[<eg...@us...>]

Revision: 5932
Author:   egonw
Date:     2006-04-14 09:12:26 -0700 (Fri, 14 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/cdk/?rev=5932&view=rev

Log Message:
-----------
Removed a redundant class

Modified Paths:
--------------
    trunk/cdk/src/org/openscience/cdk/test/MosjvmtsTests.java

Removed Paths:
-------------
    trunk/cdk/src/org/openscience/cdk/test/DataClassesTests.java
Deleted: trunk/cdk/src/org/openscience/cdk/test/DataClassesTests.java
===================================================================
--- trunk/cdk/src/org/openscience/cdk/test/DataClassesTests.java	2006-04-14 15:52:56 UTC (rev 5931)
+++ trunk/cdk/src/org/openscience/cdk/test/DataClassesTests.java	2006-04-14 16:12:26 UTC (rev 5932)
@@ -1,82 +0,0 @@
-/* $RCSfile$    
- * $Author$    
- * $Date$    
- * $Revision$
- * 
- * Copyright (C) 1997-2006  The Chemistry Development Kit (CDK) project
- * 
- * Contact: cdk...@li...
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 
- */
-
-package org.openscience.cdk.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.openscience.cdk.test.exception.CDKExceptionTest;
-import org.openscience.cdk.test.exception.NoSuchAtomExceptionTest;
-
-/**
- * TestSuite that runs all the sample tests.
- *
- * @cdk.module test-extra
- */
-public class DataClassesTests {
-
-    public static Test suite () {
-        TestSuite suite= new TestSuite("The cdk.data Tests");
-        suite.addTest(DataCoverageTest.suite());
-        
-        suite.addTest(AminoAcidTest.suite());
-        suite.addTest(AtomContainerTest.suite());
-        suite.addTest(AtomEnumerationTest.suite());
-        suite.addTest(AtomParityTest.suite());
-        suite.addTest(AtomTest.suite());
-        suite.addTest(AtomTypeTest.suite());
-        suite.addTest(BioPolymerTest.suite());
-        suite.addTest(BondTest.suite());
-        suite.addTest(CDKConstantsTest.suite());
-        suite.addTest(CDKExceptionTest.suite());
-        suite.addTest(ChemFileTest.suite());
-        suite.addTest(ChemModelTest.suite());
-        suite.addTest(ChemObjectTest.suite());
-        suite.addTest(ChemSequenceTest.suite());
-        suite.addTest(CrystalTest.suite());
-        suite.addTest(DefaultChemObjectBuilderTest.suite());
-        suite.addTest(ElectronContainerTest.suite());
-        suite.addTest(ElementTest.suite());
-        suite.addTest(IsotopeTest.suite());
-        suite.addTest(LonePairTest.suite());
-        suite.addTest(MappingTest.suite());
-        suite.addTest(MoleculeTest.suite());
-        suite.addTest(MonomerTest.suite());
-        suite.addTest(NoSuchAtomExceptionTest.suite());
-        suite.addTest(PolymerTest.suite());
-        suite.addTest(PseudoAtomTest.suite());
-        suite.addTest(ReactionTest.suite());
-        suite.addTest(RingTest.suite());
-        suite.addTest(RingSetTest.suite());
-        suite.addTest(SetOfAtomContainersTest.suite());
-        suite.addTest(SetOfMoleculesTest.suite());
-        suite.addTest(SetOfReactionsTest.suite());
-        suite.addTest(SingleElectronTest.suite());
-        suite.addTest(StrandTest.suite());
-        suite.addTest(ChangeEventPropagationTest.suite());
-        return suite;
-    }
-
-}

Modified: trunk/cdk/src/org/openscience/cdk/test/MosjvmtsTests.java
===================================================================
--- trunk/cdk/src/org/openscience/cdk/test/MosjvmtsTests.java	2006-04-14 15:52:56 UTC (rev 5931)
+++ trunk/cdk/src/org/openscience/cdk/test/MosjvmtsTests.java	2006-04-14 16:12:26 UTC (rev 5932)
@@ -69,7 +69,8 @@
         
         if ("I".equals(benchmark)){
         	// Bench Mark I tests
-        	suite.addTest(DataClassesTests.suite());
+        	suite.addTest(MdataTests.suite());
+        	suite.addTest(MdatadebugTests.suite());
         } else if ("II".equals(benchmark)){
         	// Bench Mark II tests
         	suite.addTest(McoreTests.suite());
@@ -77,9 +78,6 @@
 //        	 Bench Mark III tests
         	suite.addTest(MstandardTests.suite());
         } else if ("skip".equals(benchmark)){
-        	// Tests for data classes
-        	suite.addTest(MdatadebugTests.suite());
-        
         	// Package Test Suites
         	suite.addTest(MioTests.suite());
         	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.