Selaa lähdekoodia

Make unit tests look for StandardDialogs not JOptionPanes

Fixes issue 3666

Change-Id: I8f6feacbb4806794b197211406607c32a3b9b9b1
Reviewed-on: http://gerrit.dmdirc.com/713
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Automatic-Compile: Shane Mc Cormack <shane@dmdirc.com>
tags/0.6.3
Gregory Holmes 14 vuotta sitten
vanhempi
commit
dafb2b37ff

+ 10
- 10
test/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialogTest.java Näytä tiedosto

29
 import com.dmdirc.config.InvalidIdentityFileException;
29
 import com.dmdirc.config.InvalidIdentityFileException;
30
 import com.dmdirc.harness.ui.ClassFinder;
30
 import com.dmdirc.harness.ui.ClassFinder;
31
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
31
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
32
+import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
32
 import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialog;
33
 import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialog;
33
 
34
 
34
 import java.lang.reflect.InvocationTargetException;
35
 import java.lang.reflect.InvocationTargetException;
38
 import javax.swing.SwingUtilities;
39
 import javax.swing.SwingUtilities;
39
 
40
 
40
 import org.fest.swing.core.matcher.JButtonMatcher;
41
 import org.fest.swing.core.matcher.JButtonMatcher;
41
-import org.fest.swing.finder.JOptionPaneFinder;
42
 import org.fest.swing.finder.WindowFinder;
42
 import org.fest.swing.finder.WindowFinder;
43
 import org.fest.swing.fixture.DialogFixture;
43
 import org.fest.swing.fixture.DialogFixture;
44
-import org.fest.swing.fixture.JOptionPaneFixture;
44
+import org.fest.swing.fixture.JButtonFixture;
45
 import org.junit.After;
45
 import org.junit.After;
46
 import org.junit.Before;
46
 import org.junit.Before;
47
 import org.junit.BeforeClass;
47
 import org.junit.BeforeClass;
138
         
138
         
139
         window.panel(new ClassFinder<JPanel>(JPanel.class, "Groups"))
139
         window.panel(new ClassFinder<JPanel>(JPanel.class, "Groups"))
140
                 .button(JButtonMatcher.withText("Delete")).requireEnabled().click();
140
                 .button(JButtonMatcher.withText("Delete")).requireEnabled().click();
141
-        
142
-        JOptionPaneFixture newwin = JOptionPaneFinder.findOptionPane()
143
-                .withTimeout(5000).using(window.robot);
144
-        newwin.buttonWithText("No").click();
141
+
142
+        DialogFixture newwin = WindowFinder.findDialog(StandardQuestionDialog.
143
+                class).withTimeout(5000).using(window.robot);
144
+        JButtonFixture button = newwin.button(JButtonMatcher.withText("No")).click();
145
         
145
         
146
         assertTrue(ActionManager.getGroups().containsKey("amd-ui-test1"));
146
         assertTrue(ActionManager.getGroups().containsKey("amd-ui-test1"));
147
         window.list().selectItem("amd-ui-test1").requireSelectedItems("amd-ui-test1");
147
         window.list().selectItem("amd-ui-test1").requireSelectedItems("amd-ui-test1");
148
         
148
         
149
         window.panel(new ClassFinder<JPanel>(JPanel.class, "Groups"))
149
         window.panel(new ClassFinder<JPanel>(JPanel.class, "Groups"))
150
                 .button(JButtonMatcher.withText("Delete")).click();
150
                 .button(JButtonMatcher.withText("Delete")).click();
151
-        
152
-        newwin = JOptionPaneFinder.findOptionPane()
153
-                .withTimeout(5000).using(window.robot);
154
-        newwin.buttonWithText("Yes").click();
151
+
152
+        newwin = WindowFinder.findDialog(StandardQuestionDialog.
153
+                class).withTimeout(5000).using(window.robot);
154
+        button = newwin.button(JButtonMatcher.withText("Yes")).click();
155
         
155
         
156
         assertTrue(window.list().selection().length != 1 ||   
156
         assertTrue(window.list().selection().length != 1 ||   
157
                 !window.list().selection()[0].equals("amd-ui-test1"));
157
                 !window.list().selection()[0].equals("amd-ui-test1"));

Loading…
Peruuta
Tallenna