Take margin/border/padding into account when measuring TabSheet (#18471)

Change-Id: Id9aba32d5f2564961f167261a4fac2a3621e3583

2 files changed, 86 insertions, 0 deletions

diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanel.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanel.java
new file mode 100644
index 0000000000..b2313020a3
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanel.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.tabsheet;
+
+import com.vaadin.annotations.Theme;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalSplitPanel;
+import com.vaadin.ui.themes.ValoTheme;
+
+@Theme("valo")
+public class TabSheetInSplitPanel extends UI {
+
+    @Override
+    protected void init(VaadinRequest request) {
+        VerticalSplitPanel verticalSplitter = new VerticalSplitPanel();
+        setContent(verticalSplitter);
+        verticalSplitter.setSizeFull();
+        TabSheet t = new TabSheet();
+        t.setHeight("100%");
+        t.addTab(new Label("Hello in tab"), "Hello tab");
+        t.setStyleName(ValoTheme.TABSHEET_FRAMED);
+        verticalSplitter.addComponent(t);
+        verticalSplitter.addComponent(new Label("Hello"));
+
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanelTest.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanelTest.java
new file mode 100644
index 0000000000..8070133bde
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanelTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.tabsheet;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.testbench.elements.TabSheetElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class TabSheetInSplitPanelTest extends MultiBrowserTest {
+
+    @Test
+    public void ensureNoScrollbars() {
+        openTestURL();
+        TabSheetElement ts = $(TabSheetElement.class).first();
+        List<WebElement> scrollables = ts.findElements(By
+                .xpath("//*[contains(@class,'v-scrollable')]"));
+        for (WebElement scrollable : scrollables) {
+            assertNoHorizontalScrollbar(scrollable,
+                    "Element should not have a horizontal scrollbar");
+            assertNoVerticalScrollbar(scrollable,
+                    "Element should not have a vertical scrollbar");
+        }
+    }
+
+}