diff options
Diffstat (limited to 'tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java')
| -rw-r--r-- | tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java index 9e0558a122..f0cbfe7a87 100644 --- a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java +++ b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java @@ -46,7 +46,7 @@ public class TestHierarchicalContainer extends assertNull("Parent should be null, is " + p1, p1); container.removeAllItems(); - p1 = container.getParent("com.vaadin.terminal.gwt.client.Focusable"); + p1 = container.getParent("com.vaadin.client.Focusable"); assertNull("Parent should be null, is " + p1, p1); } @@ -59,12 +59,12 @@ public class TestHierarchicalContainer extends Object p1 = container.getParent("com.vaadin.ui.TabSheet"); assertEquals("com.vaadin.ui", p1); p1 = container - .getParent("com.vaadin.terminal.gwt.client.ui.VPopupCalendar"); + .getParent("com.vaadin.client.ui.VPopupCalendar"); assertNull(p1); container.removeAllContainerFilters(); p1 = container - .getParent("com.vaadin.terminal.gwt.client.ui.VPopupCalendar"); - assertEquals("com.vaadin.terminal.gwt.client.ui", p1); + .getParent("com.vaadin.client.ui.VPopupCalendar"); + assertEquals("com.vaadin.client.ui", p1); } @@ -111,7 +111,7 @@ public class TestHierarchicalContainer extends validateHierarchicalContainer(container, "com", "com.vaadin.ui.TabSheet", - "com.vaadin.terminal.gwt.client.Focusable", "blah", true, + "com.vaadin.client.Focusable", "blah", true, expectedSize, expectedRoots, true); // only include .gwt.client classes @@ -126,8 +126,8 @@ public class TestHierarchicalContainer extends expectedRoots = 1; validateHierarchicalContainer(container, "com", - "com.vaadin.terminal.gwt.client.WidgetSet", - "com.vaadin.terminal.gwt.client.ui.VSplitPanelVertical", + "com.vaadin.client.WidgetSet", + "com.vaadin.client.ui.VSplitPanelVertical", "blah", true, expectedSize, expectedRoots, true); // Additionally remove all without 'm' in the simple name. @@ -139,8 +139,8 @@ public class TestHierarchicalContainer extends validateHierarchicalContainer( container, "com", - "com.vaadin.terminal.gwt.client.ui.VUriFragmentUtility", - "com.vaadin.terminal.gwt.client.ui.layout.ChildComponentContainer", + "com.vaadin.client.ui.VUriFragmentUtility", + "com.vaadin.client.ui.layout.ChildComponentContainer", "blah", true, expectedSize, expectedRoots, true); } @@ -208,15 +208,15 @@ public class TestHierarchicalContainer extends // 20 items match the filter. // com.vaadin.data.BufferedValidatable // com.vaadin.data.Validatable - // com.vaadin.terminal.gwt.client.Focusable - // com.vaadin.terminal.gwt.client.Paintable - // com.vaadin.terminal.gwt.client.ui.Table - // com.vaadin.terminal.gwt.client.ui.VLabel - // com.vaadin.terminal.gwt.client.ui.VScrollTable - // com.vaadin.terminal.gwt.client.ui.VTablePaging - // com.vaadin.terminal.gwt.client.ui.VTabsheet - // com.vaadin.terminal.gwt.client.ui.VTabsheetBase - // com.vaadin.terminal.gwt.client.ui.VTabsheetPanel + // com.vaadin.client.Focusable + // com.vaadin.client.Paintable + // com.vaadin.client.ui.Table + // com.vaadin.client.ui.VLabel + // com.vaadin.client.ui.VScrollTable + // com.vaadin.client.ui.VTablePaging + // com.vaadin.client.ui.VTabsheet + // com.vaadin.client.ui.VTabsheetBase + // com.vaadin.client.ui.VTabsheetPanel // com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent // com.vaadin.terminal.Paintable // com.vaadin.terminal.Scrollable @@ -233,7 +233,7 @@ public class TestHierarchicalContainer extends validateHierarchicalContainer(container, "com.vaadin.data.BufferedValidatable", "com.vaadin.ui.TabSheet", - "com.vaadin.terminal.gwt.client.ui.VTabsheetBase", "blah", + "com.vaadin.client.ui.VTabsheetBase", "blah", true, expectedSize, expectedRoots, false); // only include .gwt.client classes @@ -245,14 +245,14 @@ public class TestHierarchicalContainer extends int classes = 110; expectedSize = packages + classes; - expectedRoots = 35 + 1; // com.vaadin.terminal.gwt.client.ui + - // com.vaadin.terminal.gwt.client.* + expectedRoots = 35 + 1; // com.vaadin.client.ui + + // com.vaadin.client.* // Sorting is case insensitive validateHierarchicalContainer(container, - "com.vaadin.terminal.gwt.client.ApplicationConfiguration", - "com.vaadin.terminal.gwt.client.WidgetSet", - "com.vaadin.terminal.gwt.client.ui.VOptionGroup", "blah", true, + "com.vaadin.client.ApplicationConfiguration", + "com.vaadin.client.WidgetSet", + "com.vaadin.client.ui.VOptionGroup", "blah", true, expectedSize, expectedRoots, false); // Additionally remove all without 'P' in the simple name. @@ -262,9 +262,9 @@ public class TestHierarchicalContainer extends expectedRoots = expectedSize; validateHierarchicalContainer(container, - "com.vaadin.terminal.gwt.client.Paintable", - "com.vaadin.terminal.gwt.client.ui.VTabsheetPanel", - "com.vaadin.terminal.gwt.client.ui.VPopupCalendar", "blah", + "com.vaadin.client.Paintable", + "com.vaadin.client.ui.VTabsheetPanel", + "com.vaadin.client.ui.VPopupCalendar", "blah", true, expectedSize, expectedRoots, false); } |