summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2011-08-18 14:08:08 +0000
committerArtur Signell <artur.signell@itmill.com>2011-08-18 14:08:08 +0000
commitc49adbc8cf61f1126986b26f54e05cb97509fd3a (patch)
treec386e1b7b1034a8927b7c53e2f9de51f19e36844
parent5a5db18cdeb10514fe16b4a4f7c888cc34721551 (diff)
downloadvaadin-framework-c49adbc8cf61f1126986b26f54e05cb97509fd3a.tar.gz
vaadin-framework-c49adbc8cf61f1126986b26f54e05cb97509fd3a.zip
Added some ugly styles so that the feature can be visually verified
svn changeset:20478/svn branch:6.7
-rw-r--r--WebContent/VAADIN/themes/tests-tickets/styles.css23
-rw-r--r--tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html6
-rw-r--r--tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java4
3 files changed, 29 insertions, 4 deletions
diff --git a/WebContent/VAADIN/themes/tests-tickets/styles.css b/WebContent/VAADIN/themes/tests-tickets/styles.css
index e6001a6dc2..f088e0dd35 100644
--- a/WebContent/VAADIN/themes/tests-tickets/styles.css
+++ b/WebContent/VAADIN/themes/tests-tickets/styles.css
@@ -335,4 +335,27 @@
.v-tabsheet-pg .v-tabsheet-tabitem-selected {
font-weight: bold
+}
+
+.v-tabsheet-tabitemcell-TabSheetTabStyleNames .v-tabsheet-tabitem-selected .v-caption {
+ background-color: green;
+}
+
+.v-tabsheet-tabitemcell-TabSheetTabStyleNames .v-caption {
+ font-weight: bold;
+ background: none;
+ margin-left: 0px;
+ background-color: blue;
+}
+.v-tabsheet-tabitemcell-TabSheetTabStyleNames_0 .v-caption {
+ color: blue;
+}
+
+.v-tabsheet-tabitemcell-TabSheetTabStyleNames_1 .v-caption {
+ color: red;
+}
+
+.v-tabsheet-tabitemcell-TabSheetTabStyleNames .v-tabsheet-tabitem {
+ background: none;
+ border: 2px solid red;
} \ No newline at end of file
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html
index 0ff83bbaca..67bedd93a3 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html
+++ b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html
@@ -19,7 +19,7 @@
<tr>
<td>assertCSSClass</td>
<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTabStyleNames::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
- <td>v-tabsheet-tabitemcell-ticket5880</td>
+ <td>v-tabsheet-tabitemcell-TabSheetTabStyleNames</td>
</tr>
<tr>
<td>click</td>
@@ -29,12 +29,12 @@
<tr>
<td>assertNotCSSClass</td>
<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTabStyleNames::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
- <td>v-tabsheet-tabitemcell-ticket5880</td>
+ <td>v-tabsheet-tabitemcell-TabSheetTabStyleNames</td>
</tr>
<tr>
<td>assertCSSClass</td>
<td>vaadin=runcomvaadintestscomponentstabsheetTabSheetTabStyleNames::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
- <td>v-tabsheet-tabitemcell-ticket5880_0</td>
+ <td>v-tabsheet-tabitemcell-TabSheetTabStyleNames_0</td>
</tr>
</tbody></table>
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
index 00b6e142b3..5c806b2ac2 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
+++ b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
@@ -9,10 +9,12 @@ import com.vaadin.ui.TabSheet.Tab;
public class TabSheetTabStyleNames extends TestBase {
- private static final String STYLE_NAME = "ticket5880";
+ private static final String STYLE_NAME = "TabSheetTabStyleNames";
@Override
public void setup() {
+ setTheme("tests-tickets");
+
TabSheet tabsheet = new TabSheet();
final Tab tab1 = tabsheet.addTab(new Label(), "Tab 1");
final Tab tab2 = tabsheet.addTab(new Label(), "Tab 2");