diff options
| author | John Ahlroos <john@vaadin.com> | 2012-10-26 10:36:28 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-10-29 13:44:58 +0000 |
| commit | 274565fa24b7b04e99b7dec621005d93801f7fbb (patch) | |
| tree | 477a2cd883ffeb95f12b73a3a54314542b129d04 /uitest/src | |
| parent | 228186fe44245fa46a1614d027c89a276505685e (diff) | |
| download | vaadin-framework-274565fa24b7b04e99b7dec621005d93801f7fbb.tar.gz vaadin-framework-274565fa24b7b04e99b7dec621005d93801f7fbb.zip | |
Fixed missing stylenames on menu item #10077
Change-Id: Iadbfee6d86efef06d549d587e2ac6e2e6b519fb1
Diffstat (limited to 'uitest/src')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.html | 31 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.java | 2 |
2 files changed, 32 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.html index 1232418978..3a8e8d81af 100644 --- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.html +++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.html @@ -28,6 +28,21 @@ </tr> <tr> <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VMenuBar[0]/domChild[0]</td> + <td>my-menu-bar-menuitem-normal</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VMenuBar[0]/domChild[0]</td> + <td>icon-white</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VMenuBar[0]/domChild[0]</td> + <td>icon-headphones</td> +</tr> +<tr> + <td>assertCSSClass</td> <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VMenuBar[0]/domChild[1]</td> <td>my-menu-bar-menuitem</td> </tr> @@ -128,6 +143,21 @@ </tr> <tr> <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VMenuBar[0]/domChild[0]</td> + <td>my-other-menu-menuitem-normal</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VMenuBar[0]/domChild[0]</td> + <td>icon-white</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VMenuBar[0]/domChild[0]</td> + <td>icon-headphones</td> +</tr> +<tr> + <td>assertCSSClass</td> <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VMenuBar[0]/domChild[1]</td> <td>my-other-menu-menuitem</td> </tr> @@ -211,7 +241,6 @@ <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VMenuBar[0]#item0</td> <td>[tab]</td> </tr> - </tbody></table> </body> </html> diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.java index 79bec2e65e..ad8e2b05ed 100644 --- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.java +++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.java @@ -14,6 +14,8 @@ public class MenuBarPrimaryStylenames extends TestBase { mainMenu.setPrimaryStyleName("my-menu-bar"); MenuItem submenu1 = mainMenu.addItem("Submenu1", null); + submenu1.setStyleName("normal icon-white icon-headphones"); + MenuItem item1 = submenu1.addItem("Item1", null); item1.setCheckable(true); item1.setStyleName("my-menu-item"); |