Skip to content

Commit

Permalink
8266784: java/text/Collator/RuleBasedCollatorTest.java fails with jtr…
Browse files Browse the repository at this point in the history
…eg 6

Reviewed-by: joehw
  • Loading branch information
naotoj committed May 11, 2021
1 parent 1356116 commit f6c5a6b
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions test/jdk/java/text/Collator/RuleBasedCollatorTest.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 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
Expand All @@ -23,7 +23,7 @@

/*
* @test
* @bug 4406815 8222969
* @bug 4406815 8222969 8266784
* @summary RuleBasedCollatorTest uses very limited but selected test data
* to test basic functionalities provided by RuleBasedCollator.
* @run testng/othervm RuleBasedCollatorTest
Expand All @@ -37,7 +37,7 @@
import java.util.Arrays;
import java.util.Locale;

import org.testng.annotations.BeforeGroups;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.testng.SkipException;
Expand All @@ -48,7 +48,7 @@ public class RuleBasedCollatorTest {
static RuleBasedCollator USC;
static String US_RULES;

@BeforeGroups("USC")
@BeforeClass
public void setup() {
Collator c = Collator.getInstance(Locale.US);
if (!(c instanceof RuleBasedCollator)) {
Expand Down Expand Up @@ -91,7 +91,7 @@ Object[][] rulesData() {
};
}

@Test(dataProvider = "rulesData", groups = "USC")
@Test(dataProvider = "rulesData")
public void testRules(String rules, String[] testData, String[] expected)
throws ParseException {
Arrays.sort(testData, new RuleBasedCollator(rules));
Expand All @@ -111,7 +111,7 @@ Object[][] FrenchSecondarySort() {
{ "a", "\u1ea1", -1 } };
}

@Test(dataProvider = "FrenchSecondarySort", groups = "USC")
@Test(dataProvider = "FrenchSecondarySort")
public void testFrenchSecondarySort(String sData, String tData,
int expected) throws ParseException {
String french_rule = "@";
Expand All @@ -129,7 +129,7 @@ Object[][] ThaiLaoVowelConsonantSwapping() {
};
}

@Test(dataProvider = "ThaiLaoVowelConsonantSwapping", groups = "USC")
@Test(dataProvider = "ThaiLaoVowelConsonantSwapping")
public void testThaiLaoVowelConsonantSwapping(String sData, String tData,
int expected) throws ParseException {
String thai_rule = "& Z < \u0e01 < \u0e2e <\u0e40 < \u0e44!";
Expand Down Expand Up @@ -162,7 +162,7 @@ Object[][] Normalization() {
};
}

@Test(dataProvider = "Normalization", groups = "USC")
@Test(dataProvider = "Normalization")
public void testNormalization(String sData, String tData, int decomp,
int result) {
RuleBasedCollator rc = (RuleBasedCollator)USC.clone();
Expand Down

1 comment on commit f6c5a6b

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Please sign in to comment.