commit 908f4c91b4b5c1f996f1b177ab5886b1468cb6a9
author Mark Schaller <mschaller@google.com> Wed Oct 21 18:33:25 2015 +0000
committer Kristina Chodorow <kchodorow@google.com> Thu Oct 22 15:15:49 2015 +0000
tree c3ccda55ea589becda03a3f98112600caa0a793d
parent c031a000321a49aa2bbdfb427cb2fe4061ee613c

Minor cleanups to GraphTester

Refactors SkyFunction map creation into the tester from tests.
Encapsulates modifiedValues better.

--
MOS_MIGRATED_REVID=105982046

src/test/java/com/google/devtools/build/skyframe/GraphTester.java

diff --git a/src/test/java/com/google/devtools/build/skyframe/GraphTester.java b/src/test/java/com/google/devtools/build/skyframe/GraphTester.java
index f7c2da4..2d44e9d 100644
--- a/src/test/java/com/google/devtools/build/skyframe/GraphTester.java
+++ b/src/test/java/com/google/devtools/build/skyframe/GraphTester.java
@@ -16,13 +16,14 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.util.Pair;
 import com.google.devtools.build.skyframe.SkyFunction.Environment;
 import com.google.devtools.build.skyframe.SkyFunctionException.Transience;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -46,6 +47,8 @@
 public class GraphTester {
 
   public static final SkyFunctionName NODE_TYPE = SkyFunctionName.FOR_TESTING;
+  private final ImmutableMap<SkyFunctionName, ? extends SkyFunction> functionMap =
+      ImmutableMap.of(GraphTester.NODE_TYPE, new DelegatingFunction());
 
   private final Map<SkyKey, TestFunction> values = new HashMap<>();
   private final Set<SkyKey> modifiedValues = new LinkedHashSet<>();
@@ -77,8 +80,12 @@
     return getOrCreate(key, true).setConstantValue(value);
   }
 
-  public Collection<SkyKey> getModifiedValues() {
-    return modifiedValues;
+  public ImmutableSet<SkyKey> getModifiedValues() {
+    return ImmutableSet.copyOf(modifiedValues);
+  }
+
+  public void clearModifiedValues() {
+    modifiedValues.clear();
   }
 
   public SkyFunction getFunction() {
@@ -276,8 +283,8 @@
     }
   }
 
-  public DelegatingFunction createDelegatingFunction() {
-    return new DelegatingFunction();
+  public ImmutableMap<SkyFunctionName, ? extends SkyFunction> getSkyFunctionMap() {
+    return functionMap;
   }
 
   /**