Migrate jaxp/functional/javax/xml tests to JUnit

Author: david-beaumont

test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, 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
@@ -23,25 +23,26 @@
 
 package javax.xml.datatype.ptests;
 
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNotSame;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertEquals;
+import jaxp.library.JAXPDataProvider;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.Duration;
 
-import jaxp.library.JAXPDataProvider;
-
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /*
  * @test
  * @bug 8169778
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm javax.xml.datatype.ptests.FactoryNewInstanceTest
+ * @run junit/othervm javax.xml.datatype.ptests.FactoryNewInstanceTest
  * @summary Tests for DatatypeFactory.newInstance(factoryClassName , classLoader)
  */
 public class FactoryNewInstanceTest {
@@ -50,9 +51,11 @@ public class FactoryNewInstanceTest {
         "com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl";
     private static final String DATATYPE_FACTORY_CLASSNAME = DEFAULT_IMPL_CLASS;
 
-    @DataProvider(name = "parameters")
-    public Object[][] getValidateParameters() {
-        return new Object[][] { { DATATYPE_FACTORY_CLASSNAME, null }, { DATATYPE_FACTORY_CLASSNAME, this.getClass().getClassLoader() } };
+    public static Object[][] getValidateParameters() {
+        return new Object[][] {
+                { DATATYPE_FACTORY_CLASSNAME, null },
+                { DATATYPE_FACTORY_CLASSNAME, FactoryNewInstanceTest.class.getClassLoader() },
+        };
     }
 
     /**
@@ -66,8 +69,8 @@ public void testDefaultInstance() throws Exception {
         DatatypeFactory dtf2 = DatatypeFactory.newInstance();
         assertNotSame(dtf1, dtf2, "same instance returned:");
         assertSame(dtf1.getClass(), dtf2.getClass(),
-                  "unexpected class mismatch for newDefaultInstance():");
-        assertEquals(dtf1.getClass().getName(), DEFAULT_IMPL_CLASS);
+                "unexpected class mismatch for newDefaultInstance():");
+        assertEquals(DEFAULT_IMPL_CLASS, dtf1.getClass().getName());
     }
 
     /*
@@ -76,7 +79,8 @@ public void testDefaultInstance() throws Exception {
      * implementation of javax.xml.datatype.DatatypeFactory , should return
      * newInstance of DatatypeFactory
      */
-    @Test(dataProvider = "parameters")
+    @ParameterizedTest
+    @MethodSource("getValidateParameters")
     public void testNewInstance(String factoryClassName, ClassLoader classLoader) throws DatatypeConfigurationException {
         DatatypeFactory dtf = DatatypeFactory.newInstance(DATATYPE_FACTORY_CLASSNAME, null);
         Duration duration = dtf.newDuration(true, 1, 1, 1, 1, 1, 1);
@@ -89,9 +93,11 @@ public void testNewInstance(String factoryClassName, ClassLoader classLoader) th
      * java.lang.ClassLoader classLoader) factoryClassName is null , should
      * throw DatatypeConfigurationException
      */
-    @Test(expectedExceptions = DatatypeConfigurationException.class, dataProvider = "new-instance-neg", dataProviderClass = JAXPDataProvider.class)
+    @ParameterizedTest
+    @JAXPDataProvider.NewInstanceNeg
     public void testNewInstanceNeg(String factoryClassName, ClassLoader classLoader) throws DatatypeConfigurationException {
-        DatatypeFactory.newInstance(factoryClassName, classLoader);
+        assertThrows(
+                DatatypeConfigurationException.class,
+                () -> DatatypeFactory.newInstance(factoryClassName, classLoader));
     }
-
 }

test/jaxp/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, 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
@@ -23,55 +23,53 @@
 
 package javax.xml.datatype.ptests;
 
-import static java.util.Calendar.HOUR;
-import static java.util.Calendar.MINUTE;
-import static java.util.Calendar.YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.util.GregorianCalendar;
-import java.util.Locale;
-import java.util.TimeZone;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.Duration;
 import javax.xml.datatype.XMLGregorianCalendar;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.TimeZone;
 
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import static java.util.Calendar.HOUR;
+import static java.util.Calendar.MINUTE;
+import static java.util.Calendar.YEAR;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /*
  * @test
  * @bug 5049592 5041845 5048932 5064587 5040542 5049531 5049528
  * @library /javax/xml/jaxp/libs
- * @run testng/othervm javax.xml.datatype.ptests.XMLGregorianCalendarTest
+ * @run junit/othervm javax.xml.datatype.ptests.XMLGregorianCalendarTest
  * @summary Class containing the test cases for XMLGregorianCalendar
  */
 public class XMLGregorianCalendarTest {
 
     private DatatypeFactory datatypeFactory;
 
-    @BeforeClass
+    @BeforeEach
     public void setup() throws DatatypeConfigurationException {
         datatypeFactory = DatatypeFactory.newInstance();
     }
 
-    @DataProvider(name = "valid-milliseconds")
-    public Object[][] getValidMilliSeconds() {
-        return new Object[][] { { 0 }, { 1 }, { 2 }, { 16 }, { 1000 }   };
-    }
-
     /*
      * Test DatatypeFactory.newXMLGregorianCalendar(..) with milliseconds > 1.
      *
      * Bug # 5049592
-     *
      */
-    @Test(dataProvider = "valid-milliseconds")
+    @ParameterizedTest
+    @ValueSource(ints={ 0, 1, 2, 16, 1000 })
     public void checkNewCalendar(int ms) {
         // valid milliseconds
         XMLGregorianCalendar calendar = datatypeFactory.newXMLGregorianCalendar(2004, // year
@@ -93,7 +91,8 @@ public void checkNewCalendar(int ms) {
      *
      * Bug # 5049592
      */
-    @Test(dataProvider = "valid-milliseconds")
+    @ParameterizedTest
+    @ValueSource(ints={ 0, 1, 2, 16, 1000 })
     public void checkNewTime(int ms) {
         // valid milliseconds
         XMLGregorianCalendar calendar2 = datatypeFactory.newXMLGregorianCalendarTime(19, // hour
@@ -107,30 +106,28 @@ public void checkNewTime(int ms) {
         assertEquals(calendar2.getMillisecond(), ms);
     }
 
-    @DataProvider(name = "invalid-milliseconds")
-    public Object[][] getInvalidMilliSeconds() {
-        return new Object[][] { { -1 }, { 1001 } };
-    }
-
     /*
      * Test DatatypeFactory.newXMLGregorianCalendar(..).
      *
      * Bug # 5049592 IllegalArgumentException is thrown if milliseconds < 0 or >
      * 1001.
      *
      */
-    @Test(expectedExceptions = IllegalArgumentException.class, dataProvider = "invalid-milliseconds")
-    public void checkNewCalendarNeg(int milliseconds) {
+    @ParameterizedTest
+    @ValueSource(ints={ -1, 1001 })
+    public void checkNewCalendarNeg(int invalidMilliseconds) {
         // invalid milliseconds
-        datatypeFactory.newXMLGregorianCalendar(2004, // year
-                6, // month
-                2, // day
-                19, // hour
-                20, // minute
-                59, // second
-                milliseconds, // milliseconds
-                840 // timezone
-                );
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> datatypeFactory.newXMLGregorianCalendar(2004, // year
+                        6, // month
+                        2, // day
+                        19, // hour
+                        20, // minute
+                        59, // second
+                        invalidMilliseconds, // milliseconds
+                        840 // timezone
+                ));
     }
 
     /*
@@ -140,19 +137,21 @@ public void checkNewCalendarNeg(int milliseconds) {
      * 1001.
      *
      */
-    @Test(expectedExceptions = IllegalArgumentException.class, dataProvider = "invalid-milliseconds")
-    public void checkNewTimeNeg(int milliseconds) {
+    @ParameterizedTest
+    @ValueSource(ints={ -1, 1001 })
+    public void checkNewTimeNeg(int invalidMilliseconds) {
         // invalid milliseconds
-        datatypeFactory.newXMLGregorianCalendarTime(19, // hour
-                20, // minute
-                59, // second
-                milliseconds, // milliseconds
-                840 // timezone
-                );
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> datatypeFactory.newXMLGregorianCalendarTime(19, // hour
+                        20, // minute
+                        59, // second
+                        invalidMilliseconds, // milliseconds
+                        840 // timezone
+                ));
     }
 
-    @DataProvider(name = "data-for-add")
-    public Object[][] getDataForAdd() {
+    public static Object[][] getDataForAdd() {
         return new Object[][] {
                 //calendar1, calendar2, duration
                 { "1999-12-31T00:00:00Z", "2000-01-01T00:00:00Z", "P1D" },
@@ -173,7 +172,8 @@ public Object[][] getDataForAdd() {
      * Test XMLGregorianCalendar.add(Duration).
      *
      */
-    @Test(dataProvider = "data-for-add")
+    @ParameterizedTest
+    @MethodSource("getDataForAdd")
     public void checkAddDays(String cal1, String cal2, String dur) {
 
         XMLGregorianCalendar calendar1 = datatypeFactory.newXMLGregorianCalendar(cal1);
@@ -191,57 +191,38 @@ public void checkAddDays(String cal1, String cal2, String dur) {
 
     }
 
-    @DataProvider(name = "gMonth")
-    public Object[][] getGMonth() {
-        return new Object[][] {
-                { "2000-02" },
-                { "2000-03" },
-                { "2018-02" }};
-    }
     /*
      * Test XMLGregorianCalendar#isValid(). for gMonth
      *
      * Bug # 5041845
-     *
      */
-    @Test(dataProvider = "gMonth")
+    @ParameterizedTest
+    @ValueSource(strings={ "2000-02", "2000-03", "2018-02" })
     public void checkIsValid(String month) {
-
         XMLGregorianCalendar gMonth = datatypeFactory.newXMLGregorianCalendar(month);
         gMonth.setYear(null);
-        Assert.assertTrue(gMonth.isValid(), gMonth.toString() + " should isValid");
-
-    }
-
-    @DataProvider(name = "lexical01")
-    public Object[][] getLexicalRepresentForNormalize01() {
-        return new Object[][] { { "2000-01-16T12:00:00Z" }, { "2000-01-16T12:00:00" } };
+        assertTrue(gMonth.isValid(), gMonth + " should isValid");
     }
 
     /*
      * Test XMLGregorianCalendar#normalize(...).
      *
      * Bug # 5048932 XMLGregorianCalendar.normalize works
-     *
      */
-    @Test(dataProvider = "lexical01")
+    @ParameterizedTest
+    @ValueSource(strings={ "2000-01-16T12:00:00Z", "2000-01-16T12:00:00" })
     public void checkNormalize01(String lexical) {
         XMLGregorianCalendar lhs = datatypeFactory.newXMLGregorianCalendar(lexical);
         lhs.normalize();
     }
 
-    @DataProvider(name = "lexical02")
-    public Object[][] getLexicalRepresentForNormalize02() {
-        return new Object[][] { { "2000-01-16T00:00:00.01Z" }, { "2000-01-16T00:00:00.01" }, { "13:20:00" } };
-    }
-
     /*
      * Test XMLGregorianCalendar#normalize(...).
      *
      * Bug # 5064587 XMLGregorianCalendar.normalize shall not change timezone
-     *
      */
-    @Test(dataProvider = "lexical02")
+    @ParameterizedTest
+    @ValueSource(strings={ "2000-01-16T00:00:00.01Z", "2000-01-16T00:00:00.01", "13:20:00" })
     public void checkNormalize02(String lexical) {
         XMLGregorianCalendar orig = datatypeFactory.newXMLGregorianCalendar(lexical);
         XMLGregorianCalendar normalized = datatypeFactory.newXMLGregorianCalendar(lexical).normalize();
@@ -291,8 +272,6 @@ public void checkToGregorianCalendar01() {
         int hour = calendar.get(HOUR);
 
         assertTrue((year == 2003 && hour == 2 && minute == 3), " expecting year == 2003, hour == 2, minute == 3" + ", result is year == " + year + ", hour == " + hour + ", minute == " + minute);
-
-
     }
 
     /*
@@ -311,8 +290,7 @@ public void checkToGregorianCalendar02() {
         calendar.toGregorianCalendar(TimeZone.getDefault(), Locale.getDefault(), null);
     }
 
-    @DataProvider(name = "calendar")
-    public Object[][] getXMLGregorianCalendarData() {
+    public static Object[][] getXMLGregorianCalendarData() {
         return new Object[][] {
                 // year, month, day, hour, minute, second
                 { 1970, 1, 1, 0, 0, 0 }, // DATETIME
@@ -332,10 +310,12 @@ public Object[][] getXMLGregorianCalendarData() {
      * Bug # 5049528
      *
      */
-    @Test(dataProvider = "calendar")
+    @ParameterizedTest
+    @MethodSource("getXMLGregorianCalendarData")
     public void checkToStringPos(final int year, final int month, final int day, final int hour, final int minute, final int second) {
         XMLGregorianCalendar calendar = datatypeFactory.newXMLGregorianCalendar(year, month, day, hour, minute, second, undef, undef);
-        calendar.toString();
+        assertNotNull(calendar.toString());
+        assertFalse(calendar.toString().isEmpty());
     }
 
     /*
@@ -345,13 +325,13 @@ public void checkToStringPos(final int year, final int month, final int day, fin
      * if all parameters are undef
      *
      */
-    @Test(expectedExceptions = IllegalStateException.class)
+    @Test
     public void checkToStringNeg() {
         XMLGregorianCalendar calendar = datatypeFactory.newXMLGregorianCalendar(undef, undef, undef, undef, undef, undef, undef, undef);
         // expected to fail
-        calendar.toString();
+        assertThrows(IllegalStateException.class, calendar::toString);
     }
 
-    private final int undef = DatatypeConstants.FIELD_UNDEFINED;
+    private static final int undef = DatatypeConstants.FIELD_UNDEFINED;
 
 }