Skip to content

Commit

Permalink
Test fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@naotoj
naotoj committed Nov 3, 2023
1 parent 9c38a55 commit 10518c1
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 120 deletions.
87 changes: 0 additions & 87 deletions test/jdk/java/text/Format/CompactNumberFormat/TestWithCompatProvider.java
View file

This file was deleted.

27 changes: 23 additions & 4 deletions test/jdk/java/text/Format/DateFormat/Bug4823811.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2023, 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
Expand All @@ -23,14 +23,15 @@

/**
* @test
* @bug 4823811 8008577
* @bug 4823811 8008577 8174269
* @summary Confirm that text which includes numbers with a trailing minus sign is parsed correctly.
* @modules jdk.localedata
* @run main/othervm -Duser.timezone=GMT+09:00 -Djava.locale.providers=JRE,SPI Bug4823811
* @run main/othervm -Duser.timezone=GMT+09:00 Bug4823811
*/

import java.text.*;
import java.util.*;
import java.util.stream.Collectors;

public class Bug4823811 {

Expand Down Expand Up @@ -316,7 +317,7 @@ public static void main(String[] args) {
/*
* Test SimpleDateFormat.parse() and format() for modified
* SimpleDateFormat instances using an original minus sign,
* pattern, and diffenrent month names in DecimalFormat
* pattern, and different month names in DecimalFormat
*/
testDateFormat2();

Expand Down Expand Up @@ -494,6 +495,9 @@ private static void testDateFormatFormattingInRTL(String pattern,
.replaceAll("JULY", (useEnglishMonthName ?
JulyInEnglish : JulyInArabic))
.replaceAll(" ", delimiters[delimiter]);
if (!useEnglishMonthName) {
expected = convertLocalDigits(expected);
}
testDateFormatFormatting(sdf, pattern, datesEG[basePattern][i],
expected, locale.toString());
}
Expand Down Expand Up @@ -522,6 +526,9 @@ private static void testDateFormatFormattingInLTR(String pattern,
.replaceAll("JULY", (useEnglishMonthName ?
JulyInEnglish : JulyInArabic))
.replaceAll(" ", delimiters[delimiter]);
if (!useEnglishMonthName) {
expected = convertLocalDigits(expected);
}
testDateFormatFormatting(sdf, pattern, datesUS[basePattern][i],
expected, locale.toString());
}
Expand Down Expand Up @@ -573,6 +580,9 @@ private static void testDateFormatParsingInRTL(String pattern,
String given = datesToParse[basePattern][i]
.replaceAll(" ", specialDelimiters[0][delimiter])
.replaceAll(" ", delimiters[delimiter]);
if (!useEnglishMonthName) {
given = convertLocalDigits(given);
}

testDateFormatParsing(sdf, pattern,
given.replaceAll("JULY", (useEnglishMonthName ?
Expand All @@ -597,6 +607,9 @@ private static void testDateFormatParsingInLTR(String pattern,
String given = datesToParse[basePattern][i]
.replaceAll(" ", specialDelimiters[1][delimiter])
.replaceAll(" ", delimiters[delimiter]);
if (!useEnglishMonthName) {
given = convertLocalDigits(given);
}

testDateFormatParsing(sdf, pattern,
given.replaceAll("JULY", (useEnglishMonthName ?
Expand Down Expand Up @@ -788,4 +801,10 @@ private static void testNumberFormatParsingCheckException(NumberFormat nf,
}
}

private static String convertLocalDigits(String input) {
return input.codePoints()
.map(cp -> (cp < '0' || cp > '9' ? cp : cp + 0x630))
.mapToObj(Character::toString)
.collect(Collectors.joining());
}
}
34 changes: 17 additions & 17 deletions test/jdk/java/text/Format/DateFormat/Bug6683975.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2023, 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
Expand All @@ -23,10 +23,10 @@

/**
* @test
* @bug 6683975 8008577
* @bug 6683975 8008577 8174269
* @summary Make sure that date is formatted correctlyin th locale.
* @modules jdk.localedata
* @run main/othervm -Djava.locale.providers=JRE,SPI Bug6683975
* @run main Bug6683975
*/
import java.text.*;
import java.util.*;
Expand All @@ -38,16 +38,16 @@ public class Bug6683975 {
private static Locale th = Locale.of("th");
private static Locale th_TH = Locale.of("th", "TH");
private static String expected_th[] = {
"\u0e27\u0e31\u0e19\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23\u0e17\u0e35\u0e48 30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 \u0e04.\u0e28. 2008, 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 0 \u0e19\u0e32\u0e17\u0e35 00 \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35", // 0: FULL
"30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 2008, 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 0 \u0e19\u0e32\u0e17\u0e35", // 1: LONG
"30 \u0e01.\u0e22. 2008, 8:00:00", // 2: MEDIUM
"30/9/2008, 8:00 \u0e19.", // 3: SHORT
"\u0e27\u0e31\u0e19\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23\u0e17\u0e35\u0e48 30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 \u0e04.\u0e28. 2008 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 00 \u0e19\u0e32\u0e17\u0e35 00 \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35 \u0e40\u0e27\u0e25\u0e32\u0e2d\u0e2d\u0e21\u0e41\u0e2a\u0e07\u0e41\u0e1b\u0e0b\u0e34\u0e1f\u0e34\u0e01\u0e43\u0e19\u0e2d\u0e40\u0e21\u0e23\u0e34\u0e01\u0e32\u0e40\u0e2b\u0e19\u0e37\u0e2d", // 0: FULL
"30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 \u0e04.\u0e28. 2008 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 00 \u0e19\u0e32\u0e17\u0e35 00 \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35 PDT", // 1: LONG
"30 \u0e01.\u0e22. 2008 08:00:00", // 2: MEDIUM
"30/9/08 08:00", // 3: SHORT
};
private static String expected_th_TH[] = {
"\u0e27\u0e31\u0e19\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23\u0e17\u0e35\u0e48 30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 \u0e1e.\u0e28. 2551, 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 0 \u0e19\u0e32\u0e17\u0e35 00 \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35", // 0: FULL
"30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 2551, 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 0 \u0e19\u0e32\u0e17\u0e35", // 1: LONG
"30 \u0e01.\u0e22. 2551, 8:00:00", // 2: MEDIUM
"30/9/2551, 8:00 \u0e19." // 3: SHORT
"\u0e27\u0e31\u0e19\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23\u0e17\u0e35\u0e48 30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 \u0e1e\u0e38\u0e17\u0e18\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a 2551 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 00 \u0e19\u0e32\u0e17\u0e35 00 \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35 \u0e40\u0e27\u0e25\u0e32\u0e2d\u0e2d\u0e21\u0e41\u0e2a\u0e07\u0e41\u0e1b\u0e0b\u0e34\u0e1f\u0e34\u0e01\u0e43\u0e19\u0e2d\u0e40\u0e21\u0e23\u0e34\u0e01\u0e32\u0e40\u0e2b\u0e19\u0e37\u0e2d", // 0: FULL
"30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 2551 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 00 \u0e19\u0e32\u0e17\u0e35 00 \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35 PDT", // 1: LONG
"30 \u0e01.\u0e22. 2551 08:00:00", // 2: MEDIUM
"30/9/51 08:00" // 3: SHORT
};
private static String stylePattern[] = {
"FULL", "LONG", "MEDIUM", "SHORT"
Expand All @@ -59,12 +59,12 @@ private static void test(int style) {

String str_th = ((SimpleDateFormat)df_th).toPattern();
String str_th_TH = ((SimpleDateFormat)df_th_TH).toPattern();
if (!str_th.equals(str_th_TH)) {
err = true;
System.err.println("Error: Pattern for th locale should be the same as pattern for th_TH locale. (" + stylePattern[style] + ")");
System.err.println("\tth: " + str_th);
System.err.println("\tth_TH: " + str_th_TH);
}
// if (!str_th.equals(str_th_TH)) {
// err = true;
// System.err.println("Error: Pattern for th locale should be the same as pattern for th_TH locale. (" + stylePattern[style] + ")");
// System.err.println("\tth: " + str_th);
// System.err.println("\tth_TH: " + str_th_TH);
// }

@SuppressWarnings("deprecation")
Date date = new Date(2008-1900, Calendar.SEPTEMBER, 30, 8, 0, 0);
Expand Down
12 changes: 6 additions & 6 deletions test/jdk/java/text/Format/DateFormat/ContextMonthNamesTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2023, 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
Expand All @@ -23,10 +23,10 @@

/*
* @test
* @bug 7079560 8008577
* @bug 7079560 8008577 8174269
* @summary Unit test for context-sensitive month names
* @modules jdk.localedata
* @run main/othervm -Djava.locale.providers=JRE,SPI ContextMonthNamesTest
* @run main ContextMonthNamesTest
*/

import java.text.*;
Expand All @@ -47,11 +47,11 @@ public class ContextMonthNamesTest {
// NOTE: expected results are locale data dependent.
static String[] EXPECTED = {
"30. ledna 2012",
"30. Led 2012",
"30. led 2012",
"leden",
"I",
"led",
"30. leden 2012",
"30. I 2012",
"30. led 2012",
};

public static void main(String[] args) {
Expand Down
12 changes: 6 additions & 6 deletions test/jdk/java/text/Format/DateFormat/LocaleDateFormats.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2023, 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
Expand All @@ -23,9 +23,9 @@

/**
* @test
* @bug 8080774
* @bug 8080774 8174269
* @modules jdk.localedata
* @run testng/othervm -Djava.locale.providers=JRE,CLDR LocaleDateFormats
* @run testng LocaleDateFormats
* @summary This file contains tests for JRE locales date formats
*/

Expand Down Expand Up @@ -54,9 +54,9 @@ private Object[][] dateFormats() {
//8080774
//Locale, Format type, year, month, date, expected result
{localeEnSG, DateFormat.SHORT, 2015, 5, 6, "6/5/15"},
{localeEnSG, DateFormat.MEDIUM, 2015, 5, 6, "6 May, 2015"},
{localeEnSG, DateFormat.LONG, 2015, 5, 6, "6 May, 2015"},
{localeEnSG, DateFormat.FULL, 2015, 5, 6, "Wednesday, 6 May, 2015"}
{localeEnSG, DateFormat.MEDIUM, 2015, 5, 6, "6 May 2015"},
{localeEnSG, DateFormat.LONG, 2015, 5, 6, "6 May 2015"},
{localeEnSG, DateFormat.FULL, 2015, 5, 6, "Wednesday, 6 May 2015"}
};
}
// en_SG Locale instance
Expand Down

0 comments on commit 10518c1

Please sign in to comment.