[ jEdit-commits ] SF.net SVN: jedit:[17226] tests/Fest

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

Revision: 17226
          http://jedit.svn.sourceforge.net/jedit/?rev=17226&view=rev
Author:   shlomy
Date:     2010-02-06 12:45:07 +0000 (Sat, 06 Feb 2010)

Log Message:
-----------
Use the built-in button matcher that matches using button text.

Modified Paths:
--------------
    tests/Fest/jedit_tests/test/gui/SelectionForegroundColorTest.java
    tests/Fest/src/org/gjt/sp/jedit/testframework/TestUtils.java

Modified: tests/Fest/jedit_tests/test/gui/SelectionForegroundColorTest.java
===================================================================
--- tests/Fest/jedit_tests/test/gui/SelectionForegroundColorTest.java	2010-02-06 10:14:52 UTC (rev 17225)
+++ tests/Fest/jedit_tests/test/gui/SelectionForegroundColorTest.java	2010-02-06 12:45:07 UTC (rev 17226)
@@ -7,6 +7,7 @@
 
 import javax.swing.SwingUtilities;
 
+import org.fest.swing.core.matcher.JButtonMatcher;
 import org.fest.swing.finder.WindowFinder;
 import org.fest.swing.fixture.DialogFixture;
 import org.fest.swing.fixture.JCheckBoxFixture;
@@ -29,7 +30,6 @@
 {
 	private static final String IMAGE1 = "selFgColorImage1.png";
 	private static final String IMAGE2 = "selFgColorImage2.png";
-	private static final String IMAGE3 = "selFgColorImage3.png";
 	private static final String [] lines = new String[] {
 		"#include <stdio.h>",
 		"int main(int argc, char *argv[])",
@@ -106,7 +106,7 @@
         checkbox.click();
 
         // click the OK button on the options dialog
-        TestUtils.clickButton(optionsDialog, "OK");
+        optionsDialog.button(JButtonMatcher.withText("OK")).click();
 
         // wait a second to make sure jEdit has time to save the properties
         Pause.pause( 1000 );
@@ -121,6 +121,7 @@
 		{
 			SwingUtilities.invokeAndWait(new Runnable() {
 				public void run() {
+					ta.setCaretBlinkEnabled(false);
 			        JEditBuffer buf = ta.getBuffer();
 			        for (String line: lines)
 			        	buf.insert(buf.getLength(), line + "\n");
@@ -150,7 +151,6 @@
 			SwingUtilities.invokeAndWait(new Runnable() {
 				public void run() {
 					ta.setCaretPosition(ta.getLineEndOffset(6) - 5);
-					ta.setCaretBlinkEnabled(false);
 					selectRanges(ta);
 					ta.scrollToCaret(true);
 			        ta.repaint();

Modified: tests/Fest/src/org/gjt/sp/jedit/testframework/TestUtils.java
===================================================================
--- tests/Fest/src/org/gjt/sp/jedit/testframework/TestUtils.java	2010-02-06 10:14:52 UTC (rev 17225)
+++ tests/Fest/src/org/gjt/sp/jedit/testframework/TestUtils.java	2010-02-06 12:45:07 UTC (rev 17226)
@@ -29,7 +29,6 @@
 import java.awt.Dialog;
 import java.awt.Frame;
 
-import javax.swing.JButton;
 import javax.swing.SwingUtilities;
 
 import javax.swing.tree.*;
@@ -354,21 +353,6 @@
     }
 	//}}}
 
-	/**
-	 * Convenience method to click a button in a container by text.
-	 * @param containerFixture the container
-	 * @param text the text of the button to click
-	 */
-	public static void clickButton(ContainerFixture containerFixture,
-		final String text)
-	{
-		containerFixture.button(new GenericTypeMatcher<JButton>(JButton.class) {
-			public boolean isMatching(JButton button) {
-				return text.equals(button.getText());
-			}
-		}).click();
-    }
-
 	private static void safelyClose(FileInputStream fis)
 	{
 		if (fis == null)


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