Skip to content

Commit d754399

Browse files
committed
8213110: Remove the use of applets in automatic tests
Reviewed-by: clanger Backport-of: b5998aa
1 parent 74c221b commit d754399

File tree

141 files changed

+739
-4048
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+739
-4048
lines changed

test/jdk/ProblemList.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
# jdk_awt
116116

117117
java/awt/Desktop/OpenByUNCPathNameTest/OpenByUNCPathNameTest.java 8239827 windows-all
118-
java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.html 8168389 windows-all,macosx-all
118+
java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.java 8168389 windows-all,macosx-all
119119
java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java 8224055 macosx-all
120120
java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java 8168408 windows-all,macosx-all
121121
java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java 8081489 generic-all
@@ -129,7 +129,7 @@ java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java 8060176
129129
java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java 8060176 windows-all,macosx-all
130130
java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java 8159694 linux-all
131131
java/awt/dnd/MissingEventsOnModalDialog/MissingEventsOnModalDialogTest.java 8164464 linux-all,macosx-all
132-
java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html 8171510 macosx-all
132+
java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java 8171510 macosx-all
133133
javax/swing/dnd/7171812/bug7171812.java 8041447 macosx-all
134134
java/awt/Focus/ChoiceFocus/ChoiceFocus.java 8169103 windows-all,macosx-all
135135
java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java 8198618 macosx-all
@@ -152,7 +152,7 @@ java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java 8168646 generic-all
152152
java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogButtonTest/EnqueueWithDialogButtonTest.java 8198623 macosx-all
153153
java/awt/KeyboardFocusmanager/TypeAhead/FreezeTest/FreezeTest.java 8198623 macosx-all
154154
java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html 8198624 macosx-all
155-
java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html 8198626 macosx-all
155+
java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.java 8198626 macosx-all
156156
java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java 8049405 macosx-all
157157
java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java 8048171 generic-all
158158
java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java 8159451 linux-all,windows-all,macosx-all
@@ -170,7 +170,7 @@ java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java 8079268 linux-all
170170
java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java 6829250 windows-all
171171
java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java 8159252 windows-all
172172
java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java 8203047 macosx-all
173-
java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html 8073636 macosx-all
173+
java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java 8073636 macosx-all
174174
java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java 7019055 windows-all,linux-all
175175
java/awt/Focus/8013611/JDK8013611.java 8175366 windows-all,macosx-all
176176
java/awt/Focus/6378278/InputVerifierTest.java 8198616 macosx-all
@@ -186,7 +186,7 @@ java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java 8129778
186186
java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java 8129778 generic-all
187187
java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java 8129778 generic-all
188188

189-
java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.html 8194947 generic-all
189+
java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java 8194947 generic-all
190190
java/awt/Frame/FramesGC/FramesGC.java 8079069 macosx-all
191191
java/awt/FullScreen/AltTabCrashTest/AltTabCrashTest.java 8047218 generic-all
192192
java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java 8000171 windows-all
@@ -252,13 +252,13 @@ java/awt/print/PrinterJob/PSQuestionMark.java 7003378 generic-all
252252
java/awt/print/PrinterJob/GlyphPositions.java 7003378 generic-all
253253
java/awt/print/PrinterJob/Margins.java 8196301 windows-all,macosx-all
254254
java/awt/PrintJob/PrinterException.java 8196301 windows-all,macosx-all
255-
java/awt/Choice/PopupPosTest/PopupPosTest.html 8192930 windows-all
255+
java/awt/Choice/PopupPosTest/PopupPosTest.java 8192930 windows-all
256256
java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java 7100044 macosx-all
257257
java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html 6849922 macosx-all
258258
java/awt/Component/GetScreenLocTest/GetScreenLocTest.java 4753654 generic-all
259259
java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java 8165863 macosx-all
260260
java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.html 8192929 windows-all,linux-all
261-
java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html 8017454 macosx-all
261+
java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java 8017454 macosx-all
262262
java/awt/Focus/NonFocusableWindowTest/NoEventsTest.java 8000171 windows-all
263263
java/awt/Frame/MiscUndecorated/RepaintTest.java 8079267 windows-all,linux-all
264264
java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java 8157173 generic-all
@@ -472,15 +472,15 @@ java/awt/image/VolatileImage/GradientPaints.java 8199003 linux-all
472472
java/awt/JAWT/JAWT.sh 8197798 windows-all
473473
java/awt/Debug/DumpOnKey/DumpOnKey.java 8202667 windows-all
474474
java/awt/Robot/RobotWheelTest/RobotWheelTest.java 8129827 generic-all
475-
java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.html 8202926 linux-all
475+
java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.java 8202926 linux-all
476476
java/awt/datatransfer/ConstructFlavoredObjectTest/ConstructFlavoredObjectTest.java 8202860 linux-all
477477
java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java 8202790 macosx-all,linux-all
478-
java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html 8202882 linux-all
478+
java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java 8202882 linux-all
479479
java/awt/MenuBar/8007006/bug8007006.java 8202886 macosx-all
480480
java/awt/Frame/FramesGC/FramesGC.java 8079069 macosx-all
481481
java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java 8030121 macosx-all
482482
java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java 8202931 macosx-all,linux-all
483-
java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html 7124275 macosx-all
483+
java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java 7124275 macosx-all
484484
java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java 6848810 macosx-all
485485
java/awt/Component/NativeInLightShow/NativeInLightShow.java 8202932 linux-all
486486
java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java 8194751 linux-all
@@ -489,7 +489,7 @@ java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.j
489489
java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java 7107528 linux-all,macosx-all
490490
java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java 8080676 linux-all
491491
java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersInKeyEvent.java 8157147 linux-all,solaris-all,windows-all,macosx-all
492-
java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html 8148041 linux-all
492+
java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.java 8148041 linux-all
493493
java/awt/Toolkit/DesktopProperties/rfe4758438.java 8193547 linux-all
494494
java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java 6847163
495495
java/awt/xembed/server/RunTestXEmbed.java 7034201 linux-all

