Add tolerance when comparing doubles

Unidata · Jan 10, 2024 · 3cd53e8 · 3cd53e8
1 parent 3c1afa9
commit 3cd53e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tds/src/integrationTests/java/thredds/server/services/TestEnhancements.java b/tds/src/integrationTests/java/thredds/server/services/TestEnhancements.java
@@ -16,6 +16,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 public class TestEnhancements {
+  private static final double TOLERANCE = 1.0e-5;
 
   final static String ENHANCED_FILE = "localContent/testOffset.nc";
   final static String NCML_ENHANCED_FILE = "testOffsetWithNcml.nc";
@@ -73,7 +74,7 @@ private void checkResultWithEnhancements(NetcdfFile netcdfFile, int expectedDiff
     final Array values1 = enhancedVar.read();
     final Array values2 = orgVar.read();
     for (int i = 0; i < values1.getSize(); i++) {
-      assertThat(values1.getDouble(i)).isEqualTo(values2.getDouble(i) + expectedDiff);
+      assertThat(values1.getDouble(i)).isWithin(TOLERANCE).of(values2.getDouble(i) + expectedDiff);
     }
   }
 }
diff --git a/tds/src/main/java/thredds/core/DatasetManager.java b/tds/src/main/java/thredds/core/DatasetManager.java
@@ -211,9 +211,9 @@ public NetcdfFile openNetcdfFile(HttpServletRequest req, HttpServletResponse res
 
       DatasetUrl durl = DatasetUrl.findDatasetUrl(location);
       if (useNetcdfJavaBuilders || isLocationObjectStore(location)) {
-        ncfile = NetcdfDatasets.acquireFile(durl, null);
+        ncfile = NetcdfDatasets.acquireDataset(durl, null);
       } else {
-        ncfile = NetcdfDataset.acquireFile(durl, null);
+        ncfile = NetcdfDataset.acquireDataset(durl, null);
       }
     }