GP-224 - Modal Dialogs - fixed modal dialogs not being parented to

active window in default case
This commit is contained in:
dragonmacher 2020-10-06 11:09:28 -04:00
parent 2b08598dba
commit 9dd458e9e1
24 changed files with 182 additions and 217 deletions

View file

@ -32,7 +32,7 @@ public class DiffApply2Test extends DiffApplyTestAdapter {
@Test
public void testApplyDiffsNextActionFirst() throws Exception {
openDiff(diffTestP1, diffTestP2);
JDialog dialog = waitForJDialog(tool.getToolFrame(), "Memory Differs", 2000);
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
showApplySettings();
@ -55,7 +55,7 @@ public class DiffApply2Test extends DiffApplyTestAdapter {
@Test
public void testApplyDiffsNextActionMiddle() throws Exception {
openDiff(diffTestP1, diffTestP2);
JDialog dialog = waitForJDialog(tool.getToolFrame(), "Memory Differs", 2000);
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
showApplySettings();
@ -79,7 +79,7 @@ public class DiffApply2Test extends DiffApplyTestAdapter {
@Test
public void testApplyDiffsNextActionLast() throws Exception {
openDiff(diffTestP1, diffTestP2);
JDialog dialog = waitForJDialog(tool.getToolFrame(), "Memory Differs", 2000);
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
showApplySettings();
@ -93,7 +93,7 @@ public class DiffApply2Test extends DiffApplyTestAdapter {
@Test
public void testIgnoreEntireBlock() throws Exception {
openDiff(diffTestP1, diffTestP2);
JDialog dialog = waitForJDialog(tool.getToolFrame(), "Memory Differs", 2000);
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
showApplySettings();
@ -136,7 +136,7 @@ public class DiffApply2Test extends DiffApplyTestAdapter {
@Test
public void testIgnorePartialBlock() throws Exception {
openDiff(diffTestP1, diffTestP2);
JDialog dialog = waitForJDialog(tool.getToolFrame(), "Memory Differs", 2000);
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
showApplySettings();
@ -163,7 +163,7 @@ public class DiffApply2Test extends DiffApplyTestAdapter {
@Test
public void testUndoRedo() throws Exception {
openDiff(diffTestP1, diffTestP2);
JDialog dialog = waitForJDialog(tool.getToolFrame(), "Memory Differs", 2000);
JDialog dialog = waitForJDialog("Memory Differs");
pressButtonByText(dialog, "OK");
waitForPostedSwingRunnables();
showApplySettings();