aboutsummaryrefslogtreecommitdiff
path: root/test/java
diff options
context:
space:
mode:
authorDenis Fokin <Denis.Fokin@jetbrains.com>2017-02-08 16:22:49 +0300
committerAlexey Ushakov <Alexey.Ushakov@jetbrains.com>2017-03-31 16:48:34 +0300
commita26ff9e661393de11f4b992d1ff31210f958e501 (patch)
tree9d1d7c7a265295905fc44907805ad6cec60ec0cf /test/java
parent246ac653b48c130c1718b9966fc37907058fbefe (diff)
downloadjdk8u_jdk-a26ff9e661393de11f4b992d1ff31210f958e501.tar.gz
JRE-149 java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java: Pressed char is not dead acute
Diffstat (limited to 'test/java')
-rw-r--r--test/java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java9
-rw-r--r--test/java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java20
2 files changed, 9 insertions, 20 deletions
diff --git a/test/java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java b/test/java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java
index 668673362b..722b9ad9eb 100644
--- a/test/java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java
+++ b/test/java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java
@@ -99,13 +99,10 @@ public class DeadKeyMacOSXInputText {
state++;
break;
case 1:
- if (keyCode != KeyEvent.VK_DEAD_ACUTE) {
- throw new RuntimeException("Dead ACUTE is not pressed.");
+ if (keyCode != KeyEvent.VK_E) {
+ throw new RuntimeException("E is not pressed.");
}
- // We are sending char that is written on the keyboard key.
- //if (keyChar != 0xB4) {
- // throw new RuntimeException("Pressed char is not dead acute.");
- //}
+
state++;
break;
}
diff --git a/test/java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java b/test/java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java
index a47719c5b5..afce1a32cc 100644
--- a/test/java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java
+++ b/test/java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java
@@ -95,13 +95,9 @@ public class deadKeyMacOSX {
state++;
break;
case 1:
- if (keyCode != KeyEvent.VK_DEAD_ACUTE) {
- throw new RuntimeException("Dead ACUTE is not pressed.");
+ if (keyCode != KeyEvent.VK_E) {
+ throw new RuntimeException("E is not pressed.");
}
- // We should not send dead key char here
- //if (keyChar != 0xB4) {
- // throw new RuntimeException("Pressed char is not dead acute.");
- //}
state++;
break;
@@ -109,10 +105,6 @@ public class deadKeyMacOSX {
if (keyCode != KeyEvent.VK_A) {
throw new RuntimeException("A is not pressed.");
}
- // We should not send dead key char here
- //if (keyChar != 0xE1) {
- // throw new RuntimeException("A char does not have ACCUTE accent");
- //}
state++;
break;
default:
@@ -127,15 +119,15 @@ public class deadKeyMacOSX {
if (state == 3) {
// Now we send key codes
-// if (keyCode != 0) {
-// throw new RuntimeException("Key code should be undefined.");
-// }
+ if (keyCode != KeyEvent.VK_A) {
+ throw new RuntimeException("Key code should be undefined.");
+ }
// This works for US keyboard only
if (keyChar != 0xE1) {
throw new RuntimeException("A char does not have ACCUTE accent");
}
} else {
- throw new RuntimeException("Wron number of keyTyped events.");
+ throw new RuntimeException("Wrong number of keyTyped events.");
}
}
}