diff options
author | vladmos <vladmos@google.com> | 2017-07-11 19:14:44 +0200 |
---|---|---|
committer | László Csomor <laszlocsomor@google.com> | 2017-07-12 08:49:07 +0200 |
commit | 8cbf0f16869f92f567f50be6508bf46dbd501d0a (patch) | |
tree | d7902782e460a6660ee672a68bdee45db75f8534 /src/test/java/com/google/devtools | |
parent | fd37b512d3a899da531cb6ba2cc70543246940fe (diff) |
Clean up string representations for unknown objects
Don't call the `toString` method on unknown objects as it potentially
breaks hermeticity and determinism. Use a generic string like
"<unknown object package.ClassName>" instead.
PiperOrigin-RevId: 161544828
Diffstat (limited to 'src/test/java/com/google/devtools')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/SkylarkStringRepresentationsTest.java | 11 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java | 19 |
2 files changed, 17 insertions, 13 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkStringRepresentationsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkStringRepresentationsTest.java index 82e2dfed90..8db33169eb 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkStringRepresentationsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkStringRepresentationsTest.java @@ -389,6 +389,17 @@ public class SkylarkStringRepresentationsTest extends SkylarkTestCase { } @Test + public void testStringRepresentationsOfUnknownObjects() throws Exception { + update("mock", new Object()); + + assertThat(eval("str(mock)")).isEqualTo("<unknown object java.lang.Object>"); + assertThat(eval("repr(mock)")).isEqualTo("<unknown object java.lang.Object>"); + assertThat(eval("'{}'.format(mock)")).isEqualTo("<unknown object java.lang.Object>"); + assertThat(eval("'%s' % mock")).isEqualTo("<unknown object java.lang.Object>"); + assertThat(eval("'%r' % mock")).isEqualTo("<unknown object java.lang.Object>"); + } + + @Test public void testLegacyStringRepresentations_Labels() throws Exception { setSkylarkSemanticsOptions("--incompatible_descriptive_string_representations=false"); diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java index fe16f1b195..77f627fd65 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java @@ -611,15 +611,6 @@ public class EvaluationTest extends EvaluationTestCase { }; } - private Object createUnknownObj() { - return new Object() { - @Override - public String toString() { - return "<unknown object>"; - } - }; - } - @Test public void testPercOnObject() throws Exception { newTest("--incompatible_descriptive_string_representations=true") @@ -629,8 +620,8 @@ public class EvaluationTest extends EvaluationTestCase { .update("obj", createObjWithStr()) .testStatement("'%s' % obj", "<str legacy marker>"); newTest() - .update("unknown", createUnknownObj()) - .testStatement("'%s' % unknown", "<unknown object>"); + .update("unknown", new Object()) + .testStatement("'%s' % unknown", "<unknown object java.lang.Object>"); } @Test @@ -642,8 +633,10 @@ public class EvaluationTest extends EvaluationTestCase { .update("obj", createObjWithStr()) .testStatement("'%s %s' % (obj, obj)", "<str legacy marker> <str legacy marker>"); newTest() - .update("unknown", createUnknownObj()) - .testStatement("'%s %s' % (unknown, unknown)", "<unknown object> <unknown object>"); + .update("unknown", new Object()) + .testStatement( + "'%s %s' % (unknown, unknown)", + "<unknown object java.lang.Object> <unknown object java.lang.Object>"); } @Test |