Cleanup javadoc around Mutability / SkylarkMutable

Also throw IllegalArgumentException instead of AssertionError.

A follow-up CL will look to eliminate the SkylarkMutable#checkMutable(Location, Environment) override in favor of checkMutable(Location, Mutability). This will make it easier to manipulate Skylark values in specialized contexts aside from normal evaluation.

RELNOTES: None
PiperOrigin-RevId: 163978262

1 files changed, 4 insertions, 4 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java
index 00319c62cc..a61894ecef 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java
@@ -253,7 +253,7 @@ public class EnvironmentTest extends EvaluationTestCase {
     mutability.unlock(dummy, locA);
     assertThat(mutability.isLocked(dummy)).isTrue();
     try {
-      Mutability.checkMutable(dummy, env);
+      Mutability.checkMutable(dummy, env.mutability());
       fail("Able to mutate locked object");
     } catch (Mutability.MutabilityException e) {
       assertThat(e).hasMessage("trying to mutate a locked object (is it currently being iterated "
@@ -263,20 +263,20 @@ public class EnvironmentTest extends EvaluationTestCase {
     try {
       mutability.unlock(dummy, locA);
       fail("Able to unlock object with wrong location");
-    } catch (AssertionError e) {
+    } catch (IllegalArgumentException e) {
       assertThat(e).hasMessage("trying to unlock an object for a location at which "
           + "it was not locked (/a:1)");
     }
     mutability.unlock(dummy, locB);
     assertThat(mutability.isLocked(dummy)).isFalse();
-    Mutability.checkMutable(dummy, env);
+    Mutability.checkMutable(dummy, env.mutability());
 
     // Acquire, then freeze.
     mutability.lock(dummy, locA);
     mutability.freeze();
     assertThat(mutability.isLocked(dummy)).isFalse();
     try {
-      Mutability.checkMutable(dummy, env);
+      Mutability.checkMutable(dummy, env.mutability());
       fail("Able to mutate locked object");
     } catch (Mutability.MutabilityException e) {
       assertThat(e).hasMessage("trying to mutate a frozen object");