test/jdk/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.html

Lines changed: 0 additions & 46 deletions
This file was deleted.

test/jdk/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -22,27 +22,32 @@
2222
*/
2323

2424
/*
25-
test
25+
@test
26+
@key headful
2627
@bug 6200670
2728
@summary MouseMoved events are triggered by Choice when mouse is moved outside the component, XToolkit
2829
@library ../../regtesthelpers/
29-
@author andrei.dmitriev area=choice
3030
@build Util
31-
@run applet PopdownGeneratesMouseEvents.html
31+
@run main PopdownGeneratesMouseEvents
3232
*/
3333

3434
import test.java.awt.regtesthelpers.Util;
3535

36-
import java.applet.Applet;
3736
import java.awt.*;
3837
import java.awt.event.*;
3938

40-
public class PopdownGeneratesMouseEvents extends Applet {
39+
public class PopdownGeneratesMouseEvents extends Frame {
4140
private volatile Robot robot;
4241
private final Choice choice1 = new Choice();
4342

4443
private volatile MouseMotionHandler mmh;
4544

45+
public static void main(final String[] args) {
46+
PopdownGeneratesMouseEvents app = new PopdownGeneratesMouseEvents();
47+
app.init();
48+
app.start();
49+
}
50+
4651
public void init() {
4752
for (int i = 1; i < 10; i++) {
4853
choice1.add("item-0" + i);
@@ -61,6 +66,7 @@ public void init() {
6166

6267
public void start() {
6368
setSize(300, 200);
69+
setLocationRelativeTo(null);
6470
setVisible(true);
6571
validate();
6672
String toolkit = Toolkit.getDefaultToolkit().getClass().getName();

test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.html

Lines changed: 0 additions & 47 deletions
This file was deleted.

test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
*/
2323

2424
/*
25-
test
25+
@test
26+
@key headful
2627
@bug 5044150
2728
@summary Tests that pupup doesn't popdown if no space to display under
2829
@author andrei.dmitriev area=awt.choice
2930
@library ../../../../lib/testlibrary
3031
@build jdk.testlibrary.OSInfo
31-
@run applet PopupPosTest.html
32+
@run main PopupPosTest
3233
*/
3334

3435
import java.applet.Applet;
@@ -37,10 +38,9 @@
3738

3839
import jdk.testlibrary.OSInfo;
3940

40-
public class PopupPosTest extends Applet
41+
public class PopupPosTest
4142
{
42-
public void start ()
43-
{
43+
public static void main(final String[] args) {
4444
if(OSInfo.getOSType().equals(OSInfo.OSType.MACOSX)) {
4545
// On OS X, popup isn't under the mouse
4646
return;

test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html

Lines changed: 0 additions & 45 deletions
This file was deleted.

test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,19 @@
2222
*/
2323

2424
/*
25+
@test
26+
@key headful
2527
@bug 6392086 8014725
26-
@summary Tests basic DnD functionality in an applet
27-
@author Alexey Utkin, Semyon Sadetsky
28-
@run applet HTMLTransferTest.html
28+
@summary tests that HTMLs of all supported native HTML formats are transfered
29+
properly
30+
@run main/othervm HTMLTransferTest
2931
*/
3032

31-
/**
32-
* HTMLTransferTest.java
33-
*
34-
* summary: tests that HTMLs of all supported native HTML formats
35-
* are transfered properly
36-
*/
37-
38-
import java.applet.Applet;
3933
import java.awt.*;
4034
import java.awt.datatransfer.*;
4135
import java.io.*;
4236

43-
44-
public class HTMLTransferTest extends Applet {
37+
public class HTMLTransferTest {
4538
public static final int CODE_NOT_RETURNED = 100;
4639
public static final int CODE_CONSUMER_TEST_FAILED = 101;
4740
public static final int CODE_FAILURE = 102;
@@ -66,6 +59,12 @@ public class HTMLTransferTest extends Applet {
6659
private THTMLProducer imPr;
6760
private int returnCode = CODE_NOT_RETURNED;
6861

62+
public static void main(final String[] args) {
63+
HTMLTransferTest app = new HTMLTransferTest();
64+
app.init();
65+
app.start();
66+
}
67+
6968
public void init() {
7069
initImpl();
7170

0 commit comments

Comments
 (0)