From: Egon W. <eg...@us...> - 2005-10-28 13:33:36
|
Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/test/config/isotopes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15883/src/org/openscience/cdk/test/config/isotopes Modified Files: IsotopeHandlerTest.java IsotopeReaderTest.java Log Message: Mega patch: cdk-core no longer depends on cdk-data Index: IsotopeHandlerTest.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/test/config/isotopes/IsotopeHandlerTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- IsotopeHandlerTest.java 22 Oct 2005 16:25:56 -0000 1.6 +++ IsotopeHandlerTest.java 28 Oct 2005 13:33:14 -0000 1.7 @@ -27,6 +27,7 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.openscience.cdk.ChemObject; import org.openscience.cdk.config.isotopes.IsotopeHandler; import org.openscience.cdk.test.CDKTestCase; @@ -50,18 +51,18 @@ // serious testing is done in IsotopeFactoryTest; the factory // requires this class to work properly. But nevertheless: - public void testIsotopeHandler() { - IsotopeHandler handler = new IsotopeHandler(); + public void testIsotopeHandler_ChemObjectBuilder() { + IsotopeHandler handler = new IsotopeHandler(new ChemObject().getBuilder()); } public void testGetIsotopes() { - IsotopeHandler handler = new IsotopeHandler(); + IsotopeHandler handler = new IsotopeHandler(new ChemObject().getBuilder()); // nothing is read assertNull(handler.getIsotopes()); } public void testStartDocument() { - IsotopeHandler handler = new IsotopeHandler(); + IsotopeHandler handler = new IsotopeHandler(new ChemObject().getBuilder()); // nothing is read, but Vector is initialized assertNull(handler.getIsotopes()); } Index: IsotopeReaderTest.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/test/config/isotopes/IsotopeReaderTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- IsotopeReaderTest.java 22 Oct 2005 16:25:56 -0000 1.5 +++ IsotopeReaderTest.java 28 Oct 2005 13:33:14 -0000 1.6 @@ -30,6 +30,7 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.openscience.cdk.ChemObject; import org.openscience.cdk.config.isotopes.IsotopeReader; import org.openscience.cdk.test.CDKTestCase; @@ -50,16 +51,16 @@ return new TestSuite(IsotopeReaderTest.class); } - public void testIsotopeReader_Reader() { + public void testIsotopeReader_Reader_ChemObjectBuilder() { IsotopeReader reader = new IsotopeReader( - new StringReader("") + new StringReader(""), new ChemObject().getBuilder() ); assertNotNull(reader); } public void testReadIsotopes() { IsotopeReader reader = new IsotopeReader( - new StringReader("") + new StringReader(""), new ChemObject().getBuilder() ); assertNotNull(reader); Vector isotopes = reader.readIsotopes(); @@ -94,7 +95,7 @@ "</list>"; IsotopeReader reader = new IsotopeReader( - new StringReader(isotopeData) + new StringReader(isotopeData), new ChemObject().getBuilder() ); assertNotNull(reader); Vector isotopes = reader.readIsotopes(); |