diff options
| author | Artur Signell <artur@vaadin.com> | 2012-11-14 13:26:45 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-11-14 13:26:45 +0000 |
| commit | 253271318ff6e952add01d10f72bc98fa666f078 (patch) | |
| tree | 92188259d99f30e4b5ae0946d1af62287c95ee4a /server/tests | |
| parent | 2efb8f3753808c8b35dacde0d731e82b9c752359 (diff) | |
| parent | 8a69b220bb80fc726e6d62ce540ee5e9402b7a63 (diff) | |
| download | vaadin-framework-253271318ff6e952add01d10f72bc98fa666f078.tar.gz vaadin-framework-253271318ff6e952add01d10f72bc98fa666f078.zip | |
Merge "Fix LegacyUIAddRemoveComponents test (#2924)"
Diffstat (limited to 'server/tests')
| -rw-r--r-- | server/tests/src/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponents.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/tests/src/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponents.java b/server/tests/src/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponents.java index 1a5e19e0da..24fd3d85a8 100644 --- a/server/tests/src/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponents.java +++ b/server/tests/src/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponents.java @@ -26,7 +26,7 @@ public class LegacyUIAddRemoveComponents { ui.addComponent(c); - assertSame(c, ui.iterator().next()); + assertSame(c.getParent(), ui.iterator().next()); assertSame(c, ui.getContent().iterator().next()); assertEquals(1, ui.getComponentCount()); assertEquals(1, ui.getContent().getComponentCount()); @@ -41,9 +41,9 @@ public class LegacyUIAddRemoveComponents { ui.removeComponent(c); - assertFalse(ui.iterator().hasNext()); + assertEquals(ui.getContent(), ui.iterator().next()); assertFalse(ui.getContent().iterator().hasNext()); - assertEquals(0, ui.getComponentCount()); + assertEquals(1, ui.getComponentCount()); assertEquals(0, ui.getContent().getComponentCount()); } @@ -57,7 +57,7 @@ public class LegacyUIAddRemoveComponents { ui.replaceComponent(c, d); - assertSame(d, ui.iterator().next()); + assertSame(d.getParent(), ui.iterator().next()); assertSame(d, ui.getContent().iterator().next()); assertEquals(1, ui.getComponentCount()); assertEquals(1, ui.getContent().getComponentCount()); |