< prev index next >

test/jdk/java/text/Format/ChoiceFormat/Bug4387255.java

Print this page
*** 1,7 ***
  /*
!  * Copyright (c) 1997, 2016, 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.
--- 1,7 ---
  /*
!  * Copyright (c) 1997, 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.

*** 19,20 ***
   * 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 4387255
   * @summary Verifies that ChoiceFormat can handle large numbers of choices
   */
  
  import java.text.ChoiceFormat;
  
! public class Bug4387255 {
  
      private static final double[] doubles = {
              0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
              10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
              20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
              30, 31, 32, 33, 34, 35};
--- 19,29 ---
   * 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 4387255
   * @summary Verifies that ChoiceFormat can handle large numbers of choices
+  *          (previously capped at 30).
+  * @run junit Bug4387255
   */
  
  import java.text.ChoiceFormat;
  
! import org.junit.jupiter.api.Test;
+ 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.assertEquals;
+ import static org.junit.jupiter.params.provider.Arguments.arguments;
  
+ public class Bug4387255 {
      private static final double[] doubles = {
              0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
              10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
              20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
              30, 31, 32, 33, 34, 35};

*** 47,23 ***
              "0#0|1#1|2#2|3#3|4#4|5#5|6#6|7#7|8#8|9#9" +
              "|10#A|11#B|12#C|13#D|14#E|15#F|16#G|17#H|18#I|19#J" +
              "|20#K|21#L|22#M|23#N|24#O|25#P|26#Q|27#R|28#S|29#T" +
              "|30#U|31#V|32#W|33#X|34#Y|35#Z";
  
!     public static void main(String[] args) throws Exception {
!         ChoiceFormat choiceFormat1 = new ChoiceFormat(doubles, strings);
-         ChoiceFormat choiceFormat2 = new ChoiceFormat(pattern);
-         if (!choiceFormat1.equals(choiceFormat2)) {
-             System.out.println("choiceFormat1: " + choiceFormat1.toPattern());
-             System.out.println("choiceFormat2: " + choiceFormat2.toPattern());
-             throw new RuntimeException();
-         }
  
          for (int i = 0; i < doubles.length; i++) {
!             String result = choiceFormat2.format(doubles[i]);
-             if (!result.equals(strings[i])) {
-                 throw new RuntimeException("Wrong format result - expected " +
-                         strings[i] + ", got " + result);
-             }
          }
      }
  }
--- 56,41 ---
              "0#0|1#1|2#2|3#3|4#4|5#5|6#6|7#7|8#8|9#9" +
              "|10#A|11#B|12#C|13#D|14#E|15#F|16#G|17#H|18#I|19#J" +
              "|20#K|21#L|22#M|23#N|24#O|25#P|26#Q|27#R|28#S|29#T" +
              "|30#U|31#V|32#W|33#X|34#Y|35#Z";
  
!     private static final ChoiceFormat choiceFormat1 = new ChoiceFormat(doubles, strings);
!     private static final ChoiceFormat choiceFormat2 = new ChoiceFormat(pattern);
  
+     // Ensure that both the large ChoiceFormats format each value properly
+     @ParameterizedTest
+     @MethodSource
+     public void largeChoicesTest(double db, String expectedString) {
+         String result = choiceFormat2.format(db);
+         assertEquals(expectedString, result,
+                 "Wrong format result with: " + choiceFormat2);
+     }
+ 
+ 
+     /*
+      * Create arguments in form of : (double, string)
+      * Each string is the expected result of ChoiceFormat.format(double)
+      */
+     private static Arguments[] largeChoicesTest() {
+         Arguments[] doublesAndStrings = new Arguments[doubles.length];
          for (int i = 0; i < doubles.length; i++) {
!             doublesAndStrings[i] = arguments(doubles[i], strings[i]);
          }
+         return doublesAndStrings;
+     }
+ 
+     /*
+      * Check that creating a ChoiceFormat with limits and formats arrays
+      * equivalent to a string pattern are equal. (Checks that both constructors
+      * allow for a large number of choices and formats)
+      */
+     @Test
+     public void patternEqualsArraysTest() {
+         assertEquals(choiceFormat1, choiceFormat2, "Pattern is equivalent to " +
+                 "formats and limits, but ChoiceFormats are not equal");
      }
  }
< prev index next >