Test filtering with Category and JUnitPlatform

Tests that extend TestCase do not properly work with JUnit4 Category
filtering when running with JUnitPlatform, so migrate to use the JUnit4
@test annotations.

Author: lesserwhirls

cdm-test/src/test/java/ucar/nc2/dataset/TestVertical.java

@@ -1,10 +1,11 @@
 /*
- * Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
+ * Copyright (c) 1998-2025 University Corporation for Atmospheric Research/Unidata
  * See LICENSE for license information.
  */
+
 package ucar.nc2.dataset;
 
-import junit.framework.*;
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,13 +22,11 @@
  * Test basic projection methods
  */
 @Category(NeedsCdmUnitTest.class)
-public class TestVertical extends TestCase {
-  private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+public class TestVertical {
 
-  public TestVertical(String name) {
-    super(name);
-  }
+  private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
+  @Test
   public void testOceanS() throws java.io.IOException, InvalidRangeException {
     GridDataset gds =
         ucar.nc2.dt.grid.GridDataset.open(TestDir.cdmUnitTestDir + "transforms/roms_ocean_s_coordinate.nc");
@@ -50,12 +49,14 @@ public void testOceanS() throws java.io.IOException, InvalidRangeException {
     assert ca.getRank() == 3 : ca.getRank();
 
     int[] shape = ca.getShape();
-    for (int i = 0; i < 3; i++)
+    for (int i = 0; i < 3; i++) {
       System.out.println(" shape " + i + " = " + shape[i]);
+    }
 
     gds.close();
   }
 
+  @Test
   public void testOceanSigma() throws java.io.IOException, InvalidRangeException {
     GridDataset gds = ucar.nc2.dt.grid.GridDataset.open(TestDir.cdmUnitTestDir + "conventions/cf/gomoos_cf.nc");
 
@@ -80,12 +81,14 @@ public void testOceanSigma() throws java.io.IOException, InvalidRangeException {
       assert ca.getRank() == 3 : ca.getRank();
 
       int[] shape = ca.getShape();
-      for (int i = 0; i < 3; i++)
+      for (int i = 0; i < 3; i++) {
         System.out.println(" shape " + i + " = " + shape[i]);
+      }
     }
     gds.close();
   }
 
+  @Test
   public void testAtmSigma() throws java.io.IOException, InvalidRangeException {
     GridDataset gds = ucar.nc2.dt.grid.GridDataset.open(TestDir.cdmUnitTestDir + "transforms/temperature.nc");
 
@@ -107,12 +110,14 @@ public void testAtmSigma() throws java.io.IOException, InvalidRangeException {
     assert ca.getRank() == 3 : ca.getRank();
 
     int[] shape = ca.getShape();
-    for (int i = 0; i < 3; i++)
+    for (int i = 0; i < 3; i++) {
       System.out.println(" shape " + i + " = " + shape[i]);
+    }
 
     gds.close();
   }
 
+  @Test
   public void testAtmHybrid() throws java.io.IOException, InvalidRangeException {
     GridDataset gds = ucar.nc2.dt.grid.GridDataset.open(TestDir.cdmUnitTestDir + "conventions/cf/ccsm2.nc");
 
@@ -134,12 +139,14 @@ public void testAtmHybrid() throws java.io.IOException, InvalidRangeException {
     assert ca.getRank() == 3 : ca.getRank();
 
     int[] shape = ca.getShape();
-    for (int i = 0; i < 3; i++)
+    for (int i = 0; i < 3; i++) {
       System.out.println(" shape " + i + " = " + shape[i]);
+    }
 
     gds.close();
   }
 
+  @Test
   public void testWrfEta() throws java.io.IOException, InvalidRangeException {
     GridDataset gds =
         ucar.nc2.dt.grid.GridDataset.open(TestDir.cdmUnitTestDir + "conventions/wrf/wrfout_v2_Lambert.nc");
@@ -162,14 +169,16 @@ public void testWrfEta() throws java.io.IOException, InvalidRangeException {
     assert ca.getRank() == 3 : ca.getRank();
 
     int[] shape = ca.getShape();
-    for (int i = 0; i < 3; i++)
+    for (int i = 0; i < 3; i++) {
       System.out.println(" shape " + i + " = " + shape[i]);
+    }
 
     gds.close();
   }
 
   // TestAll.upcShareDir + /testdata2/grid/netcdf/wrf/wrfout_v2_Lambert.nc
 
+  @Test
   public void testStride() throws java.io.IOException, InvalidRangeException {
     String filename = TestDir.cdmUnitTestDir + "/conventions/wrf/wrfout_d01_2006-03-08_21-00-00";
     GridDataset gds = ucar.nc2.dt.grid.GridDataset.open(filename);
@@ -190,8 +199,9 @@ public void testStride() throws java.io.IOException, InvalidRangeException {
     assert ca.getRank() == 3 : ca.getRank();
 
     int[] shape = ca.getShape();
-    for (int i = 0; i < 3; i++)
+    for (int i = 0; i < 3; i++) {
       System.out.println(" shape " + i + " = " + shape[i]);
+    }
 
     assert shape[0] == 44;
     assert shape[1] == 399 / 2 + 1;

cdm-test/src/test/java/ucar/nc2/dt/grid/TestGridVerticalTransforms.java

@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
+ * Copyright (c) 1998-2025 University Corporation for Atmospheric Research/Unidata
  * See LICENSE for license information.
  */
 
 package ucar.nc2.dt.grid;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,13 +22,11 @@
 import java.lang.invoke.MethodHandles;
 
 @Category(NeedsCdmUnitTest.class)
-public class TestGridVerticalTransforms extends TestCase {
-  private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+public class TestGridVerticalTransforms {
 
-  public TestGridVerticalTransforms(String name) {
-    super(name);
-  }
+  private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
+  @Test
   public void testWRF() throws Exception {
     testDataset(TestDir.cdmUnitTestDir + "conventions/wrf/wrfout_v2_Lambert.nc");
     testDataset(TestDir.cdmUnitTestDir + "conventions/wrf/wrfout_d01_2006-03-08_21-00-00");
@@ -77,13 +75,14 @@ private void testGrid(GeoGrid grid) throws IOException, InvalidRangeException {
 
   /*
    * The 3D coordinate array does not return correct shape and values. Just running this simple code to get z values..
-   * 
+   *
    * url=http://coast-enviro.er.usgs.gov/models/share/erie_test.ncml;
    * var='temp';
-   * 
+   *
    * z is of shape 20x2x87, it should be 20x87x193.
    */
 
+  @Test
   public void testErie() throws IOException, InvalidRangeException {
     String uri = TestDir.cdmUnitTestDir + "transforms/erie_test.ncml";
     String var = "temp";

cdm-test/src/test/java/ucar/nc2/dt/grid/TestStag3D.java

@@ -1,43 +1,16 @@
 /*
- * Copyright (c) 1998 - 2009. University Corporation for Atmospheric Research/Unidata
- * Portions of this software were developed by the Unidata Program at the
- * University Corporation for Atmospheric Research.
- *
- * Access and use of this software shall impose the following obligations
- * and understandings on the user. The user is granted the right, without
- * any fee or cost, to use, copy, modify, alter, enhance and distribute
- * this software, and any derivative works thereof, and its supporting
- * documentation for any purpose whatsoever, provided that this entire
- * notice appears in all copies of the software, derivative works and
- * supporting documentation. Further, UCAR requests that the user credit
- * UCAR/Unidata in any publications that result from the use of this
- * software or in any product that includes this software. The names UCAR
- * and/or Unidata, however, may not be used in any advertising or publicity
- * to endorse or promote any products or commercial entity unless specific
- * written permission is obtained from UCAR/Unidata. The user also
- * understands that UCAR/Unidata is not obligated to provide the user with
- * any support, consulting, training or assistance of any kind with regard
- * to the use, operation and performance of this software nor to provide
- * the user with any updates, revisions, new versions or "bug fixes."
- *
- * THIS SOFTWARE IS PROVIDED BY UCAR/UNIDATA "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL UCAR/UNIDATA BE LIABLE FOR ANY SPECIAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE ACCESS, USE OR PERFORMANCE OF THIS SOFTWARE.
+ * Copyright (c) 2009-2025 University Corporation for Atmospheric Research/Unidata
+ * See LICENSE for license information.
  */
 
 package ucar.nc2.dt.grid;
 
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import ucar.nc2.dt.GridCoordSystem;
 import ucar.ma2.Array;
-import junit.framework.TestCase;
 import ucar.unidata.util.test.category.NeedsCdmUnitTest;
 import ucar.unidata.util.test.TestDir;
 import java.lang.invoke.MethodHandles;
@@ -50,9 +23,11 @@
  * @since Oct 16, 2009
  */
 @Category(NeedsCdmUnitTest.class)
-public class TestStag3D extends TestCase {
+public class TestStag3D {
+
   private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
+  @Test
   public void testSubset() throws Exception {
     ucar.nc2.dt.grid.GridDataset dataset = GridDataset.open(TestDir.cdmUnitTestDir + "ft/grid/stag/bora_feb.nc");
 
@@ -73,8 +48,9 @@ public void testSubset() throws Exception {
 
   private String showShape(int[] shape) {
     Formatter f = new Formatter();
-    for (int s : shape)
+    for (int s : shape) {
       f.format(" %d", s);
+    }
     return f.toString();
   }
 }

cdm-test/src/test/java/ucar/nc2/ncml/TestNcMLStrides.java

@@ -1,38 +1,14 @@
 /*
- * Copyright (c) 1998 - 2011. University Corporation for Atmospheric Research/Unidata
- * Portions of this software were developed by the Unidata Program at the
- * University Corporation for Atmospheric Research.
- *
- * Access and use of this software shall impose the following obligations
- * and understandings on the user. The user is granted the right, without
- * any fee or cost, to use, copy, modify, alter, enhance and distribute
- * this software, and any derivative works thereof, and its supporting
- * documentation for any purpose whatsoever, provided that this entire
- * notice appears in all copies of the software, derivative works and
- * supporting documentation. Further, UCAR requests that the user credit
- * UCAR/Unidata in any publications that result from the use of this
- * software or in any product that includes this software. The names UCAR
- * and/or Unidata, however, may not be used in any advertising or publicity
- * to endorse or promote any products or commercial entity unless specific
- * written permission is obtained from UCAR/Unidata. The user also
- * understands that UCAR/Unidata is not obligated to provide the user with
- * any support, consulting, training or assistance of any kind with regard
- * to the use, operation and performance of this software nor to provide
- * the user with any updates, revisions, new versions or "bug fixes."
- *
- * THIS SOFTWARE IS PROVIDED BY UCAR/UNIDATA "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL UCAR/UNIDATA BE LIABLE FOR ANY SPECIAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE ACCESS, USE OR PERFORMANCE OF THIS SOFTWARE.
+ * Copyright (c) 1998-2025 University Corporation for Atmospheric Research/Unidata
+ * See LICENSE for license information.
  */
+
 package ucar.nc2.ncml;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import ucar.ma2.ArrayInt;
@@ -49,16 +25,13 @@
 
 /** Test netcdf dataset in the JUnit framework. */
 @Category(NeedsCdmUnitTest.class)
-public class TestNcMLStrides extends TestCase {
+public class TestNcMLStrides {
   private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-  public TestNcMLStrides(String name) {
-    super(name);
-  }
-
   NetcdfFile ncfile = null;
   String location = "file:" + TestDir.cdmUnitTestDir + "agg/strides/strides.ncml";
 
+  @BeforeEach
   public void setUp() {
     try {
       ncfile = NcMLReader.readNcML(location, null);
@@ -71,10 +44,12 @@ public void setUp() {
     }
   }
 
+  @AfterEach
   protected void tearDown() throws IOException {
     ncfile.close();
   }
 
+  @Test
   public void testStride() throws IOException, InvalidRangeException {
     System.out.println("ncfile opened = " + location + "\n" + ncfile);
     Variable time = ncfile.findVariable("time");

cdm-test/src/test/java/ucar/nc2/ncml/TestOffAggDirectory.java

@@ -1,10 +1,11 @@
 /*
- * Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
+ * Copyright (c) 1998-2025 University Corporation for Atmospheric Research/Unidata
  * See LICENSE for license information.
  */
+
 package ucar.nc2.ncml;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,9 +28,10 @@
 import java.util.List;
 
 @Category(NeedsCdmUnitTest.class)
-public class TestOffAggDirectory extends TestCase {
+public class TestOffAggDirectory {
   private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
+  @Test
   public void testNcmlDirect() throws IOException {
     String filename = "file:" + TestDir.cdmUnitTestDir + "ncml/nc/seawifs/aggDirectory.ncml";
 
@@ -44,6 +46,7 @@ public void testNcmlDirect() throws IOException {
     ncfile.close();
   }
 
+  @Test
   public void testNcmlDataset() throws IOException {
     String filename = "file:" + TestDir.cdmUnitTestDir + "ncml/nc/seawifs/aggDirectory.ncml";
 
@@ -58,6 +61,7 @@ public void testNcmlDataset() throws IOException {
     ncfile.close();
   }
 
+  @Test
   public void testNcmlGrid() throws IOException {
     String filename = "file:" + TestDir.cdmUnitTestDir + "ncml/nc/seawifs/aggDirectory.ncml";
 
@@ -205,6 +209,7 @@ public void testReadData2(NetcdfFile ncfile) throws IOException {
     }
   }
 
+  @Test
   public void testBlanksInDirectory() throws IOException {
     String dir = TestDir.cdmUnitTestDir + "encoding/";
     String ncml = "<?xml version='1.0' encoding='UTF-8'?>\n"