Improve before/after steps of test that checks cache

Unidata · Apr 19, 2024 · 0f1f8a9 · 0f1f8a9
1 parent 4905e37
commit 0f1f8a9
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/tds/src/test/java/thredds/server/wms/TestWmsCache.java b/tds/src/test/java/thredds/server/wms/TestWmsCache.java
@@ -76,6 +76,13 @@ public void createTestFiles() throws IOException {
     Files.copy(TEST_FILE, TEMP_FILE, StandardCopyOption.REPLACE_EXISTING);
   }
 
+  @Before
+  public void clearNetcdfFileCache() {
+    final FileCacheIF cache = NetcdfDatasets.getNetcdfFileCache();
+    cache.clearCache(true);
+    assertNoneLockedInNetcdfFileCache();
+  }
+
   @After
   public void clearCache() {
     ThreddsWmsServlet.resetCache();
@@ -174,7 +181,10 @@ public void shouldNotLockFileInCacheAfterExceptionIsThrown() throws ServletExcep
   }
 
   private void assertNoneLockedInNetcdfFileCache() {
-    assertNotLockedInNetcdfFileCache("");
+    final FileCacheIF cache = NetcdfDatasets.getNetcdfFileCache();
+    final List<String> entries = cache.showCache();
+    final boolean isLocked = entries.stream().anyMatch(e -> e.startsWith("true"));
+    assertWithMessage(cache.showCache().toString()).that(isLocked).isFalse();
   }
 
   private void assertNotLockedInNetcdfFileCache(String path) {