< prev index next >

test/jdk/java/text/Format/NumberFormat/DFSExponential.java

Print this page
@@ -1,7 +1,7 @@
  /*
-  * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+  * Copyright (c) 2005, 2024, 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,69 +19,60 @@
   * 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 4068067
-  * @library /java/text/testlib
   * @summary test NumberFormat with exponential separator symbols. It also tests the new
   *          public methods in DecimalFormatSymbols, setExponentSeparator() and
   *          getExponentSeparator()
+  * @run junit DFSExponential
   */
  
- import java.util.*;
- import java.text.*;
+ import java.text.DecimalFormat;
+ import java.text.DecimalFormatSymbols;
+ import java.util.Locale;
  
- public class DFSExponential extends IntlTest
- {
+ import org.junit.jupiter.api.Test;
  
-     public static void main(String[] args) throws Exception {
-         new DFSExponential().run(args);
-     }
+ import static org.junit.jupiter.api.Assertions.fail;
  
+ public class DFSExponential {
  
-    public void DFSExponenTest() throws Exception {
+     @Test
+     public void TestDFSExponential() {
          DecimalFormatSymbols sym = new DecimalFormatSymbols(Locale.US);
-         String pat[] = { "0.####E0", "00.000E00", "##0.####E000", "0.###E0;[0.###E0]"  };
-         double val[] = { 0.01234, 123456789, 1.23e300, -3.141592653e-271 };
-         long lval[] = { 0, -1, 1, 123456789 };
-         String valFormat[][] = {
+         String[] pat = { "0.####E0", "00.000E00", "##0.####E000", "0.###E0;[0.###E0]"};
+         double[] val = { 0.01234, 123456789, 1.23e300, -3.141592653e-271};
+         String[][] valFormat = {
                  {"1.234x10^-2", "1.2346x10^8", "1.23x10^300", "-3.1416x10^-271"},
                  {"12.340x10^-03", "12.346x10^07", "12.300x10^299", "-31.416x10^-272"},
                  {"12.34x10^-003", "123.4568x10^006", "1.23x10^300", "-314.1593x10^-273"},
                  {"1.234x10^-2", "1.235x10^8", "1.23x10^300", "[3.142x10^-271]"},
          };
- 
- 
-         int ival = 0, ilval = 0;
-         logln("Default exponent separator: "+sym.getExponentSeparator());
+         System.out.println("Default exponent separator: "+sym.getExponentSeparator());
          try {
              sym.setExponentSeparator("x10^");
          } catch (NullPointerException e){
-             errln("null String was passed to set an exponent separator symbol");
-             throw new RuntimeException("Test Malfunction: null String was passed to set an exponent separator symbol" );
+             fail("null String was passed to set an exponent separator symbol");
          }
-         logln("Current exponent separator: "+sym.getExponentSeparator());
+         System.out.println("Current exponent separator: "+sym.getExponentSeparator());
  
          for (int p=0; p<pat.length; ++p){
              DecimalFormat fmt = new DecimalFormat(pat[p], sym);
-             logln("     Pattern: " + fmt.toPattern());
+             System.out.println("     Pattern: " + fmt.toPattern());
              String locPattern = fmt.toLocalizedPattern();
-             logln("     Localized pattern: "+locPattern);
-             //fmt.applyLocalizedPattern(locPattern);
-             //System.out.println("      fmt.applyLocalizedPattern(): "+fmt.toLocalizedPattern());
- 
+             System.out.println("     Localized pattern: "+locPattern);
              for (int v=0; v<val.length; ++v) {
                  String s = fmt.format(val[v]);
-                 logln("         " + val[v]+" --> "+s);
-                 if(valFormat[p][v].equals(s)){
-                     logln(": Passed");
-                 }else{
-                    errln(" Failed: Should be formatted as "+valFormat[p][v]+ "but got "+s);
-                    throw new RuntimeException(" Failed: Should be formatted as "+valFormat[p][v]+ "but got "+s);
+                 System.out.println("         " + val[v]+" --> "+s);
+                 if (valFormat[p][v].equals(s)){
+                     System.out.println(": Passed");
+                 } else{
+                    fail(" Failed: Should be formatted as "+valFormat[p][v]+ "but got "+s);
                  }
             }
-          } //end of the first for loop
-    }
+          }
+     }
  }
< prev index next >