Clean up some testing code: @Before methods' call order is unspecified, so we could get an NPE if one initializes a data structure the other uses. Also delete an unused field and do a small visibility drive-by.

--
MOS_MIGRATED_REVID=118248373

1 files changed, 5 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/skyframe/TrackingAwaiter.java b/src/test/java/com/google/devtools/build/skyframe/TrackingAwaiter.java
index 5c0e3565dc..481b9b13e8 100644
--- a/src/test/java/com/google/devtools/build/skyframe/TrackingAwaiter.java
+++ b/src/test/java/com/google/devtools/build/skyframe/TrackingAwaiter.java
@@ -82,6 +82,11 @@ public class TrackingAwaiter {
     }
   }
 
+  /** Allow arbitrary errors to be recorded here for later throwing. */
+  public void injectExceptionAndMessage(Throwable throwable, String message) {
+    exceptionsThrown.add(Pair.of(message, throwable));
+  }
+
   public void assertNoErrors() {
     List<Pair<String, Throwable>> thisEvalExceptionsThrown = ImmutableList.copyOf(exceptionsThrown);
     exceptionsThrown.clear();