Skip to content
Permalink
Browse files
8272358: Some tests may fail when executed with other locales than th…
…e US

Reviewed-by: aivanov
  • Loading branch information
mrserb committed Nov 17, 2021
1 parent ce4471f commit 29e552c03a2825f9526330072668a1d63ac68fd4
Showing 4 changed files with 9 additions and 8 deletions.
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021, 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
@@ -553,7 +553,7 @@ public void testOpenFileOverHttp() throws IOException {
}

public void testOpenResource() {
test(
test(new String[]{"-R", "-Duser.language=en", "-R", "-Duser.country=US"},
(a) -> assertCommand(a, "/open PRINTING", ""),
(a) -> assertCommandOutputContains(a, "/list",
"void println", "System.out.printf"),
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2021, 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
@@ -744,7 +744,8 @@ public void testBlankLinesInSnippetContinuation() {

@Test
public void testCompoundStart() {
test(new String[]{"--startup", "DEFAULT", "--startup", "PRINTING"},
test(new String[]{"-R", "-Duser.language=en", "-R", "-Duser.country=US",
"--startup", "DEFAULT", "--startup", "PRINTING"},
(a) -> assertCommand(a, "printf(\"%4.2f\", Math.PI)",
"", "", null, "3.14", "")
);
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2021, 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
@@ -25,7 +25,7 @@
* @test
* @bug 8003639
* @summary convert lambda testng tests to jtreg and add them
* @run testng LambdaTranslationTest1
* @run testng/othervm -Duser.language=en -Duser.country=US LambdaTranslationTest1
*/

import org.testng.annotations.Test;
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2021, 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
@@ -25,7 +25,7 @@
* @test
* @bug 8003639
* @summary convert lambda testng tests to jtreg and add them
* @run testng LambdaTranslationTest2
* @run testng/othervm -Duser.language=en -Duser.country=US LambdaTranslationTest2
*/

import org.testng.annotations.Test;

3 comments on commit 29e552c

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 29e552c Nov 17, 2021

Choose a reason for hiding this comment

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

@TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented on 29e552c Mar 29, 2022

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 29e552c Mar 29, 2022

Choose a reason for hiding this comment

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

@TheRealMDoerr the backport was successfully created on the branch TheRealMDoerr-backport-29e552c0 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-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 29e552c0 from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 17 Nov 2021 and was reviewed by Alexey Ivanov.

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/jdk17u-dev:

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

Please sign in to comment.