]> source.dussan.org Git - vaadin-framework.git/commitdiff
UIProviderInitParameter test upgrade (#14292)
authorAnna Koskinen <anna@vaadin.com>
Tue, 12 Aug 2014 11:47:03 +0000 (14:47 +0300)
committerVaadin Code Review <review@vaadin.com>
Mon, 18 Aug 2014 11:22:52 +0000 (11:22 +0000)
Change-Id: I44e7fa4b0d890972d4e6d14c3159aa9db9131c1d

uitest/src/com/vaadin/tests/applicationservlet/UIProviderInitParameter.html [deleted file]
uitest/src/com/vaadin/tests/applicationservlet/UIProviderInitParameterTest.java [new file with mode: 0644]

diff --git a/uitest/src/com/vaadin/tests/applicationservlet/UIProviderInitParameter.html b/uitest/src/com/vaadin/tests/applicationservlet/UIProviderInitParameter.html
deleted file mode 100644 (file)
index 8a5f89c..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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="" />
-<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>/uiprovider</td>
-       <td></td>
-</tr>
-<!--Test that UI parameter is used by default-->
-<tr>
-       <td>assertText</td>
-       <td>vaadin=uiprovider::/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VLabel[0]</td>
-       <td>Tests whether the testing server is run with assertions enabled.</td>
-</tr>
-<!--Test that UIProvider parameter is more important than UI parameter-->
-<tr>
-       <td>open</td>
-       <td>/uiprovider/test</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=uiprovider::/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VLabel[0]</td>
-       <td>Test for basic JavaScript component functionality.</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/UIProviderInitParameterTest.java b/uitest/src/com/vaadin/tests/applicationservlet/UIProviderInitParameterTest.java
new file mode 100644 (file)
index 0000000..8197bbe
--- /dev/null
@@ -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";
+    }
+
+}