Cleanup AbstractQueueVisitorTest, simpleCounter in particular

Second in a sequence of CLs to deflake #simpleCounter. The condition,
commented out in a previous CL, was checking a property that wasn't
deterministic. The maxRunningConcurrently could be either one or two
depending on how quickly the AbstractQueueVisitor scheduled the
runnables.

Also added documentation to a confusing constructor call and removed
dead code.

--
MOS_MIGRATED_REVID=116995523

1 files changed, 1 insertions, 16 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitorTest.java b/src/test/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitorTest.java
index 52f361c0fc..64fc9f3c7c 100644
--- a/src/test/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitorTest.java
@@ -56,8 +56,6 @@ public class AbstractQueueVisitorTest {
     counter.awaitQuiescence(/*interruptWorkers=*/ false);
     assertSame(10, counter.getCount());
     assertSame(0, counter.activeParallelTasks());
-    // TODO(mschaller): Fix this flaky assertion.
-    // assertSame(1, counter.getMaxRunningConcurrently());
   }
 
   @Test
@@ -486,11 +484,10 @@ public class AbstractQueueVisitorTest {
     private final static String THREAD_NAME = "BlazeTest CountingQueueVisitor";
 
     private int theInt = 0;
-    private int maxRunningConcurrently = 0;
     private final Object lock = new Object();
 
     public CountingQueueVisitor() {
-      super(5, 3L, TimeUnit.SECONDS, THREAD_NAME);
+      super(/*parallelism=*/ 5, /*keepAlive=*/ 3L, TimeUnit.SECONDS, THREAD_NAME);
     }
 
     public CountingQueueVisitor(ThreadPoolExecutor executor) {
@@ -507,10 +504,6 @@ public class AbstractQueueVisitorTest {
                   theInt++;
                   enqueue();
                 }
-                int concurrentTasks = activeParallelTasks();
-                if (concurrentTasks > maxRunningConcurrently) {
-                  maxRunningConcurrently = concurrentTasks;
-                }
               }
             }
           });
@@ -519,10 +512,6 @@ public class AbstractQueueVisitorTest {
     public int getCount() {
       return theInt;
     }
-
-    public int getMaxRunningConcurrently() {
-      return maxRunningConcurrently;
-    }
   }
 
   private static class ConcreteQueueVisitor extends AbstractQueueVisitor {
@@ -533,10 +522,6 @@ public class AbstractQueueVisitorTest {
       super(5, 3L, TimeUnit.SECONDS, THREAD_NAME);
     }
 
-    public ConcreteQueueVisitor(boolean failFast) {
-      super(true, 5, 3L, TimeUnit.SECONDS, failFast, THREAD_NAME);
-    }
-
     public ConcreteQueueVisitor(boolean failFast, boolean failFastOnInterrupt) {
       super(true, 5, 3L, TimeUnit.SECONDS, failFast, failFastOnInterrupt, THREAD_NAME);
     }