aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/syntax
diff options
context:
space:
mode:
authorGravatar brandjon <brandjon@google.com>2017-07-11 21:43:28 +0200
committerGravatar László Csomor <laszlocsomor@google.com>2017-07-12 08:49:58 +0200
commit3b038b9f7657f2d4c77700964ca06d92b3a6db12 (patch)
tree35ce4eeed92225f600744c1f758221760f34ae01 /src/test/java/com/google/devtools/build/lib/syntax
parentbefb8d62100dddffb513b6378f69a3fec10c7dd3 (diff)
Automated rollback of commit 0d2aa6369b09940d584b544fb10796387e0fafa0.
*** Reason for rollback *** PiperOrigin-RevId: 161567104
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/syntax')
-rw-r--r--src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java19
1 files changed, 13 insertions, 6 deletions
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 77f627fd65..fe16f1b195 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,6 +611,15 @@ 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")
@@ -620,8 +629,8 @@ public class EvaluationTest extends EvaluationTestCase {
.update("obj", createObjWithStr())
.testStatement("'%s' % obj", "<str legacy marker>");
newTest()
- .update("unknown", new Object())
- .testStatement("'%s' % unknown", "<unknown object java.lang.Object>");
+ .update("unknown", createUnknownObj())
+ .testStatement("'%s' % unknown", "<unknown object>");
}
@Test
@@ -633,10 +642,8 @@ public class EvaluationTest extends EvaluationTestCase {
.update("obj", createObjWithStr())
.testStatement("'%s %s' % (obj, obj)", "<str legacy marker> <str legacy marker>");
newTest()
- .update("unknown", new Object())
- .testStatement(
- "'%s %s' % (unknown, unknown)",
- "<unknown object java.lang.Object> <unknown object java.lang.Object>");
+ .update("unknown", createUnknownObj())
+ .testStatement("'%s %s' % (unknown, unknown)", "<unknown object> <unknown object>");
}
@Test