This repository has been archived by the owner on Sep 29, 2021. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8206120: Add test cases for lenient Japanese era parsing
8211398: Square character support for the Japanese new era 8218915: Change isJavaIdentifierStart and isJavaIdentifierPart to handle new code points Reviewed-by: coffeys, naoto Contributed-by: deepak.kejriwal@oracle.com
- Loading branch information
rpatil
committed
Feb 22, 2019
1 parent
41cc5c8
commit 686855c
Showing
9 changed files
with
395 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
290 changes: 290 additions & 0 deletions
290
test/jdk/java/lang/Character/TestIsJavaIdentifierMethods.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,290 @@ | ||
| /* | ||
| * Copyright (c) 2019, 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 | ||
| * @summary Test behavior of isJavaIdentifierXX, isJavaLetter, and | ||
| * isJavaLetterOrDigit methods for all code points. | ||
| * @bug 8218915 | ||
| */ | ||
|
|
||
| public class TestIsJavaIdentifierMethods { | ||
|
|
||
| // Japanese Era Square character code point not present in Unicode 10.0 | ||
| private static final int JAPANESE_ERA_CODEPOINT = 0x32FF; | ||
|
|
||
| public static void main(String[] args) { | ||
| testIsJavaIdentifierPart_int(); | ||
| testIsJavaIdentifierPart_char(); | ||
| testIsJavaIdentifierStart_int(); | ||
| testIsJavaIdentifierStart_char(); | ||
| testIsJavaLetter(); | ||
| testIsJavaLetterOrDigit(); | ||
| } | ||
|
|
||
| /** | ||
| * Assertion testing for public static boolean isJavaIdentifierPart(int | ||
| * codePoint), A character may be part of a Java identifier if any of the | ||
| * following are true: | ||
| * <ul> | ||
| * <li>it is a letter</li> | ||
| * <li>it is a currency symbol (such as <code>'$'</code>)</li> | ||
| * <li>it is a connecting punctuation character (such as <code>'_'</code>) | ||
| * </li> | ||
| * <li>it is a digit</li> | ||
| * <li>it is a numeric letter (such as a Roman numeral character)</li> | ||
| * <li>it is a combining mark</li> | ||
| * <li>it is a non-spacing mark</li> | ||
| * <li><code>isIdentifierIgnorable</code> returns <code>true</code> for the | ||
| * character</li> | ||
| * </ul> | ||
| * All code points from (0x0000..0x10FFFF) are tested. | ||
| */ | ||
| public static void testIsJavaIdentifierPart_int() { | ||
| for (int cp = 0; cp <= Character.MAX_CODE_POINT; cp++) { | ||
| boolean expected = false; | ||
| // Since Character.isJavaIdentifierPart(int) strictly conforms to | ||
| // character information from version 10.0 of the Unicode Standard, | ||
| // check if code point is "Japanese Era Square character code | ||
| // point". If the code point is "Japanese Era Square character code | ||
| // point", value of variable "expected" is considered false. | ||
| if (cp != JAPANESE_ERA_CODEPOINT) { | ||
| byte type = (byte) Character.getType(cp); | ||
| expected = Character.isLetter(cp) | ||
| || type == Character.CURRENCY_SYMBOL | ||
| || type == Character.CONNECTOR_PUNCTUATION | ||
| || Character.isDigit(cp) | ||
| || type == Character.LETTER_NUMBER | ||
| || type == Character.COMBINING_SPACING_MARK | ||
| || type == Character.NON_SPACING_MARK | ||
| || Character.isIdentifierIgnorable(cp); | ||
| } | ||
|
|
||
| if (Character.isJavaIdentifierPart(cp) != expected) { | ||
| throw new RuntimeException( | ||
| "Character.isJavaIdentifierPart(int) failed for codepoint " | ||
| + Integer.toHexString(cp)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Assertion testing for public static boolean isJavaIdentifierPart(char | ||
| * ch), A character may be part of a Java identifier if any of the | ||
| * following are true: | ||
| * <ul> | ||
| * <li>it is a letter; | ||
| * <li>it is a currency symbol (such as "$"); | ||
| * <li>it is a connecting punctuation character (such as "_"); | ||
| * <li>it is a digit; | ||
| * <li>it is a numeric letter (such as a Roman numeral character); | ||
| * <li>it is a combining mark; | ||
| * <li>it is a non-spacing mark; | ||
| * <li>isIdentifierIgnorable returns true for the character. | ||
| * </ul> | ||
| * All Unicode code points in the BMP (0x0000..0xFFFF) are tested. | ||
| */ | ||
| public static void testIsJavaIdentifierPart_char() { | ||
| for (int i = 0; i <= Character.MAX_VALUE; ++i) { | ||
| char ch = (char) i; | ||
| boolean expected = false; | ||
| // Since Character.isJavaIdentifierPart(char) strictly conforms to | ||
| // character information from version 10.0 of the Unicode Standard, | ||
| // check if code point is "Japanese Era Square character code | ||
| // point". If the code point is "Japanese Era Square character code | ||
| // point", value of variable "expected" is considered false. | ||
| if (i != JAPANESE_ERA_CODEPOINT) { | ||
| byte type = (byte) Character.getType(ch); | ||
| expected = Character.isLetter(ch) | ||
| || type == Character.CURRENCY_SYMBOL | ||
| || type == Character.CONNECTOR_PUNCTUATION | ||
| || Character.isDigit(ch) | ||
| || type == Character.LETTER_NUMBER | ||
| || type == Character.COMBINING_SPACING_MARK | ||
| || type == Character.NON_SPACING_MARK | ||
| || Character.isIdentifierIgnorable(ch); | ||
| } | ||
|
|
||
| if (Character.isJavaIdentifierPart((char) i) != expected) { | ||
| throw new RuntimeException( | ||
| "Character.isJavaIdentifierPart(char) failed for codepoint " | ||
| + Integer.toHexString(i)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Assertion testing for public static boolean isJavaIdentifierStart(int | ||
| * codePoint), A character may start a Java identifier if and only if it is | ||
| * one of the following: | ||
| * <ul> | ||
| * <li>it is a letter;</li> | ||
| * <li>getType(ch) returns LETTER_NUMBER;</li> | ||
| * <li>it is a currency symbol (such as "$");</li> | ||
| * <li>it is a connecting punctuation character (such as "_");</li> | ||
| * </ul> | ||
| * All Code points from (0x0000..0x10FFFF) are tested. | ||
| */ | ||
| public static void testIsJavaIdentifierStart_int() { | ||
| for (int cp = 0; cp <= Character.MAX_CODE_POINT; cp++) { | ||
| boolean expected = false; | ||
| // Since Character.isJavaIdentifierStart(int) strictly conforms to | ||
| // character information from version 10.0 of the Unicode Standard, | ||
| // check if code point is "Japanese Era Square character code | ||
| // point". If the code point is "Japanese Era Square character code | ||
| // point", value of variable "expected" is considered false. | ||
| if (cp != JAPANESE_ERA_CODEPOINT) { | ||
| byte type = (byte) Character.getType(cp); | ||
| expected = Character.isLetter(cp) | ||
| || type == Character.LETTER_NUMBER | ||
| || type == Character.CURRENCY_SYMBOL | ||
| || type == Character.CONNECTOR_PUNCTUATION; | ||
| } | ||
|
|
||
| if (Character.isJavaIdentifierStart(cp) != expected) { | ||
| throw new RuntimeException( | ||
| "Character.isJavaIdentifierStart(int) failed for codepoint " | ||
| + Integer.toHexString(cp)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Assertion testing for public static boolean isJavaIdentifierStart(char), | ||
| * A character may start a Java identifier if and only if it is | ||
| * one of the following: | ||
| * <ul> | ||
| * <li>it is a letter;</li> | ||
| * <li>getType(ch) returns LETTER_NUMBER;</li> | ||
| * <li>it is a currency symbol (such as "$");</li> | ||
| * <li>it is a connecting punctuation character (such as "_");</li> | ||
| * </ul> | ||
| * All Unicode code points in the BMP (0x0000..0xFFFF) are tested. | ||
| */ | ||
| public static void testIsJavaIdentifierStart_char() { | ||
| for (int i = 0; i <= Character.MAX_VALUE; i++) { | ||
| char ch = (char) i; | ||
| boolean expected = false; | ||
| // Since Character.isJavaIdentifierStart(char) strictly conforms to | ||
| // character information from version 10.0 of the Unicode Standard, | ||
| // check if code point is "Japanese Era Square character code | ||
| // point". If the code point is "Japanese Era Square character code | ||
| // point", value of variable "expected" is considered false. | ||
| if (i != JAPANESE_ERA_CODEPOINT) { | ||
| byte type = (byte) Character.getType(ch); | ||
| expected = Character.isLetter(ch) | ||
| || type == Character.LETTER_NUMBER | ||
| || type == Character.CURRENCY_SYMBOL | ||
| || type == Character.CONNECTOR_PUNCTUATION; | ||
| } | ||
|
|
||
| if (Character.isJavaIdentifierStart(ch) != expected) { | ||
| throw new RuntimeException( | ||
| "Character.isJavaIdentifierStart(char) failed for codepoint " | ||
| + Integer.toHexString(i)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Assertion testing for public static boolean isJavaLetter(char ch), A | ||
| * character may start a Java identifier if and only if one of the following | ||
| * is true: | ||
| * <ul> | ||
| * <li>isLetter(ch) returns true | ||
| * <li>getType(ch) returns LETTER_NUMBER | ||
| * <li>ch is a currency symbol (such as "$") | ||
| * <li>ch is a connecting punctuation character (such as "_"). | ||
| * </ul> | ||
| * All Unicode code points in the BMP (0x0000..0xFFFF) are tested. | ||
| */ | ||
| public static void testIsJavaLetter() { | ||
| for (int i = 0; i <= Character.MAX_VALUE; ++i) { | ||
| char ch = (char) i; | ||
| boolean expected = false; | ||
| // Since Character.isJavaLetter(char) strictly conforms to | ||
| // character information from version 10.0 of the Unicode Standard, | ||
| // check if code point is "Japanese Era Square character code | ||
| // point". If the code point is "Japanese Era Square character code | ||
| // point", value of variable "expected" is considered false. | ||
| if (i != JAPANESE_ERA_CODEPOINT) { | ||
| byte type = (byte) Character.getType(ch); | ||
| expected = Character.isLetter(ch) | ||
| || type == Character.LETTER_NUMBER | ||
| || type == Character.CURRENCY_SYMBOL | ||
| || type == Character.CONNECTOR_PUNCTUATION; | ||
| } | ||
|
|
||
| if (Character.isJavaLetter(ch) != expected) { | ||
| throw new RuntimeException( | ||
| "Character.isJavaLetter(ch) failed for codepoint " | ||
| + Integer.toHexString(i)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Assertion testing for public static boolean isJavaLetterOrDigit(char ch), | ||
| * A character may be part of a Java identifier if and only if any of the | ||
| * following are true: | ||
| * <ul> | ||
| * <li>it is a letter | ||
| * <li>it is a currency symbol (such as '$') | ||
| * <li>it is a connecting punctuation character (such as '_') | ||
| * <li>it is a digit | ||
| * <li>it is a numeric letter (such as a Roman numeral character) | ||
| * <li>it is a combining mark | ||
| * <li>it is a non-spacing mark | ||
| * <li>isIdentifierIgnorable returns true for the character. | ||
| * </ul> | ||
| * All Unicode code points in the BMP (0x0000..0xFFFF) are tested. | ||
| */ | ||
| public static void testIsJavaLetterOrDigit() { | ||
| for (int i = 0; i <= Character.MAX_VALUE; ++i) { | ||
| char ch = (char) i; | ||
| boolean expected = false; | ||
| // Since Character.isJavaLetterOrDigit(char) strictly conforms to | ||
| // character information from version 10.0 of the Unicode Standard, | ||
| // check if code point is "Japanese Era Square character code | ||
| // point". If the code point is "Japanese Era Square character code | ||
| // point", value of variable "expected" is considered false. | ||
| if (i != JAPANESE_ERA_CODEPOINT) { | ||
| byte type = (byte) Character.getType(ch); | ||
| expected = Character.isLetter(ch) | ||
| || type == Character.CURRENCY_SYMBOL | ||
| || type == Character.CONNECTOR_PUNCTUATION | ||
| || Character.isDigit(ch) | ||
| || type == Character.LETTER_NUMBER | ||
| || type == Character.COMBINING_SPACING_MARK | ||
| || type == Character.NON_SPACING_MARK | ||
| || Character.isIdentifierIgnorable(ch); | ||
| } | ||
|
|
||
| if (Character.isJavaLetterOrDigit(ch) != expected) { | ||
| throw new RuntimeException( | ||
| "Character.isJavaLetterOrDigit(ch) failed for codepoint " | ||
| + Integer.toHexString(i)); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Oops, something went wrong.