Assigning both primary style and style name is now handled correctly (#12190)

Change-Id: Iceba6be78a49bc1aacf837b9fcd9790749be01c0

3 files changed, 135 insertions, 8 deletions

diff --git a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
index ccf070698b..c3f14be40c 100644
--- a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
+++ b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
@@ -333,14 +333,6 @@ public abstract class AbstractComponentConnector extends AbstractConnector
         AbstractComponentState state = getState();
 
         String primaryStyleName = getWidget().getStylePrimaryName();
-        if (state.primaryStyleName != null
-                && !state.primaryStyleName.equals(primaryStyleName)) {
-            /*
-             * We overwrite the widgets primary stylename if state defines a
-             * primary stylename.
-             */
-            getWidget().setStylePrimaryName(state.primaryStyleName);
-        }
 
         // Set the core 'v' style name for the widget
         setWidgetStyleName(StyleConstants.UI_WIDGET, true);
@@ -376,6 +368,16 @@ public abstract class AbstractComponentConnector extends AbstractConnector
             }
 
         }
+
+        if (state.primaryStyleName != null
+                && !state.primaryStyleName.equals(primaryStyleName)) {
+            /*
+             * We overwrite the widgets primary stylename if state defines a
+             * primary stylename. This has to be done after updating other
+             * styles to be sure the dependent styles are updated correctly.
+             */
+            getWidget().setStylePrimaryName(state.primaryStyleName);
+        }
         Profiler.leave("AbstractComponentConnector.updateWidgetStyleNames");
     }
 
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java
new file mode 100644
index 0000000000..1a15e7c5ae
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java
@@ -0,0 +1,74 @@
+/*
+ * 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.abstractcomponent;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+
+public class PrimaryStyle extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        // Use a set of three common components as a test.
+        final Label label = new Label("Test Label");
+        label.setPrimaryStyleName("initial");
+        label.setStyleName("state");
+        addComponent(label);
+
+        final Button button = new Button("Test Button");
+        button.setPrimaryStyleName("initial");
+        button.setStyleName("state");
+        addComponent(button);
+
+        final TextField tf = new TextField("Test TextField");
+        tf.setPrimaryStyleName("initial");
+        tf.setStyleName("state");
+        addComponent(tf);
+
+        Button updateButton = new Button("Update styles",
+                new Button.ClickListener() {
+
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+                        label.setPrimaryStyleName("updated");
+                        label.setStyleName("correctly");
+
+                        button.setPrimaryStyleName("updated");
+                        button.setStyleName("correctly");
+
+                        tf.setPrimaryStyleName("updated");
+                        tf.setStyleName("correctly");
+                    }
+                });
+        updateButton.setId("update-button");
+        addComponent(updateButton);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Test that setPrimaryStyleName followed by setStyleName results in correct class names.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12190;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java
new file mode 100644
index 0000000000..ce99c4a3d5
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java
@@ -0,0 +1,51 @@
+/*
+ * 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.abstractcomponent;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class PrimaryStyleTest extends MultiBrowserTest {
+
+    @Test
+    public void testStyleNames() {
+        openTestURL();
+
+        // Verify the initial class names for all three components.
+        List<WebElement> initialElements = driver.findElements(By
+                .className("initial-state"));
+        assertThat(initialElements, hasSize(3));
+
+        // Click on a button that updates the styles.
+        $(ButtonElement.class).id("update-button").click();
+
+        // Verify that the class names where updated as expected.
+        List<WebElement> updatedElements = driver.findElements(By.className("updated-correctly"));
+        assertThat(updatedElements, hasSize(initialElements.size()));
+
+    }
+
+}