From: <eg...@us...> - 2007-08-29 18:14:20
|
Revision: 8748 http://cdk.svn.sourceforge.net/cdk/?rev=8748&view=rev Author: egonw Date: 2007-08-28 07:07:16 -0700 (Tue, 28 Aug 2007) Log Message: ----------- Do some magic to load J5-depending classes Modified Paths: -------------- branches/cdk-1.0.x/src/org/openscience/cdk/test/MqsarTests.java Modified: branches/cdk-1.0.x/src/org/openscience/cdk/test/MqsarTests.java =================================================================== --- branches/cdk-1.0.x/src/org/openscience/cdk/test/MqsarTests.java 2007-08-28 14:06:20 UTC (rev 8747) +++ branches/cdk-1.0.x/src/org/openscience/cdk/test/MqsarTests.java 2007-08-28 14:07:16 UTC (rev 8748) @@ -27,7 +27,6 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.openscience.cdk.test.qsar.DescriptorEngineTest; -import org.openscience.cdk.test.qsar.model.R2.RJavaEnvironmentTest; import org.openscience.cdk.test.qsar.model.weka.QSARWekaModelTests; /** @@ -47,20 +46,51 @@ suite.addTest(DescriptorEngineTest.suite()); - String rhome = System.getenv("R_HOME"); - String ldlibrarypath = System.getenv("LD_LIBRARY_PATH"); - - if (rhome != null && rhome.equals("") && - ldlibrarypath != null && ldlibrarypath.equals("")) { - -// from cdk.test.qsar.model.R2 - suite.addTest(org.openscience.cdk.test.qsar.model.R2.CNNRegressionModelTest.suite()); - suite.addTest(org.openscience.cdk.test.qsar.model.R2.LinearRegressionModelTest.suite()); - suite.addTest(org.openscience.cdk.test.qsar.model.R2.QSARRModelTests.suite()); - suite.addTest(RJavaEnvironmentTest.suite()); + // the following classes require Java 1.5 + if (System.getProperty("java.version").startsWith("1.5")) { + System.out.println("Found required Java 1.5, so running the QSAR R2 tests."); + + String rhome = System.getenv("R_HOME"); + String ldlibrarypath = System.getenv("LD_LIBRARY_PATH"); + + if (rhome != null && rhome.equals("") && + ldlibrarypath != null && ldlibrarypath.equals("")) { + try { + Class testClass = suite.getClass().getClassLoader().loadClass("org.openscience.cdk.test.qsar.model.R2.CNNRegressionModelTest"); + suite.addTest(new TestSuite(testClass)); + } catch (Exception exception) { + // ok, do without. Probably compiled not Java 1.4 + System.out.println("Could not load the QSAR R2 test: " + exception.getMessage()); + exception.printStackTrace(); + } + try { + Class testClass = suite.getClass().getClassLoader().loadClass("org.openscience.cdk.test.qsar.model.R2.LinearRegressionModelTest"); + suite.addTest(new TestSuite(testClass)); + } catch (Exception exception) { + // ok, do without. Probably compiled not Java 1.4 + System.out.println("Could not load the QSAR R2 test: " + exception.getMessage()); + exception.printStackTrace(); + } + try { + Class testClass = suite.getClass().getClassLoader().loadClass("org.openscience.cdk.test.qsar.model.R2.QSARRModelTests"); + suite.addTest(new TestSuite(testClass)); + } catch (Exception exception) { + // ok, do without. Probably compiled not Java 1.4 + System.out.println("Could not load the QSAR R2 test: " + exception.getMessage()); + exception.printStackTrace(); + } + try { + Class testClass = suite.getClass().getClassLoader().loadClass("RJavaEnvironmentTest"); + suite.addTest(new TestSuite(testClass)); + } catch (Exception exception) { + // ok, do without. Probably compiled not Java 1.4 + System.out.println("Could not load the QSAR R2 test: " + exception.getMessage()); + exception.printStackTrace(); + } + } } - -// from cdk.test.qsar.model.R2 + + // from cdk.test.qsar.model.R2 suite.addTest(QSARWekaModelTests.suite()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |