Skip to content

Commit

Permalink
8310923: Refactor Currency tests to use JUnit
Browse files Browse the repository at this point in the history
Reviewed-by: naoto, lancea
  • Loading branch information
Justin Lu committed Jul 7, 2023
1 parent 0c86c31 commit e848d94
Show file tree
Hide file tree
Showing 9 changed files with 717 additions and 653 deletions.
68 changes: 0 additions & 68 deletions test/jdk/java/util/Currency/Bug4512215.java

This file was deleted.

84 changes: 0 additions & 84 deletions test/jdk/java/util/Currency/Bug6807534.java

This file was deleted.

55 changes: 0 additions & 55 deletions test/jdk/java/util/Currency/Bug8154295.java

This file was deleted.

101 changes: 101 additions & 0 deletions test/jdk/java/util/Currency/CNPGetDisplayName.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
/*
* Copyright (c) 2010, 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
* 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
* @bug 6807534
* @summary check whether the default implementation of
* CurrencyNameProvider.getDisplayName(String, Locale) throws appropriate
* exceptions when necessary.
* @run junit CNPGetDisplayName
*/

import java.util.Locale;
import java.util.spi.CurrencyNameProvider;
import java.util.stream.Stream;

import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

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

public class CNPGetDisplayName {

static final CurrencyNameProvider cnp = new CurrencyNameProviderImpl();

/**
* Tests that the currency name provider throws a NullPointerException
* under the expected circumstances.
*/
@ParameterizedTest
@MethodSource("nullArgProvider")
public void NPETest(String currencyCode, Locale locale, String err) {
assertThrows(NullPointerException.class,
() -> cnp.getDisplayName(currencyCode, locale), err);
}

/**
* Tests that the currency name provider throws a IllegalArgumentException
* under the expected circumstances.
*/
@ParameterizedTest
@MethodSource("illegalArgProvider")
public void IAETest(String currencyCode, Locale locale, String err) {
assertThrows(IllegalArgumentException.class,
() -> cnp.getDisplayName(currencyCode, locale), err);
}

private static Stream<Arguments> nullArgProvider() {
return Stream.of(
Arguments.of(null, Locale.US,
"NPE was not thrown with null currencyCode"),
Arguments.of("USD", null,
"NPE was not thrown with null locale")
);
}

private static Stream<Arguments> illegalArgProvider() {
return Stream.of(
Arguments.of("INVALID", Locale.US,
"IAE was not thrown with invalid currency code"),
Arguments.of("inv", Locale.US,
"IAE was not thrown with invalid currency code"),
Arguments.of("USD", Locale.JAPAN,
"IllegalArgumentException was not thrown with non-supported locale")
);
}

static class CurrencyNameProviderImpl extends CurrencyNameProvider {
// dummy implementation
public String getSymbol(String currencyCode, Locale locale) {
return "";
}

public Locale[] getAvailableLocales() {
Locale[] avail = new Locale[1];
avail[0] = Locale.US;
return avail;
}
}
}
22 changes: 14 additions & 8 deletions test/jdk/java/util/Currency/CheckDataVersion.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 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 @@ -20,15 +20,21 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
*
*
* Check the consistency between the regression tests and the currency data in the JRE


/*
Check the consistency between the regression tests and the currency
data in the JRE. This class is used by other test classes.
*/

import java.io.*;
import java.lang.reflect.*;
import java.security.*;
import java.io.BufferedReader;
import java.io.DataInputStream;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Currency;

class CheckDataVersion {
Expand Down

7 comments on commit e848d94

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on e848d94 Jan 12, 2024

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on e848d94 Jan 12, 2024

Choose a reason for hiding this comment

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

@GoeLin the backport was successfully created on the branch backport-GoeLin-e848d947 in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit e848d947 from the openjdk/jdk repository.

The commit being backported was authored by Justin Lu on 7 Jul 2023 and was reviewed by Naoto Sato and Lance Andersen.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-e848d947:backport-GoeLin-e848d947
$ git checkout backport-GoeLin-e848d947
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-e848d947

@luchenlin
Copy link

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on e848d94 Jan 24, 2024

Choose a reason for hiding this comment

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

@luchenlin Could not automatically backport e848d947 to openjdk/jdk17u-dev due to conflicts in the following files:

  • test/jdk/java/util/Currency/Bug4512215.java
  • test/jdk/java/util/Currency/CurrencyTest.java
  • test/jdk/java/util/Currency/ValidateISO4217.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-luchenlin-e848d947

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git e848d9471f5de86e5ac157b710cd7371f12f0024

# Backport the commit
$ git cherry-pick --no-commit e848d9471f5de86e5ac157b710cd7371f12f0024
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport e848d9471f5de86e5ac157b710cd7371f12f0024'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport e848d9471f5de86e5ac157b710cd7371f12f0024.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit e848d947 from the openjdk/jdk repository.

The commit being backported was authored by Justin Lu on 7 Jul 2023 and was reviewed by Naoto Sato and Lance Andersen.

Thanks!

@luchenlin
Copy link

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on e848d94 Mar 26, 2024

Choose a reason for hiding this comment

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

@luchenlin Could not automatically backport e848d947 to openjdk/jdk11u-dev due to conflicts in the following files:

  • test/jdk/java/util/Currency/Bug4512215.java
  • test/jdk/java/util/Currency/CurrencyTest.java
  • test/jdk/java/util/Currency/ValidateISO4217.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-luchenlin-e848d947

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git e848d9471f5de86e5ac157b710cd7371f12f0024

# Backport the commit
$ git cherry-pick --no-commit e848d9471f5de86e5ac157b710cd7371f12f0024
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport e848d9471f5de86e5ac157b710cd7371f12f0024'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport e848d9471f5de86e5ac157b710cd7371f12f0024.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit e848d947 from the openjdk/jdk repository.

The commit being backported was authored by Justin Lu on 7 Jul 2023 and was reviewed by Naoto Sato and Lance Andersen.

Thanks!

Please sign in to comment.