--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8080/" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/run/com.vaadin.tests.components.table.CollapseIndicatorOverlapsColumn?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>RightColumnCaptionVisible</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentstableCollapseIndicatorOverlapsColumn::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[2]</td>
+ <td>76,11</td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>RightColumnCaptionAndSortIndicatorVisible</td>
+</tr>
+<tr>
+ <td>drag</td>
+ <td>vaadin=runcomvaadintestscomponentstableCollapseIndicatorOverlapsColumn::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>drop</td>
+ <td>vaadin=runcomvaadintestscomponentstableCollapseIndicatorOverlapsColumn::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+ <td>-100,0</td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>NoExtraSpacingInCaption</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
--- /dev/null
+package com.vaadin.tests.components.table;
+
+import com.vaadin.data.Item;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Table;
+
+public class CollapseIndicatorOverlapsColumn extends TestBase {
+
+ @Override
+ protected void setup() {
+ Table tbl = createTable();
+ tbl = createTable();
+ tbl.setWidth("400px");
+ addComponent(tbl);
+ }
+
+ private Table createTable() {
+ Table tbl = new Table();
+ tbl.addContainerProperty("COL1", String.class, "Column 1");
+ tbl.addContainerProperty("COL2", String.class, "Column 2");
+
+ // Right align last column
+ tbl.setColumnAlignment("COL2", Table.ALIGN_RIGHT);
+
+ // Allow collapsing
+ tbl.setColumnCollapsingAllowed(true);
+
+ for (int i = 0; i < 5; i++) {
+ Item item = tbl.addItem("Item " + i);
+ for (int j = 1; j <= 2; j++) {
+ item.getItemProperty("COL" + j).setValue("Item " + i + "/" + j);
+ }
+ }
+ return tbl;
+ }
+
+ @Override
+ protected String getDescription() {
+ return "The rightmost column should not be covered by the collapse indicator";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 6934;
+ }
+
+}