Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JDK-8328190 : Convert AWTPanelSmoothWheel.html applet test to main #18312

Closed
wants to merge 16 commits into from
+131 −294
Closed

JDK-8328190 : Convert AWTPanelSmoothWheel.html applet test to main #18312

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
adeea7c
moved test file
honkar-jdk Mar 14, 2024
b976b79
delete .html file
honkar-jdk Mar 14, 2024
c6d4b25
converted test to main
honkar-jdk Mar 14, 2024
867825a
title change
honkar-jdk Mar 14, 2024
0226661
@requires tag
honkar-jdk Mar 14, 2024
badef1d
default timeout used
honkar-jdk Mar 14, 2024
c6f6070
whitespace removed
honkar-jdk Mar 14, 2024
627ec86
ordering of imports
honkar-jdk Mar 14, 2024
f806ec5
Merge branch 'master' into WheelRotation_8328190
honkar-jdk Mar 15, 2024
a2b9b95
used PassFailJFrame.logArea()
honkar-jdk Mar 15, 2024
0299e8e
minor changes
honkar-jdk Mar 18, 2024
d81df88
semi-automated test, removed @requires windows tag
honkar-jdk Mar 19, 2024
6b7591f
added preciseWheelRotation logic & updated test
honkar-jdk Mar 21, 2024
6901a65
converted to semi-automatic, use of JOptionPane for warning msg
honkar-jdk Mar 21, 2024
ec67314
changed the forcePass logic, updated instructions
honkar-jdk Mar 21, 2024
701e90a
Instructions updated
honkar-jdk Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 38 additions & 16 deletions test/jdk/java/awt/event/MouseEvent/AWTPanelSmoothWheel.java
View file
Original file line number Diff line number Diff line change
@@ -25,50 +25,72 @@
import java.awt.Color;
import java.awt.Frame;
import java.awt.Panel;
import java.awt.event.MouseWheelEvent;

/*
* @test
* @bug 6730447
* @summary [Win] To verify the support for high resolution mouse wheel on Windows.
* @summary To verify the support for high resolution mouse wheel.
* AWT panel needs to support high-res mouse wheel rotation.
* @requires (os.family == "windows")
* @library /java/awt/regtesthelpers
* @build PassFailJFrame
* @run main/manual AWTPanelSmoothWheel
*/

public class AWTPanelSmoothWheel {
public static final String INSTRUCTIONS = """
This test is relevant for windows platforms and mouses with high-resolution wheel,
please just press pass if this is not the case.
private static int wheelEventCount = 0;
private static final String INSTRUCTIONS = """
<html>
<body>
This test is relevant on platforms with high-resolution mouse wheel,
please press PASS if this is not the case.<br> <br>

Place the mouse cursor above the green panel and rotate the mouse wheel,
the test will print all mouse wheel event messages into the logging panel
below the instruction window.
Please make sure that some of the messages have non-zero 'wheelRotation' value,
and also check if the test works OK if the mouse wheel is rotated very slow.
below the instruction window.<br> <br>

If the above is true press PASS, else FAIL.
Check if the test works OK when the mouse wheel is rotated very slow.<br> <br>

This is a semi-automated test, when 5 or more MouseWheelEvents with
<br><b> scrollType=WHEEL_UNIT_SCROLL and wheelRotation != 0 </b> <br>
are recorded, the test automatically passes.<br>
The events are also logged in the logging panel
for user reference.<br> <br>

<hr>
PS: If you don't see events with scrollType=WHEEL_UNIT_SCROLL,
then the mouse doesn't support high-resolution scrolling.<br> <br>
</body>
</html>
""";

public static void main (String[] args) throws Exception {
public static void main(String[] args) throws Exception {
PassFailJFrame.builder()
.title("Test Instructions")
.instructions(INSTRUCTIONS)
.rows((int) INSTRUCTIONS.lines().count() + 2)
.columns(45)
.logArea(8)
.rows(18)
.columns(50)
.logArea(10)
.testUI(AWTPanelSmoothWheel::createUI)
.build()
.awaitAndCheck();
}

private static Frame createUI () {
private static Frame createUI() {
Frame frame = new Frame("Test Wheel Rotation");
Panel panel = new Panel();
panel.setBackground(Color.GREEN);
panel.addMouseWheelListener(e -> PassFailJFrame.log(e.toString()));
frame.setSize (200, 200);
panel.addMouseWheelListener(e -> {
PassFailJFrame.log(e.toString());
if (e.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL
&& e.getWheelRotation() != 0) {
wheelEventCount++;
}
if (wheelEventCount > 5) {
PassFailJFrame.forcePass();
}
Copy link
Member

@aivanov-jdk aivanov-jdk Mar 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This logging style is easier to parse, thanks.

You have nearly all the data to make the test semi-automatic. What's missing is wheelRotationCount.

This diff implements this feature. For convenience, I'll paste the diff inline too:

diff --git a/test/jdk/java/awt/event/MouseEvent/AWTPanelSmoothWheel.java b/test/jdk/java/awt/event/MouseEvent/AWTPanelSmoothWheel.java
index 1097d1dcb04..f3dd8294e8b 100644
--- a/test/jdk/java/awt/event/MouseEvent/AWTPanelSmoothWheel.java
+++ b/test/jdk/java/awt/event/MouseEvent/AWTPanelSmoothWheel.java
@@ -39,7 +39,9 @@

 public class AWTPanelSmoothWheel {
     private static int wheelEventCount = 0;
+    private static int wheelRotationCount = 0;
     private static int hiResWheelCount = 0;
+
     private static final String INSTRUCTIONS = """
             <html>
             <body>
@@ -92,12 +94,21 @@ private static Frame createUI() {
                         + " --- Wheel Rotation: " + e.getWheelRotation()
                         + " --- Precise Wheel Rotation: "
                         + String.format("%.2f", e.getPreciseWheelRotation()));
+                if (e.getWheelRotation() >= 1) {
+                    wheelRotationCount += e.getWheelRotation();
+                }
                 if (e.getPreciseWheelRotation() < 1) {
                     hiResWheelCount++;
                 }
                 if (wheelEventCount >= 5 && hiResWheelCount == 0) {
                     PassFailJFrame.log("WARNING !!! You might not be using a high-res mouse.");
                 }
+                if (wheelRotationCount > 5
+                    && (hiResWheelCount / 2 >= wheelRotationCount)) {
+                    PassFailJFrame.log("The test passes: hiResWheelCount = " + hiResWheelCount
+                                       + " wheelRotationCount = " + wheelRotationCount);
+                    PassFailJFrame.forcePass();
+                }
             }
         });
         frame.setSize (400, 200);

});
frame.setSize (400, 200);
frame.setLayout(new BorderLayout());
frame.add(panel, BorderLayout.CENTER);
return frame;