commit a7ac95b09b3220d5f6b14f961d7cbd9732fcb7e7
author janakr <janakr@google.com> Fri Jun 18 11:36:01 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Jun 18 11:37:40 2021 -0700
tree ced1eff9f71e54948b5884e6979c3d23b884d53f
parent 5b216b27435aeb9eb9c3bd3c552d6498e1050cc7

Use better atomic constructs in test.

PiperOrigin-RevId: 380229840

src/test/java/com/google/devtools/build/lib/vfs/FileSystemConcurrencyTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemConcurrencyTest.java b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemConcurrencyTest.java
index 2d6308f..0cc1450 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemConcurrencyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemConcurrencyTest.java
@@ -13,17 +13,16 @@
 // limitations under the License.
 package com.google.devtools.build.lib.vfs;
 
+import com.google.devtools.build.lib.testutil.TestThread;
 import com.google.devtools.build.lib.testutil.TestUtils;
 import com.google.devtools.build.lib.vfs.util.FileSystems;
-
+import java.io.File;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import java.io.File;
-import java.io.IOException;
-
 /**
  * (Slow) tests of FileSystem under concurrency.
  *
@@ -31,7 +30,6 @@
  */
 @RunWith(JUnit4.class)
 public class FileSystemConcurrencyTest {
-
   Path workingDir;
 
   @Before
@@ -44,54 +42,36 @@
 
   @Test
   public void testConcurrentSymlinkModifications() throws Exception {
-    final Path xFile = workingDir.getRelative("file");
+    Path xFile = workingDir.getRelative("file");
     FileSystemUtils.createEmptyFile(xFile);
 
-    final Path xLinkToFile = workingDir.getRelative("link");
+    Path xLinkToFile = workingDir.getRelative("link");
 
-    // "Boxed" for pass-by-reference.
-    final boolean[] run = { true };
-    final IOException[] exception = { null };
-    Thread createThread = new Thread() {
-      @Override
-      public void run() {
-        while (run[0]) {
-          if (!xLinkToFile.exists()) {
-            try {
-              xLinkToFile.createSymbolicLink(xFile);
-            } catch (IOException e) {
-              exception[0] = e;
-              return;
-            }
-          }
-        }
-      }
-    };
-    Thread deleteThread = new Thread() {
-      @Override
-      public void run() {
-        while (run[0]) {
-          if (xLinkToFile.exists(Symlinks.NOFOLLOW)) {
-            try {
-              xLinkToFile.delete();
-            } catch (IOException e) {
-              exception[0] = e;
-              return;
-            }
-          }
-        }
-      }
-    };
+    AtomicBoolean run = new AtomicBoolean(true);
+    TestThread createThread =
+        new TestThread(
+            () -> {
+              while (run.get()) {
+                if (!xLinkToFile.exists()) {
+                  xLinkToFile.createSymbolicLink(xFile);
+                }
+              }
+            });
+    TestThread deleteThread =
+        new TestThread(
+            () -> {
+              while (run.get()) {
+                if (xLinkToFile.exists(Symlinks.NOFOLLOW)) {
+                  xLinkToFile.delete();
+                }
+              }
+            });
     createThread.start();
     deleteThread.start();
     Thread.sleep(1000);
-    run[0] = false;
-    createThread.join(0);
-    deleteThread.join(0);
-
-    if (exception[0] != null) {
-      throw exception[0];
-    }
+    run.set(false);
+    createThread.joinAndAssertState(TestUtils.WAIT_TIMEOUT_MILLISECONDS);
+    deleteThread.joinAndAssertState(TestUtils.WAIT_TIMEOUT_MILLISECONDS);
   }
 
 }