From: <sh...@us...> - 2009-10-14 09:03:58
|
Revision: 14981 http://cdk.svn.sourceforge.net/cdk/?rev=14981&view=rev Author: shk3 Date: 2009-10-14 09:03:51 +0000 (Wed, 14 Oct 2009) Log Message: ----------- more tests work again Modified Paths: -------------- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java Modified: jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java =================================================================== --- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java 2009-10-13 17:51:34 UTC (rev 14980) +++ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java 2009-10-14 09:03:51 UTC (rev 14981) @@ -244,21 +244,22 @@ } @Test public void testDelete() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { + restoreModelWithBasicmol(); JPanelFixture jcppanel=applet.panel("appletframe"); JChemPaintPanel panel = (JChemPaintPanel)jcppanel.target; int oldAtomCount=panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtomCount(); int oldBondCount=panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount(); //we delete an atom applet.button("eraser").click(); - Point2d moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(4).getPoint2d().x,panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(4).getPoint2d().y); + Point2d moveto=getAtomPoint(panel, 0); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); Assert.assertEquals(oldAtomCount-1, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtomCount()); - Assert.assertEquals(oldBondCount-2, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()); + Assert.assertEquals(oldBondCount-1, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()); //and a bond moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates((panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(1).getPoint2d().x+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().x)/2,(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(1).getPoint2d().y+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().y)/2); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); Assert.assertEquals(oldAtomCount-1, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtomCount()); - Assert.assertEquals(oldBondCount-3, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()); + Assert.assertEquals(oldBondCount-2, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()); restoreModelWithBasicmol(); } Modified: jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java =================================================================== --- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java 2009-10-13 17:51:34 UTC (rev 14980) +++ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java 2009-10-14 09:03:51 UTC (rev 14981) @@ -191,6 +191,7 @@ private void genericIsotopeTest(int isotopeNumber){ //we go to select mode + restoreModelWithBasicmol(); applet.button("select").click(); panel.getRenderPanel().getRenderer().getRenderer2DModel().setSelection(new SingleSelection<IAtom>(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(0))); panel.selectionChanged(); @@ -207,9 +208,6 @@ Assert.assertEquals("C", panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(oldAtomCount).getSymbol()); Assert.assertEquals(isotopeNumber, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(oldAtomCount).getMassNumber().intValue()); panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(0).setMassNumber(12); - applet.button("eraser").click(); - applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point(100,100)); - Assert.assertEquals(oldAtomCount, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtomCount()); } @Test public void testMenuIsotopeMajorMinusTwo() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |