[brooklyn-library] branch master updated: update test for literal, now deferred evaluation

[heneveld]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git


The following commit(s) were added to refs/heads/master by this push:
     new ba1deea  update test for literal, now deferred evaluation
ba1deea is described below

commit ba1deea621e64e3f977db528b2bc1a92c532999a
Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com>
AuthorDate: Wed Oct 28 12:16:16 2020 +0000

    update test for literal, now deferred evaluation
---
 .../org/apache/brooklyn/qa/camp/JavaWebAppsMatchingTest.java     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/qa/src/test/java/org/apache/brooklyn/qa/camp/JavaWebAppsMatchingTest.java 
b/qa/src/test/java/org/apache/brooklyn/qa/camp/JavaWebAppsMatchingTest.java
index 92e29b9..3a12958 100644
--- a/qa/src/test/java/org/apache/brooklyn/qa/camp/JavaWebAppsMatchingTest.java
+++ b/qa/src/test/java/org/apache/brooklyn/qa/camp/JavaWebAppsMatchingTest.java
@@ -90,12 +90,11 @@ public class JavaWebAppsMatchingTest {
         Map<?,?> cfg1 = (Map<?, ?>) 
plan.getServices().get(0).getCustomAttributes().get(BrooklynCampReservedKeys.BROOKLYN_CONFIG);
         Map<?,?> cfg = MutableMap.copyOf(cfg1);
         
-        Assert.assertEquals(cfg.remove("literalValue1"), "$brooklyn: is a fun 
place");
-        Assert.assertEquals(cfg.remove("literalValue2"), "$brooklyn: is a fun 
place");
-        Assert.assertEquals(cfg.remove("literalValue3"), "$brooklyn: is a fun 
place");
+        Assert.assertEquals(cfg.remove("literalValue1").toString(), 
"$brooklyn:literal(\"$brooklyn: is a fun place\")");
+        Assert.assertEquals(cfg.remove("literalValue2").toString(), 
"$brooklyn:literal(\"$brooklyn: is a fun place\")");
+        Assert.assertEquals(cfg.remove("literalValue3").toString(), 
"$brooklyn:literal(\"$brooklyn: is a fun place\")");
         Assert.assertEquals(cfg.remove("literalValue4"), "$brooklyn: is a fun 
place");
-        Assert.assertEquals(cfg.remove("$brooklyn:1"), "key to the city");
-        Assert.assertTrue(cfg.isEmpty(), ""+cfg);
+        Assert.assertEquals(cfg.size(), 1, ""+cfg);
 
         Assert.assertEquals(plan.getName(), "example-with-function");
         Assert.assertEquals(plan.getCustomAttributes().get("location"), 
"localhost");