[Cdk-commits] SF.net SVN: cdk:[14833] jchempaint/trunk/src

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

Revision: 14833
          http://cdk.svn.sourceforge.net/cdk/?rev=14833&view=rev
Author:   shk3
Date:     2009-09-15 13:16:40 +0000 (Tue, 15 Sep 2009)

Log Message:
-----------
fixed getMolFile, made a test for it

Modified Paths:
--------------
    jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java
    jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletBugsTest.java

Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java
===================================================================
--- jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java	2009-09-15 12:39:14 UTC (rev 14832)
+++ jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java	2009-09-15 13:16:40 UTC (rev 14833)
@@ -328,8 +328,8 @@
         StringWriter sw = new StringWriter();
         MDLWriter mdlwriter = new MDLWriter(sw);
         // mdlwriter.dontWriteAromatic();
-        org.openscience.cdk.interfaces.IMoleculeSet som = theJcpp
-                .getChemModel().getMoleculeSet();
+        org.openscience.cdk.interfaces.IChemModel som = theJcpp
+                .getChemModel();
         mdlwriter.write(som);
         return (sw.toString());
     }

Modified: jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletBugsTest.java
===================================================================
--- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletBugsTest.java	2009-09-15 12:39:14 UTC (rev 14832)
+++ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletBugsTest.java	2009-09-15 13:16:40 UTC (rev 14833)
@@ -1,16 +1,12 @@
 package org.openscience.jchempaint;
 
+import java.awt.Frame;
 import java.awt.Point;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.vecmath.Point2d;
-
 import org.fest.swing.applet.AppletViewer;
 import org.fest.swing.core.MouseButton;
-import org.fest.swing.fixture.DialogFixture;
 import org.fest.swing.fixture.FrameFixture;
 import org.fest.swing.fixture.JPanelFixture;
 import org.fest.swing.launcher.AppletLauncher;
@@ -18,29 +14,28 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openscience.cdk.CDKConstants;
 import org.openscience.cdk.DefaultChemObjectBuilder;
 import org.openscience.cdk.exception.CDKException;
-import org.openscience.cdk.interfaces.IBond;
 import org.openscience.cdk.interfaces.IChemModel;
-import org.openscience.cdk.io.MDLV2000Reader;
 import org.openscience.jchempaint.applet.JChemPaintEditorApplet;
 
 public class JCPEditorAppletBugsTest {
 	private static AppletViewer viewer;
 	private static FrameFixture applet;
+	private static JChemPaintEditorApplet jcpApplet;
 
 
 	@BeforeClass public static void setUp() {
+	    jcpApplet = new JChemPaintEditorApplet();
 		Map<String, String> parameters = new HashMap<String, String>();
-		viewer = AppletLauncher.applet(new JChemPaintEditorApplet())
+		viewer = AppletLauncher.applet(jcpApplet)
 			.withParameters(parameters)
 			.start();
 		applet = new FrameFixture(viewer);
 		applet.show();
 	}
 
-	@Test public void testSquareSelectSingleAtom() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException {
+	@Test public void testSquareSelectSingleAtom()  {
 		JPanelFixture jcppanel=applet.panel("appletframe");
 		JChemPaintPanel panel = (JChemPaintPanel)jcppanel.target;
 		applet.button("C").click();
@@ -58,6 +53,17 @@
 		restoreModel();
 	}
 	
+	@Test public void testGetMolFile() throws CDKException{
+        JPanelFixture jcppanel=applet.panel("appletframe");
+        JChemPaintPanel panel = (JChemPaintPanel)jcppanel.target;
+        applet.button("hexagon").click();
+        Point movetopint=new Point(100,100);    
+        applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), movetopint, MouseButton.LEFT_BUTTON,1);
+	    Assert.assertTrue(jcpApplet.getMolFile().indexOf("6  6  0  0  0  0  0  0  0  0999 V2000")>0);
+        restoreModel();	    
+	}
+	
+	
 	private void restoreModel(){
 		JPanelFixture jcppanel=applet.panel("appletframe");
 		JChemPaintPanel panel = (JChemPaintPanel)jcppanel.target;


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