Simplify immutability test

--
MOS_MIGRATED_REVID=128800280

1 files changed, 16 insertions, 7 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java
index cd0129dd70..95423b6544 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertTrue;
 
 import com.google.devtools.build.lib.syntax.SkylarkList.MutableList;
 import com.google.devtools.build.lib.syntax.SkylarkList.Tuple;
+import com.google.devtools.build.lib.syntax.util.EvaluationTestCase;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,10 +34,14 @@ import java.util.TreeMap;
  *  without actually creating any parse trees.
  */
 @RunWith(JUnit4.class)
-public class EvalUtilsTest {
+public class EvalUtilsTest extends EvaluationTestCase {
 
-  private static SkylarkDict<Object, Object> makeDict() {
-    return SkylarkDict.<Object, Object>of(null);
+  private static MutableList<Object> makeList(Environment env) {
+    return MutableList.<Object>of(env, 1, 2, 3);
+  }
+
+  private static SkylarkDict<Object, Object> makeDict(Environment env) {
+    return SkylarkDict.<Object, Object>of(env, 1, 1, 2, 2);
   }
 
   @Test
@@ -54,8 +59,8 @@ public class EvalUtilsTest {
     assertEquals("string", EvalUtils.getDataTypeName("foo"));
     assertEquals("int", EvalUtils.getDataTypeName(3));
     assertEquals("tuple", EvalUtils.getDataTypeName(Tuple.of(1, 2, 3)));
-    assertEquals("list",  EvalUtils.getDataTypeName(MutableList.of(null, 1, 2, 3)));
-    assertEquals("dict",  EvalUtils.getDataTypeName(makeDict()));
+    assertEquals("list",  EvalUtils.getDataTypeName(makeList(null)));
+    assertEquals("dict",  EvalUtils.getDataTypeName(makeDict(null)));
     assertEquals("NoneType", EvalUtils.getDataTypeName(Runtime.NONE));
   }
 
@@ -64,8 +69,12 @@ public class EvalUtilsTest {
     assertTrue(EvalUtils.isImmutable("foo"));
     assertTrue(EvalUtils.isImmutable(3));
     assertTrue(EvalUtils.isImmutable(Tuple.of(1, 2, 3)));
-    assertFalse(EvalUtils.isImmutable(MutableList.of(null, 1, 2, 3)));
-    assertFalse(EvalUtils.isImmutable(makeDict()));
+
+    // Mutability depends on the environment.
+    assertTrue(EvalUtils.isImmutable(makeList(null)));
+    assertTrue(EvalUtils.isImmutable(makeDict(null)));
+    assertFalse(EvalUtils.isImmutable(makeList(env)));
+    assertFalse(EvalUtils.isImmutable(makeDict(env)));
   }
 
   @Test