8181782: [TESTBUG] [Macosx] JTextAreaEmojiTest is not executed

Reviewed-by: psadhukhan, aniyogi
This commit is contained in:
Sreeprakash Sreedharan 2017-06-15 17:13:33 +05:30 committed by Ajit Ghaisas
parent 5abad61670
commit 0c47835ce9

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -33,12 +33,15 @@ import javax.swing.JPanel;
import javax.swing.JTextArea; import javax.swing.JTextArea;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import static javax.swing.WindowConstants.EXIT_ON_CLOSE; import static javax.swing.WindowConstants.EXIT_ON_CLOSE;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
/* @test /* @test
* @bug 8148555 * @key headful
* @bug 8148555 8181782
* @summary verifies JTextArea emoji enter exception. Emoji is not supported. * @summary verifies JTextArea emoji enter exception. Emoji is not supported.
* @requires (os.family=="mac") * @requires (os.family=="mac")
* @run main JTextAreaEmojiTest * @run main/manual JTextAreaEmojiTest
*/ */
public class JTextAreaEmojiTest implements public class JTextAreaEmojiTest implements
ActionListener { ActionListener {
@ -55,10 +58,16 @@ public class JTextAreaEmojiTest implements
private static JButton failButton; private static JButton failButton;
private static JFrame mainFrame; private static JFrame mainFrame;
private static final CountDownLatch testRunLatch = new CountDownLatch(1);
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
JTextAreaEmojiTest test = new JTextAreaEmojiTest(); JTextAreaEmojiTest test = new JTextAreaEmojiTest();
boolean status = testRunLatch.await(5, TimeUnit.MINUTES);
if (!status) {
throw new RuntimeException("Test timed out");
}
} }
public JTextAreaEmojiTest() throws Exception { public JTextAreaEmojiTest() throws Exception {
@ -143,7 +152,6 @@ public class JTextAreaEmojiTest implements
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
if (evt.getSource() instanceof JButton) { if (evt.getSource() instanceof JButton) {
JButton btn = (JButton) evt.getSource(); JButton btn = (JButton) evt.getSource();
cleanUp();
switch (btn.getActionCommand()) { switch (btn.getActionCommand()) {
case "Pass": case "Pass":
@ -151,10 +159,13 @@ public class JTextAreaEmojiTest implements
case "Fail": case "Fail":
throw new AssertionError("Test case has failed!"); throw new AssertionError("Test case has failed!");
} }
cleanUp();
} }
} }
private static void cleanUp() { private static void cleanUp() {
mainFrame.dispose(); mainFrame.dispose();
testRunLatch.countDown();
} }
} }