[accumulo] branch main updated: Fix usage of @Tempdir causing tests to be skipped (#2528)

[do...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

domgarguilo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
     new 4a6c477  Fix usage of @Tempdir causing tests to be skipped (#2528)
4a6c477 is described below

commit 4a6c477f7f243750c57b23fe3e32b61d6ee19ffd
Author: Dom G <do...@gmail.com>
AuthorDate: Mon Feb 28 09:13:58 2022 -0500

    Fix usage of @Tempdir causing tests to be skipped (#2528)
---
 .../accumulo/core/classloader/ContextClassLoaderFactoryTest.java      | 2 +-
 .../org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java     | 2 +-
 .../java/org/apache/accumulo/core/file/rfile/GenerateSplitsTest.java  | 4 +++-
 core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/src/test/java/org/apache/accumulo/core/classloader/ContextClassLoaderFactoryTest.java b/core/src/test/java/org/apache/accumulo/core/classloader/ContextClassLoaderFactoryTest.java
index b05856d..4f0e2f2 100644
--- a/core/src/test/java/org/apache/accumulo/core/classloader/ContextClassLoaderFactoryTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/classloader/ContextClassLoaderFactoryTest.java
@@ -38,7 +38,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 public class ContextClassLoaderFactoryTest {
 
   @TempDir
-  private static final File tempFolder = new File(System.getProperty("user.dir") + "/target",
+  private final File tempFolder = new File(System.getProperty("user.dir") + "/target",
       ContextClassLoaderFactoryTest.class.getSimpleName() + "/");
 
   private String uri1;
diff --git a/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java b/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java
index 2e90ec7..af31354 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java
@@ -55,7 +55,7 @@ public class BloomFilterLayerLookupTest extends WithTestNames {
   private static final SecureRandom random = new SecureRandom();
 
   @TempDir
-  private static final File tempDir = new File(System.getProperty("user.dir") + "/target",
+  private final File tempDir = new File(System.getProperty("user.dir") + "/target",
       BloomFilterLayerLookupTest.class.getSimpleName() + "/");
 
   @Test
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/GenerateSplitsTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/GenerateSplitsTest.java
index beb3102..3e2da21 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/GenerateSplitsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/GenerateSplitsTest.java
@@ -51,7 +51,7 @@ public class GenerateSplitsTest {
   private static final Logger log = LoggerFactory.getLogger(GenerateSplitsTest.class);
 
   @TempDir
-  public static final File tempFolder = new File(System.getProperty("user.dir") + "/target",
+  private static File tempFolder = new File(System.getProperty("user.dir") + "/target",
       GenerateSplitsTest.class.getSimpleName() + "/");
 
   private static final RFileTest.TestRFile trf = new RFileTest.TestRFile(null);
@@ -75,6 +75,7 @@ public class GenerateSplitsTest {
     trf.closeWriter();
 
     File file = new File(tempFolder, "testGenerateSplits.rf");
+    assertTrue(file.createNewFile(), "Failed to create file: " + file);
     try (var fileOutputStream = new FileOutputStream(file)) {
       fileOutputStream.write(trf.baos.toByteArray());
     }
@@ -82,6 +83,7 @@ public class GenerateSplitsTest {
     log.info("Wrote to file {}", rfilePath);
 
     File splitsFile = new File(tempFolder, "testSplitsFile");
+    assertTrue(splitsFile.createNewFile(), "Failed to create file: " + splitsFile);
     splitsFilePath = splitsFile.getAbsolutePath();
   }
 
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
index 4a60290..8abfd8c 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
@@ -129,7 +129,7 @@ public class RFileTest {
   private static final Configuration hadoopConf = new Configuration();
 
   @TempDir
-  private static final File tempFolder =
+  private final File tempFolder =
       new File(System.getProperty("user.dir") + "/target", RFileTest.class.getSimpleName() + "/");
 
   @BeforeAll