]> source.dussan.org Git - vaadin-framework.git/commitdiff
Migrate FlashIsVisible embedded test from TB2 to TB4
authorTeemu Suo-Anttila <teemusa@vaadin.com>
Wed, 18 Mar 2015 09:08:43 +0000 (11:08 +0200)
committerLeif Åstrand <leif@vaadin.com>
Fri, 20 Mar 2015 11:42:33 +0000 (13:42 +0200)
Change-Id: Ibb5c4e5ade99cddcc6bd96d19e00685eabca3812

uitest/src/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java [new file with mode: 0644]
uitest/tb2/com/vaadin/tests/components/embedded/FlashIsVisible.html [deleted file]

diff --git a/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java b/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java
new file mode 100644 (file)
index 0000000..64d70df
--- /dev/null
@@ -0,0 +1,32 @@
+/*
+ * 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.embedded;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class FlashIsVisibleTest extends
+        com.vaadin.tests.components.flash.FlashIsVisibleTest {
+
+    @Override
+    @Test
+    public void testFlashIsCorrectlyDisplayed() throws Exception {
+        assertTrue("Test is using wrong url",
+                getTestUrl().contains(".embedded."));
+        super.testFlashIsCorrectlyDisplayed();
+    }
+}
diff --git a/uitest/tb2/com/vaadin/tests/components/embedded/FlashIsVisible.html b/uitest/tb2/com/vaadin/tests/components/embedded/FlashIsVisible.html
deleted file mode 100644 (file)
index ffa2ac1..0000000
+++ /dev/null
@@ -1,33 +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>/run/com.vaadin.tests.components.embedded.FlashIsVisible</td>
-       <td></td>
-</tr>
-<!--Allow the flash plugin to load before taking the screenshot-->
-<tr>
-       <td>pause</td>
-       <td>5000</td>
-       <td></td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>blue-circle</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>