[Cdk-commits] CVS: cdk-taverna/src/org/openscience/applications/test/taverna CDKTavernaTests.java,1.1,1.2 CDKTavernaTestCase.java,1.1,1.2

[thomaskuhn <tho...@us...>]

Update of /cvsroot/cdk/cdk-taverna/src/org/openscience/applications/test/taverna
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6249/src/org/openscience/applications/test/taverna

Modified Files:
	CDKTavernaTests.java CDKTavernaTestCase.java 
Log Message:
Added JUnit tests for the new QSAR-Local Worker

Index: CDKTavernaTests.java
===================================================================
RCS file: /cvsroot/cdk/cdk-taverna/src/org/openscience/applications/test/taverna/CDKTavernaTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CDKTavernaTests.java	20 Jan 2006 07:21:12 -0000	1.1
+++ CDKTavernaTests.java	26 Jan 2006 13:26:57 -0000	1.2
@@ -26,7 +26,16 @@
 package org.openscience.applications.test.taverna;
 
 import org.openscience.applications.test.taverna.io.CDKIOReaderTest;
+import org.openscience.applications.test.taverna.qsar.BCUTCalculatorTest;
+import org.openscience.applications.test.taverna.qsar.CPSACalculatorTest;
+import org.openscience.applications.test.taverna.qsar.DescriptorCalculatorLocalWorkerTest;
 import org.openscience.applications.test.taverna.qsar.DescriptorCalculatorTest;
+import org.openscience.applications.test.taverna.qsar.GraviationalIndexCalculatorTest;
+import org.openscience.applications.test.taverna.qsar.KappaShapeIndicesCalculatorTest;
+import org.openscience.applications.test.taverna.qsar.PetitjeanNumberCalculatorTest;
+import org.openscience.applications.test.taverna.qsar.TPSACalculatorTest;
+import org.openscience.applications.test.taverna.qsar.WHIMCalculatorTest;
+import org.openscience.applications.test.taverna.qsar.XLogPCalculatorTest;
 import org.openscience.cdk.applications.swing.MoleculeListViewer;
 
 import junit.framework.Test;
@@ -53,8 +62,21 @@
 		TavernaTestData.loadDefaultDataForTests();
 		TestSuite suite= new TestSuite();
 		// With the help of the CDKIOReaderTest it is possible to test different molecules loaded from a sd-File
-		//	suite.addTest(CDKIOReaderTest.suite());
+		//suite.addTest(CDKIOReaderTest.suite());
+		// QSAR Descriptor as API-Consumer tests 
 		suite.addTest(DescriptorCalculatorTest.suite());
+		
+		// QSAR Descriptor as Local-Worker tests 
+		suite.addTest(BCUTCalculatorTest.suite());
+		suite.addTest(CPSACalculatorTest.suite());
+		suite.addTest(DescriptorCalculatorLocalWorkerTest.suite());
+		suite.addTest(GraviationalIndexCalculatorTest.suite());
+		suite.addTest(KappaShapeIndicesCalculatorTest.suite());
+		suite.addTest(PetitjeanNumberCalculatorTest.suite());
+		suite.addTest(TPSACalculatorTest.suite());
+		suite.addTest(WHIMCalculatorTest.suite());
+		suite.addTest(XLogPCalculatorTest.suite());
+		
 		if(TavernaTestData.getLogFileOfJUnitTests() == null){
 			TavernaTestData.writeStringToFile(new String[] {TavernaTestData.getLogFileOfJUnitTests()},"LogFileJUnitTest.txt");
 		}