8310923: Refactor Currency tests to use JUnit #14682

justin-curtis-lu · 2023-06-27T19:04:35Z

Please review this PR which refactors Currency tests to use JUnit.

The most significant change occurs in ValidateISO4217.java. Other changes to this file excluding the JUnit refactoring include

Tests are no longer dependent on each other (order of execution does not matter)
Testing does not occur at the same time as data generation (The data is fully generated before any tests are executed)
Various cleanup (dead-code, clarifying comments, more descriptive method and var names)

Bug4512215.java now renamed to MinorUndefinedCodes was updated to remove redundant testing, and the file changed to focus on testing minor undefined currency codes instead.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8310923: Refactor Currency tests to use JUnit (Sub-task - P4)

Reviewers

Naoto Sato (@naotoj - Reviewer)
Lance Andersen (@LanceAndersen - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/14682/head:pull/14682
$ git checkout pull/14682

Update a local copy of the PR:
$ git checkout pull/14682
$ git pull https://git.openjdk.org/jdk.git pull/14682/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14682

View PR using the GUI difftool:
$ git pr show -t 14682

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/14682.diff

Webrev

Link to Webrev Comment

bridgekeeper · 2023-06-27T19:06:15Z

👋 Welcome back jlu! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2023-06-27T19:07:55Z

@justin-curtis-lu The following labels will be automatically applied to this pull request:

core-libs
i18n

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

mlbridge · 2023-06-27T23:04:16Z

Webrevs

… test file

naotoj · 2023-06-29T22:38:21Z

test/jdk/java/util/Currency/CurrencyNameProviderTest.java

+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class CurrencyNameProviderTest {


Since this is not a generic CurrencyNameProvider test, but specific to the default impl of CNP.getDisplayName(), the class name could be more specific.

I have renamed the file to be more descriptive, but if acronyms are not preferred in file names, I can rename it.

naotoj · 2023-06-29T22:44:59Z

test/jdk/java/util/Currency/CurrencyTest.java

+        Currency currency1 = Currency.getInstance(currencyCode);
+        Currency currency2 = Currency.getInstance(currencyCode);
+        assertEquals(currency1, currency2, "Didn't get same instance for same currency code");
+        assertEquals(currency1.getCurrencyCode(), currencyCode, "Currency code changed");


Error message more like "wrong currency code", than "changed"

Updated the err msg

naotoj · 2023-06-29T22:47:12Z

test/jdk/java/util/Currency/CurrencyTest.java

+                Arguments.of("BHD", 3), Arguments.of("IQD", 3),
+                Arguments.of("JOD", 3), Arguments.of("KWD", 3),
+                Arguments.of("LYD", 3), Arguments.of("OMR", 3),
+                Arguments.of("TND", 3), Arguments.of("TRL", 0), // Turkish Lira


The turkish lira comment should apply to both TRL and TRY

Yes good point, I have clarified the comment

naotoj · 2023-06-29T22:49:45Z

test/jdk/java/util/Currency/CurrencyTest.java

-        if (!currency1.getCurrencyCode().equals(currencyCode)) {
-            throw new RuntimeException("Currency code changed");
+
+        // Calling getInstance() with an illegal name should throw an IAE


illegal name -> invalid currency code

naotoj · 2023-06-29T23:07:14Z

test/jdk/java/util/Currency/MinorUndefinedCodes.java

+/*
+ * @test
+ * @bug 4512215 4818420 4819436 8310923
+ * @summary Test some minor undefined currencies.


It'd be more readable something like "currencies without minor units." The class name can also be renamed to something like NoMinorUnitCurrenciesTest

Adjusted the wording throughout the file according to your suggestions

naotoj · 2023-06-29T23:21:13Z

test/jdk/java/util/Currency/ValidateISO4217.java

+        // at the same time
+        setUpISO4217Codes();
+        setUpAdditionalCodes();
+        finishTestCurrencies();


The method name finish is kind of confusing. I'd explicitly describe what the method does, i.e, setup other currencies.

Renamed it to your suggestion

naotoj · 2023-06-29T23:22:23Z

test/jdk/java/util/Currency/ValidateISO4217.java

+        String[][] extraCodes = {
+                /* Defined in ISO 4217 list, but don't have code and minor unit info. */
+                {"AQ", "", "", "0"},    // Antarctica
+                /*
+                 * Defined in ISO 4217 list, but don't have code and minor unit info in
+                 * it. On the other hand, both code and minor unit are defined in
+                 * .properties file. I don't know why, though.
+                 */
+                {"GS", "GBP", "826", "2"},      // South Georgia And The South Sandwich Islands
+                /* Not defined in ISO 4217 list, but defined in .properties file. */
+                {"AX", "EUR", "978", "2"},      // \u00c5LAND ISLANDS
+                {"PS", "ILS", "376", "2"},      // Palestinian Territory, Occupied
+                /* Not defined in ISO 4217 list, but added in ISO 3166 country code list */
+                {"JE", "GBP", "826", "2"},      // Jersey
+                {"GG", "GBP", "826", "2"},      // Guernsey
+                {"IM", "GBP", "826", "2"},      // Isle of Man
+                {"BL", "EUR", "978", "2"},      // Saint Barthelemy
+                {"MF", "EUR", "978", "2"},      // Saint Martin
+                /* Defined neither in ISO 4217 nor ISO 3166 list */
+                {"XK", "EUR", "978", "2"},      // Kosovo
+        };


I'd prefer this array to be placed as static in the class, not within the method.

Fixed, as well as for otherCodes

naotoj · 2023-06-29T23:22:57Z

test/jdk/java/util/Currency/ValidateISO4217.java

+        final String otherCodes =
+                "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-BYR-CHE-CHW-CLF-COU-CUC-CYP-"
+                        + "DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LTL-LUF-LVL-MGF-MRO-MTL-MXV-MZM-NLG-"
+                        + "PTE-ROL-RUR-SDD-SIT-SLL-SKK-SRG-STD-TMM-TPE-TRL-VEF-UYI-USN-USS-VEB-VED-"
+                        + "XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-"
+                        + "YUM-ZMK-ZWD-ZWN-ZWR";


Ditto as extraCodes

naotoj · 2023-06-29T23:24:06Z

test/jdk/java/util/Currency/ValidateISO4217.java

+    private static final byte[] codes = new byte[ALPHA_NUM * ALPHA_NUM];
+    // Codes derived from ISO4217 golden-data file
+    private static final List<Arguments> ISO4217Codes = new ArrayList<Arguments>();
+    // Additional codes not from the ISO4217 golden-data file


Are these from the golden file?

Unless I am misinterpreting the question, additionalCodes is built from the extraCodes array, which contains data that is not found in tablea1.txt(golden file)

…java

naotoj · 2023-06-30T16:22:16Z

test/jdk/java/util/Currency/CurrencyTest.java

+                // Old and New Turkish Lira
+                Arguments.of("TRL", 0), Arguments.of("TRY", 2),
+                Arguments.of("TND", 3)


Probably TND moving upward before the comment would be clearer, like:

Arguments.of("LYD", 3), Arguments.of("OMR", 3), Arguments.of("TND", 3), // Old and New Turkish Lira Arguments.of("TRL", 0), Arguments.of("TRY", 2)

Adjusted TND upwards

naotoj

LGTM. Thanks for the refactoring

openjdk · 2023-06-30T16:52:13Z

@justin-curtis-lu This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8310923: Refactor Currency tests to use JUnit

Reviewed-by: naoto, lancea

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 77 new commits pushed to the master branch:

e8ff74c: 8310987: Missing @SInCE tag(s) in java/util/logging/ErrorManager.java
e3a7e02: 8311162: Simplify and modernize equals and hashCode for java.net
430d6b6: 8309976: Add microbenchmark for stressing code cache
33011ea: 8310946: G1: Refactor G1Policy::next_gc_should_be_mixed
a7d168b: 8311026: Some G1 specific tests do not set -XX:+UseG1GC
c08c983: 8311000: missing @SInCE info in jdk.management
660cd25: 8310988: Missing @SInCE tags in java.management.rmi
2a9e2f6: 8311046: ProblemList gc/z/TestHighUsage.java with Generational ZGC
77e7b6d: 8311074: RISC-V: Fix -Wconversion warnings in some code header files
11fd34e: 8310241: OffsetDateTime compareTo redundant computation
... and 67 more: https://git.openjdk.org/jdk/compare/7db2f08756b0aa1d79cdd2356ed42aa5ab8bc58b...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

justin-curtis-lu · 2023-07-07T01:31:58Z

/integrate

openjdk · 2023-07-07T01:33:07Z

Going to push as commit e848d94.
Since your change was applied there have been 124 commits pushed to the master branch:

0c86c31: 8302351: "assert(!JavaThread::current()->is_interp_only_mode() || !nm->method()->is_continuation_enter_intrinsic() || ContinuationEntry::is_interpreted_call(return_pc)) failed: interp_only_mode but not in enterSpecial interpreted entry" in fixup_callers_callsite
ec7da91: 8240567: MethodTooLargeException thrown while creating a jlink image
97e99f0: 8311087: PhiNode::wait_for_region_igvn should break early
7173c30: 8307766: Linux: Provide the option to override the timer slack
356067d: 8311489: Remove unused dirent_md files
3d813ae: 8311301: MethodExitTest may fail with stack buffer overrun
0741cd3: 8311264: JavaDoc index comparator is not transitive
edb2be1: 8311279: TestStressIGVNAndCCP.java failed with different IGVN traces for the same seed
d072c40: 8311183: Remove unused mapping test files
66d2736: 8307526: [JFR] Better handling of tampered JFR repository
... and 114 more: https://git.openjdk.org/jdk/compare/7db2f08756b0aa1d79cdd2356ed42aa5ab8bc58b...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-07-07T01:33:17Z

@justin-curtis-lu Pushed as commit e848d94.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

justin-curtis-lu added 6 commits June 26, 2023 16:50

Refactor Bug4512215.java

bff41ba

Refactor Bug6807534.java

337b8ae

Refactor Bug8154295.java

ecdb7cb

Clarify CheckDataVersion.java

fc41a96

Refactor CurrencyTest.java

1d8d07b

Rename Bug6807534.java as CurrencyNameProviderTest.java

09677d6

openjdk bot added core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org labels Jun 27, 2023

Remove trailing WS in Bug4512215.java

2d6ed5a

openjdk bot added the rfr Pull request is ready for review label Jun 27, 2023

justin-curtis-lu added 5 commits June 28, 2023 12:59

Refactor and improve ValidateISO4217.java

86273cb

Rename Bug4512215.java as MinorUndefinedCodes.java and update goal of…

bff5cc6

… test file

Re-include the data version check

86e4352

Rename Bug8154295.java as NumCodeAsStringTest.java

3975c57

Remove unusued JUnit imports from ValidateISO4217.java

10d5416

naotoj reviewed Jun 29, 2023

View reviewed changes

justin-curtis-lu added 5 commits June 30, 2023 00:27

Review: CurrencyTest updates

147596f

Review: Rename CurrencyNameProviderTest to be more specific

3d323a7

Review: Update ValidateISO4217.java

62680ad

Review: Rename MinorUndefinedCodes.java to NoMinorUnitCurrenciesTest.…

43905f9

…java

Further clarification regarding minor undefined currencies

ba3d2e5

naotoj reviewed Jun 30, 2023

View reviewed changes

Review: Adjust data provider regarding Turkish Lira

0ada95e

naotoj approved these changes Jun 30, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 30, 2023

LanceAndersen approved these changes Jun 30, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jul 7, 2023

openjdk bot closed this Jul 7, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 7, 2023


		import static org.junit.jupiter.api.Assertions.assertThrows;

		public class CurrencyNameProviderTest {

8310923: Refactor Currency tests to use JUnit #14682

8310923: Refactor Currency tests to use JUnit #14682

Uh oh!

Conversation

justin-curtis-lu commented Jun 27, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Jun 27, 2023

Uh oh!

openjdk bot commented Jun 27, 2023

Uh oh!

mlbridge bot commented Jun 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

naotoj Jun 29, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

justin-curtis-lu Jun 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

naotoj left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Jun 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

justin-curtis-lu commented Jul 7, 2023

Uh oh!

openjdk bot commented Jul 7, 2023

Uh oh!

openjdk bot commented Jul 7, 2023

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

justin-curtis-lu commented Jun 27, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Jun 27, 2023 •

edited

Loading

naotoj Jun 29, 2023 •

edited

Loading

justin-curtis-lu Jun 30, 2023 •

edited

Loading

openjdk bot commented Jun 30, 2023 •

edited

Loading