Merge remote-tracking branch 'origin/master' into grid

Change-Id: Iac6947bc82bfbbb6856a924e7d538d195cfb405e

1 files changed, 58 insertions, 0 deletions

diff --git a/uitest/src/com/vaadin/tests/applicationservlet/UIProviderInitParameterTest.java b/uitest/src/com/vaadin/tests/applicationservlet/UIProviderInitParameterTest.java
new file mode 100644
index 0000000000..8197bbe8b8
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/applicationservlet/UIProviderInitParameterTest.java
@@ -0,0 +1,58 @@
+/*
+ * 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.applicationservlet;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.LabelElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class UIProviderInitParameterTest extends MultiBrowserTest {
+
+    @Test
+    public void testDefault() {
+        // Test that UI parameter is used by default
+        openTestURL();
+
+        List<LabelElement> labels = $(LabelElement.class).all();
+        assertTrue("unexpected amount of labels", labels.size() > 2);
+
+        LabelElement label = labels.get(labels.size() - 1);
+        String message = "Tests whether the testing server is run with assertions enabled.";
+        assertEquals("unexpected text found", message, label.getText());
+    }
+
+    @Test
+    public void testExtended() {
+        // Test that UIProvider parameter is more important than UI parameter
+        driver.get(getTestUrl().replace("uiprovider", "uiprovider/test"));
+
+        LabelElement label = $(LabelElement.class).first();
+        String message = "Test for basic JavaScript component functionality.";
+        assertEquals("unexpected text found", message, label.getText());
+    }
+
+    @Override
+    protected String getDeploymentPath() {
+        return "/uiprovider";
+    }
+
+}