spotless and clean up

Unidata · Aug 19, 2022 · ba53441 · ba53441
1 parent 2492582
commit ba53441
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 124 deletions.
diff --git a/cdm-test/build.gradle b/cdm-test/build.gradle
@@ -40,7 +40,7 @@ tasks.register("testIndexCreation", Test) {
 }
 
 test {
-//  dependsOn 'testIndexCreation'
+  dependsOn 'testIndexCreation'
 
   // In addition to preventing TestGribIndexCreation from running during cdm-test:test,
   // this statement also excludes the results of TestGribIndexCreation from appearing in the cdm-test report:

diff --git a/cdm-test/src/test/java/ucar/nc2/TestFailingTest.java b/cdm-test/src/test/java/ucar/nc2/TestFailingTest.java
diff --git a/cdm-test/src/test/java/ucar/nc2/ft/point/writer/TestCFPointWriterCompare.java b/cdm-test/src/test/java/ucar/nc2/ft/point/writer/TestCFPointWriterCompare.java
@@ -49,11 +49,11 @@ public static List<Object[]> getTestParameters() {
     List<Object[]> result = new ArrayList<>();
 
     result.addAll(TestCFPointDatasets.getPointDatasets());
-//    result.addAll(TestCFPointDatasets.getStationDatasets());
-//    result.addAll(TestCFPointDatasets.getProfileDatasets());
-//    result.addAll(TestCFPointDatasets.getTrajectoryDatasets());
-//    result.addAll(TestCFPointDatasets.getStationProfileDatasets());
-//    result.addAll(TestCFPointDatasets.getSectionDatasets());
+    result.addAll(TestCFPointDatasets.getStationDatasets());
+    result.addAll(TestCFPointDatasets.getProfileDatasets());
+    result.addAll(TestCFPointDatasets.getTrajectoryDatasets());
+    result.addAll(TestCFPointDatasets.getStationProfileDatasets());
+    result.addAll(TestCFPointDatasets.getSectionDatasets());
 
     return result;
   }
@@ -88,8 +88,7 @@ public void testWrite4Classic() throws IOException {
   private void writeDataset(String location, FeatureType ftype, NetcdfFileWriter.Version version, int countExpected)
       throws IOException {
     File fileIn = new File(location);
-//    File fileOrg = tempFolder.newFile();
-    File fileOrg = File.createTempFile("testWrite", "input.nc");
+    File fileOrg = tempFolder.newFile();
 
     long start = System.currentTimeMillis();
 
@@ -116,9 +115,7 @@ private void writeDataset(String location, FeatureType ftype, NetcdfFileWriter.V
 
     try (FeatureDataset fdataset = FeatureDatasetFactoryManager.open(ftype, location, null, out)) {
       FeatureDatasetPoint fdpoint = (FeatureDatasetPoint) fdataset;
-//      File fileNew = tempFolder.newFile();
-
-      File fileNew = File.createTempFile("testWrite", "output.nc");
+      File fileNew = tempFolder.newFile();
       ucar.nc2.ft.point.writer2.CFPointWriterConfig configNew = ucar.nc2.ft.point.writer2.CFPointWriterConfig.builder()
           .setFormat(NetcdfFormatWriter.convertToNetcdfFileFormat(version)).build();
       int countNew =

diff --git a/cdm-test/src/test/java/ucar/nc2/ft/point/writer2/TestCFPointWriter.java b/cdm-test/src/test/java/ucar/nc2/ft/point/writer2/TestCFPointWriter.java
@@ -50,11 +50,11 @@ public static List<Object[]> getTestParameters() {
     List<Object[]> result = new ArrayList<>();
 
     result.addAll(TestCFPointDatasets.getPointDatasets());
-//    result.addAll(TestCFPointDatasets.getStationDatasets());
-//    result.addAll(TestCFPointDatasets.getProfileDatasets());
-//    result.addAll(TestCFPointDatasets.getTrajectoryDatasets());
-//    result.addAll(TestCFPointDatasets.getStationProfileDatasets());
-//    result.addAll(TestCFPointDatasets.getSectionDatasets());
+    result.addAll(TestCFPointDatasets.getStationDatasets());
+    result.addAll(TestCFPointDatasets.getProfileDatasets());
+    result.addAll(TestCFPointDatasets.getTrajectoryDatasets());
+    result.addAll(TestCFPointDatasets.getStationProfileDatasets());
+    result.addAll(TestCFPointDatasets.getSectionDatasets());
 
     return result;
   }

diff --git a/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5objects.java b/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5objects.java
@@ -21,7 +21,6 @@
 import ucar.nc2.iosp.hdf5.BTree2;
 import ucar.nc2.iosp.hdf5.FractalHeap;
 import ucar.nc2.iosp.hdf5.MemTracker;
-import ucar.nc2.filter.Filter;
 import ucar.unidata.io.RandomAccessFile;
 
 /** The low-level HDF5 data objects. */
@@ -1773,7 +1772,7 @@ String getName() {
     }
 
     int getId() {
-      return (int)this.properties.get(Filters.Keys.ID);
+      return (int) this.properties.get(Filters.Keys.ID);
     }
 
     Map<String, Object> getProperties() {

diff --git a/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5tiledLayoutBB.java b/cdm/core/src/main/java/ucar/nc2/internal/iosp/hdf5/H5tiledLayoutBB.java
@@ -69,8 +69,8 @@ public class H5tiledLayoutBB implements LayoutBB {
    * @throws InvalidRangeException if section invalid for this variable
    * @throws IOException on io error
    */
-  public H5tiledLayoutBB(Variable v2, Section wantSection, RandomAccessFile raf, H5objects.Filter[] filterProps, ByteOrder byteOrder)
-      throws InvalidRangeException, IOException {
+  public H5tiledLayoutBB(Variable v2, Section wantSection, RandomAccessFile raf, H5objects.Filter[] filterProps,
+      ByteOrder byteOrder) throws InvalidRangeException, IOException {
     wantSection = Section.fill(wantSection, v2.getShape());
 
     H5headerNew.Vinfo vinfo = (H5headerNew.Vinfo) v2.getSPobject();