[Cdk-commits] SF.net SVN: cdk:[14924] jchempaint/trunk/src/test/org/openscience/ jchempaint

[<sh...@us...>]

Revision: 14924
          http://cdk.svn.sourceforge.net/cdk/?rev=14924&view=rev
Author:   shk3
Date:     2009-10-05 13:38:33 +0000 (Mon, 05 Oct 2009)

Log Message:
-----------
more tests

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-05 13:23:30 UTC (rev 14923)
+++ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java	2009-10-05 13:38:33 UTC (rev 14924)
@@ -264,6 +264,25 @@
 		Assert.assertEquals(oldAtomCount+5, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtomCount());
 		restoreModel();
 	}
+	
+	@Test public void testDelete() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException {
+        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);   
+        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());
+        //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());
+        restoreModel();
+    }
 
 	private void restoreModel(){
 		JPanelFixture jcppanel=applet.panel("appletframe");

Modified: jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java
===================================================================
--- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java	2009-10-05 13:23:30 UTC (rev 14923)
+++ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java	2009-10-05 13:38:33 UTC (rev 14924)
@@ -214,12 +214,6 @@
         Assert.assertEquals(isotopeNumber, panel.get2DHub().getController2DModel().getDrawIsotopeNumber());
         //if we click somewhere, we should get a new atom with specified properties
         jcppanel.robot.click(jcppanel.component(), new Point(100,100));
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
         Assert.assertEquals(oldAtomCount+1, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtomCount());
         Assert.assertEquals("C", panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(oldAtomCount).getSymbol());
         Assert.assertEquals(isotopeNumber, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(oldAtomCount).getMassNumber().intValue());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.