--- /dev/null	2014-09-09 13:05:14.850481782 +0400
+++ new/test/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java	2014-09-12 10:41:30.000000000 +0400
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8054358
+ * @summary Check whether a set of dialogs created with a toolkit excluded Frame
+ *          parent has a proper modal blocking behavior. Also show a document modal
+ *          dialog and check if it blocks the document properly.
+ *
+ * @library ../helpers ../../../../lib/testlibrary/
+ * @build ExtendedRobot
+ * @build Flag
+ * @build TestDialog
+ * @build TestFrame
+ * @run main/timeout=500 MultipleDialogs1Test
+ */
+
+
+import java.awt.*;
+
+
+public class MultipleDialogs1Test {
+
+    private CustomFrame frame;
+    private CustomDialog dialogs[];
+
+    private static int delay = 500;
+
+    private int dialogCount = -1;
+
+    public void createGUI() {
+
+        final int n = 8;
+        dialogs = new CustomDialog[n];
+
+        frame = new CustomFrame();
+        frame.setLocation(50, 50);
+        frame.setModalExclusionType(Dialog.ModalExclusionType.TOOLKIT_EXCLUDE);
+        frame.setVisible(true);
+
+        int x = 250, y = 50;
+
+        for (int i = 0; i < n - 1; ++i) {
+
+            dialogs[i] = new CustomDialog(frame);
+            dialogs[i].setLocation(x, y);
+            x += 200;
+
+            if (x > 600) {
+                x = 50;
+                y += 200;
+            }
+
+            Dialog.ModalityType type;
+
+            if (i % 3 == 0) {
+                type = Dialog.ModalityType.MODELESS;
+            } else if (i % 3 == 1) {
+                type = Dialog.ModalityType.APPLICATION_MODAL;
+            } else {
+                type = Dialog.ModalityType.TOOLKIT_MODAL;
+            }
+
+            dialogs[i].setModalityType(type);
+        }
+
+        dialogs[n - 1] = new CustomDialog(frame);
+        dialogs[n - 1].setLocation(x, y);
+        dialogs[n - 1].setModalityType(Dialog.ModalityType.DOCUMENT_MODAL);
+    }
+
+    public void doTest() throws Exception {
+
+        try {
+
+            EventQueue.invokeAndWait(this::createGUI);
+
+            ExtendedRobot robot = new ExtendedRobot();
+            robot.waitForIdle(delay);
+
+            final int n = dialogs.length;
+
+            for (int i = 0; i < n - 1; ++i) {
+
+                frame.clickOpenButton(robot);
+                robot.waitForIdle(delay);
+
+                dialogs[i].checkUnblockedDialog(
+                    robot, i + ": This is " + getType(i) + ".");
+
+                frame.checkUnblockedFrame(robot, i + ": Other dialogs are visible.");
+
+                if (i > 0) {
+                    for (int j = 0; j < i; j++) {
+                        dialogs[j].checkUnblockedDialog(robot, j + ": A toolkit modality " +
+                            "excluded frame is a parent of this dialog.");
+                    }
+                }
+            }
+
+            frame.clickOpenButton(robot);
+            robot.waitForIdle(delay);
+
+            dialogs[n - 1].checkUnblockedDialog(
+                robot, (n - 1) + ": This is " + getType(n - 1) + ".");
+
+            frame.checkBlockedFrame(robot, 
+                "A document modal dialog with Frame parent is visible.");
+
+            for (int i = 0; i < n - 1; ++i) {
+                dialogs[i].checkUnblockedDialog(robot,
+                    i + ": A document modal dialog should not block " +
+                    "this dialog. The parent is modality excluded.");
+            }
+
+            dialogs[n - 1].clickCloseButton(robot);
+            robot.waitForIdle(delay);
+
+            for (int i = 0; i < n - 1; ++i) {
+                dialogs[i].checkUnblockedDialog(robot, i + ": A document modal " +
+                    "dialog which blocked this dialog was closed.");
+            }
+            frame.checkUnblockedFrame(robot,
+                "A blocking document modal dialog was closed.");
+            robot.waitForIdle(delay);
+
+        } finally {
+            EventQueue.invokeAndWait(this::closeAll);
+        }
+    }
+
+    private String getType(int i) {
+
+        switch (dialogs[i].getModalityType()) {
+            case APPLICATION_MODAL:
+                return "an application modal dialog";
+            case DOCUMENT_MODAL:
+                return "a document modal dialog";
+            case TOOLKIT_MODAL:
+                return "a toolkit modal dialog";
+        }
+        return "a modeless dialog";
+    }
+
+    private void closeAll() {
+
+        if (frame   != null) { frame.dispose(); }
+        if (dialogs != null) {
+            for (TestDialog dialog : dialogs) { dialog.dispose(); }
+        }
+    }
+
+    class CustomFrame extends TestFrame {
+
+        @Override
+        public void doOpenAction() {
+            if ((dialogs != null) && (dialogs.length > dialogCount)) {
+                dialogCount++;
+                if (dialogs[dialogCount] != null) {
+                    dialogs[dialogCount].setVisible(true);
+                }
+            }
+        }
+    }
+
+    class CustomDialog extends TestDialog {
+
+        public CustomDialog(Frame  f) { super(f); }
+        public CustomDialog(Dialog d) { super(d); }
+
+        @Override
+        public void doCloseAction() { this.dispose(); }
+    }
+
+
+    public static void main(String[] args) throws Exception {
+        (new MultipleDialogs1Test()).doTest();
+    }
+}