From: <eg...@us...> - 2007-01-11 18:19:36
|
Revision: 7701 http://svn.sourceforge.net/cdk/?rev=7701&view=rev Author: egonw Date: 2007-01-11 10:19:35 -0800 (Thu, 11 Jan 2007) Log Message: ----------- Test for the found format for the MDL molfile entries. Modified Paths: -------------- trunk/cdk/src/org/openscience/cdk/test/io/iterator/IteratingMDLReaderTest.java Modified: trunk/cdk/src/org/openscience/cdk/test/io/iterator/IteratingMDLReaderTest.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/test/io/iterator/IteratingMDLReaderTest.java 2007-01-11 17:39:14 UTC (rev 7700) +++ trunk/cdk/src/org/openscience/cdk/test/io/iterator/IteratingMDLReaderTest.java 2007-01-11 18:19:35 UTC (rev 7701) @@ -28,12 +28,15 @@ package org.openscience.cdk.test.io.iterator; import java.io.InputStream; + import junit.framework.Test; import junit.framework.TestSuite; import org.openscience.cdk.CDKConstants; import org.openscience.cdk.DefaultChemObjectBuilder; import org.openscience.cdk.Molecule; +import org.openscience.cdk.io.formats.MDLFormat; +import org.openscience.cdk.io.formats.MDLV2000Format; import org.openscience.cdk.io.iterator.IteratingMDLReader; import org.openscience.cdk.test.CDKTestCase; import org.openscience.cdk.tools.LoggingTool; @@ -73,6 +76,7 @@ molCount++; } + assertEquals(MDLV2000Format.getInstance(), reader.getFormat()); assertEquals(6, molCount); } catch (Exception e) { logger.debug(e); @@ -93,6 +97,7 @@ assertNotNull(object); assertTrue(object instanceof Molecule); assertEquals("2-methylbenzo-1,4-quinone", ((Molecule)object).getProperty(CDKConstants.TITLE)); + assertEquals(MDLV2000Format.getInstance(), reader.getFormat()); } catch (Exception e) { logger.debug(e); fail(e.getMessage()); @@ -174,6 +179,7 @@ // two compounds assertTrue(reader.hasNext()); assertNotNull(reader.next()); + assertEquals(MDLFormat.getInstance(), reader.getFormat()); assertTrue(reader.hasNext()); assertNotNull(reader.next()); } catch (Exception exception) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2007-02-01 10:04:34
|
Revision: 7812 http://svn.sourceforge.net/cdk/?rev=7812&view=rev Author: egonw Date: 2007-02-01 02:04:32 -0800 (Thu, 01 Feb 2007) Log Message: ----------- When no more entries in the SDF are found, it is reset to the default MDLFormat. Each found entry should be of type MDLV2000 format. Modified Paths: -------------- trunk/cdk/src/org/openscience/cdk/test/io/iterator/IteratingMDLReaderTest.java Modified: trunk/cdk/src/org/openscience/cdk/test/io/iterator/IteratingMDLReaderTest.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/test/io/iterator/IteratingMDLReaderTest.java 2007-02-01 09:47:09 UTC (rev 7811) +++ trunk/cdk/src/org/openscience/cdk/test/io/iterator/IteratingMDLReaderTest.java 2007-02-01 10:04:32 UTC (rev 7812) @@ -73,9 +73,10 @@ assertNotNull(object); assertTrue(object instanceof Molecule); molCount++; + assertEquals("Molecule # was not in MDL V2000 format: " + molCount, + MDLV2000Format.getInstance(), reader.getFormat()); } - assertEquals(MDLV2000Format.getInstance(), reader.getFormat()); assertEquals(6, molCount); } catch (Exception e) { logger.debug(e); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <raj...@us...> - 2007-07-27 17:55:41
|
Revision: 8629 http://cdk.svn.sourceforge.net/cdk/?rev=8629&view=rev Author: rajarshi Date: 2007-07-27 10:55:36 -0700 (Fri, 27 Jul 2007) Log Message: ----------- Updated the empty molecule test to ensure that it is reading the tags Modified Paths: -------------- trunk/cdk/src/org/openscience/cdk/test/io/iterator/IteratingMDLReaderTest.java Modified: trunk/cdk/src/org/openscience/cdk/test/io/iterator/IteratingMDLReaderTest.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/test/io/iterator/IteratingMDLReaderTest.java 2007-07-27 17:52:35 UTC (rev 8628) +++ trunk/cdk/src/org/openscience/cdk/test/io/iterator/IteratingMDLReaderTest.java 2007-07-27 17:55:36 UTC (rev 8629) @@ -32,6 +32,7 @@ import org.openscience.cdk.CDKConstants; import org.openscience.cdk.DefaultChemObjectBuilder; import org.openscience.cdk.Molecule; +import org.openscience.cdk.interfaces.IMolecule; import org.openscience.cdk.io.formats.MDLV2000Format; import org.openscience.cdk.io.iterator.IteratingMDLReader; import org.openscience.cdk.test.CDKTestCase; @@ -153,6 +154,12 @@ assertNotNull(object); assertTrue(object instanceof Molecule); molCount++; + + if (molCount == 2) { + IMolecule mol = (IMolecule) object; + String s = (String) mol.getProperty("Species"); + assertEquals("rat", s); + } } assertEquals(2, molCount); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |