From: <sh...@us...> - 2009-09-11 14:46:32
|
Revision: 14820 http://cdk.svn.sourceforge.net/cdk/?rev=14820&view=rev Author: shk3 Date: 2009-09-11 14:46:18 +0000 (Fri, 11 Sep 2009) Log Message: ----------- all exports tested Modified Paths: -------------- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java jchempaint/trunk/src/test/org/openscience/jchempaint/matchers/ButtonTextComponentMatcher.java Modified: jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java =================================================================== --- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java 2009-09-11 14:13:32 UTC (rev 14819) +++ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java 2009-09-11 14:46:18 UTC (rev 14820) @@ -15,6 +15,7 @@ import org.fest.swing.applet.AppletViewer; import org.fest.swing.core.MouseButton; +import org.fest.swing.exception.WaitTimedOutError; import org.fest.swing.fixture.DialogFixture; import org.fest.swing.fixture.FrameFixture; import org.fest.swing.fixture.JButtonFixture; @@ -61,18 +62,99 @@ applet.show(); } - @Test public void testMenuExport() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { + @Test public void testMenuExportBmp() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { + File file=new File("/tmp/test.bmp"); + if(file.exists()) + file.delete(); applet.menuItem("export").click(); DialogFixture dialog = applet.dialog(); + JComboBox combobox = dialog.robot.finder().find(new ComboBoxTextComponentMatcher("org.openscience.jchempaint.io.JCPExportFileFilter")); + combobox.setSelectedItem(combobox.getItemAt(1)); JTextComponentFixture text = dialog.textBox(); text.setText("/tmp/test"); JButtonFixture okbutton = new JButtonFixture(dialog.robot, dialog.robot.finder().find(new ButtonTextComponentMatcher("Save"))); okbutton.click(); + dialog = applet.dialog(); + okbutton = new JButtonFixture(dialog.robot, dialog.robot.finder().find(new ButtonTextComponentMatcher("OK"))); + okbutton.click(); + //we only check the existence of file for now + Assert.assertTrue(file.exists()); + } + + @Test public void testMenuExportJpg() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { + File file=new File("/tmp/test.jpg"); + if(file.exists()) + file.delete(); + applet.menuItem("export").click(); + DialogFixture dialog = applet.dialog(); + JComboBox combobox = dialog.robot.finder().find(new ComboBoxTextComponentMatcher("org.openscience.jchempaint.io.JCPExportFileFilter")); + combobox.setSelectedItem(combobox.getItemAt(2)); + JTextComponentFixture text = dialog.textBox(); + text.setText("/tmp/test"); + JButtonFixture okbutton = new JButtonFixture(dialog.robot, dialog.robot.finder().find(new ButtonTextComponentMatcher("Save"))); + okbutton.click(); + dialog = applet.dialog(); + okbutton = new JButtonFixture(dialog.robot, dialog.robot.finder().find(new ButtonTextComponentMatcher("OK"))); + okbutton.click(); + //we only check the existence of file for now + Assert.assertTrue(file.exists()); + } + + @Test public void testMenuExportPng() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { + File file=new File("/tmp/test.png"); + if(file.exists()) + file.delete(); + applet.menuItem("export").click(); + DialogFixture dialog = applet.dialog(); + JComboBox combobox = dialog.robot.finder().find(new ComboBoxTextComponentMatcher("org.openscience.jchempaint.io.JCPExportFileFilter")); + combobox.setSelectedItem(combobox.getItemAt(3)); + JTextComponentFixture text = dialog.textBox(); + text.setText("/tmp/test"); + JButtonFixture okbutton = new JButtonFixture(dialog.robot, dialog.robot.finder().find(new ButtonTextComponentMatcher("Save"))); + okbutton.click(); + dialog = applet.dialog(); + okbutton = new JButtonFixture(dialog.robot, dialog.robot.finder().find(new ButtonTextComponentMatcher("OK"))); + okbutton.click(); + //we only check the existence of file for now + Assert.assertTrue(file.exists()); + } + + @Test public void testMenuExportSvg() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { + File file=new File("/tmp/test.svg"); + if(file.exists()) + file.delete(); + applet.menuItem("export").click(); + DialogFixture dialog = applet.dialog(); + JComboBox combobox = dialog.robot.finder().find(new ComboBoxTextComponentMatcher("org.openscience.jchempaint.io.JCPExportFileFilter")); + combobox.setSelectedItem(combobox.getItemAt(4)); + JTextComponentFixture text = dialog.textBox(); + text.setText("/tmp/test"); + JButtonFixture okbutton = new JButtonFixture(dialog.robot, dialog.robot.finder().find(new ButtonTextComponentMatcher("Save"))); + okbutton.click(); + dialog = applet.dialog(); + okbutton = new JButtonFixture(dialog.robot, dialog.robot.finder().find(new ButtonTextComponentMatcher("OK"))); + okbutton.click(); + //we only check the existence of file for now + Assert.assertTrue(file.exists()); + } + @Test public void testMenuExportTiff() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { File file=new File("/tmp/test.tiff"); + if(file.exists()) + file.delete(); + applet.menuItem("export").click(); + DialogFixture dialog = applet.dialog(); + JComboBox combobox = dialog.robot.finder().find(new ComboBoxTextComponentMatcher("org.openscience.jchempaint.io.JCPExportFileFilter")); + combobox.setSelectedItem(combobox.getItemAt(5)); + JTextComponentFixture text = dialog.textBox(); + text.setText("/tmp/test"); + JButtonFixture okbutton = new JButtonFixture(dialog.robot, dialog.robot.finder().find(new ButtonTextComponentMatcher("Save"))); + okbutton.click(); + dialog = applet.dialog(); + okbutton = new JButtonFixture(dialog.robot, dialog.robot.finder().find(new ButtonTextComponentMatcher("OK"))); + okbutton.click(); //we only check the existence of file for now Assert.assertTrue(file.exists()); } - @Test public void testMenuPrint() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { applet.menuItem("print").click(); //TODO in linux, the java print dialog is not working Modified: jchempaint/trunk/src/test/org/openscience/jchempaint/matchers/ButtonTextComponentMatcher.java =================================================================== --- jchempaint/trunk/src/test/org/openscience/jchempaint/matchers/ButtonTextComponentMatcher.java 2009-09-11 14:13:32 UTC (rev 14819) +++ jchempaint/trunk/src/test/org/openscience/jchempaint/matchers/ButtonTextComponentMatcher.java 2009-09-11 14:46:18 UTC (rev 14820) @@ -14,7 +14,7 @@ } @Override protected boolean isMatching(JButton arg0) { - if(arg0.getText()!=null && arg0.getText().equals(text)) + if(arg0.getText()!=null && arg0.isShowing() && arg0.getText().equals(text)) return true; else return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |