< prev index next >

test/jdk/java/text/Collator/DanishTest.java

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

*** 25,10 ***
--- 25,11 ---
   * @test
   * @bug 4930708 4174436 5008498
   * @library /java/text/testlib
   * @summary test Danish Collation
   * @modules jdk.localedata
+  * @run junit DanishTest
   */
  /*
  (C) Copyright Taligent, Inc. 1996 - All Rights Reserved
  (C) Copyright IBM Corp. 1996 - All Rights Reserved
  

*** 41,16 ***
  */
  
  import java.util.Locale;
  import java.text.Collator;
  
! // Quick dummy program for printing out test results
- public class DanishTest extends CollatorTest {
  
!     public static void main(String[] args) throws Exception {
!         new DanishTest().run(args);
!     }
  
      /*
       * Data for TestPrimary()
       */
      private static final String[] primarySourceData = {
--- 42,16 ---
  */
  
  import java.util.Locale;
  import java.text.Collator;
  
! import org.junit.jupiter.api.Test;
  
! import static org.junit.jupiter.api.Assertions.fail;
! 
! // Quick dummy program for printing out test results
+ public class DanishTest {
  
      /*
       * Data for TestPrimary()
       */
      private static final String[] primarySourceData = {

*** 194,22 ***
              "\u00F8BERG", // o-stroke
              "\u00D6BERG", // O-diaeresis
              "\u00F6BERG"  // o-diaeresis
      };
  
      public void TestPrimary() {
!         doTest(myCollation, Collator.PRIMARY,
                 primarySourceData, primaryTargetData, primaryResults);
      }
  
      public void TestTertiary() {
!         doTest(myCollation, Collator.TERTIARY,
                 tertiarySourceData, tertiaryTargetData, tertiaryResults);
  
          for (int i = 0; i < testData.length-1; i++) {
              for (int j = i+1; j < testData.length; j++) {
!                 doTest(myCollation, testData[i], testData[j], -1);
              }
          }
      }
  
      private final Collator myCollation = Collator.getInstance(Locale.of("da"));
--- 195,24 ---
              "\u00F8BERG", // o-stroke
              "\u00D6BERG", // O-diaeresis
              "\u00F6BERG"  // o-diaeresis
      };
  
+     @Test
      public void TestPrimary() {
!         TestUtils.doCollatorTest(myCollation, Collator.PRIMARY,
                 primarySourceData, primaryTargetData, primaryResults);
      }
  
+     @Test
      public void TestTertiary() {
!         TestUtils.doCollatorTest(myCollation, Collator.TERTIARY,
                 tertiarySourceData, tertiaryTargetData, tertiaryResults);
  
          for (int i = 0; i < testData.length-1; i++) {
              for (int j = i+1; j < testData.length; j++) {
!                 TestUtils.doCollatorTest(myCollation, testData[i], testData[j], -1);
              }
          }
      }
  
      private final Collator myCollation = Collator.getInstance(Locale.of("da"));
< prev index next >