[brooklyn-server] 06/09: update test which asserted the broken behaviour (with a TODO to fix it!)

[he...@apache.org]

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-server.git

commit f0edbaf1e722286a6bfe58d8f533ddfa50d10f92
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Aug 6 13:44:46 2021 +0100

    update test which asserted the broken behaviour (with a TODO to fix it!)
---
 .../apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java  | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java
index 5a72d08..71238c9 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java
@@ -260,18 +260,13 @@ public class DslYamlTest extends AbstractYamlTest {
                 "  - type: wrapping-simple");
         Entity child1 = Iterables.get(app.getChildren(), 0);
         Entity child2 = Iterables.get(app.getChildren(), 1);
-        assertScopeRoot(child1, false);
-        // TODO Not the result I'd expect - in both cases the entity argument should the the scopeRoot element, not its child
-        assertScopeRoot(child2, true);
+        assertChildScopeRootReferenceIs(child1);
+        assertChildScopeRootReferenceIs(child2);
     }
 
-    private void assertScopeRoot(Entity entity, boolean isScopeBugged) throws Exception {
+    private void assertChildScopeRootReferenceIs(Entity entity) throws Exception {
         Entity child = Iterables.getOnlyElement(entity.getChildren());
-        if (!isScopeBugged) {
-            assertEquals(getConfigEventually(child, DEST), entity);
-        } else {
-            assertEquals(getConfigEventually(child, DEST), child);
-        }
+        assertEquals(getConfigEventually(child, DEST), entity);
     }
 
     @Test