Replaced fragile flash test with a stable one using a local swf (#10807)

Change-Id: I4231e0fa0b53f9e6d085b7409e6ad33bb5728b61

diff --git a/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.html b/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.html
index d3debf3417bb8f27289df6845e50d059632b8580..ffa2ac11ec60c58249c50b4d81f2b0eeb50810b1 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.html
+++ b/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.html
@@ -25,7 +25,7 @@
 <tr>
        <td>screenCapture</td>
        <td></td>
-       <td></td>
+       <td>blue-circle</td>
 </tr>
 
 </tbody></table>

diff --git a/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.java b/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.java
index 1724fc11b75f6682ab9cac78e4acbd773d509753..5aec7f07c629da5035119dec511537a127a79a61 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.java
@@ -1,9 +1,13 @@
 package com.vaadin.tests.components.embedded;
 
-import com.vaadin.server.ExternalResource;
+import com.vaadin.server.ClassResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Embedded;
 
+/**
+ * Tests the legacy flash support in Embedded
+ */
+@Deprecated
 public class FlashIsVisible extends TestBase {
 
     @Override
@@ -13,8 +17,9 @@ public class FlashIsVisible extends TestBase {
         player.setMimeType("application/x-shockwave-flash");
         player.setWidth("400px");
         player.setHeight("300px");
-        String url = "http://www.youtube.com/v/qQ9N742QB4g&autoplay=0";
-        player.setSource(new ExternalResource(url));
+        player.setSource(new ClassResource(
+                com.vaadin.tests.components.flash.FlashIsVisible.class,
+                "simple.swf"));
         addComponent(player);
     }
 

diff --git a/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.html b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.html
index 82834cf4057440997a2a8dff5f777fedefea2801..f3f8f50526a1c39f58d279368b940ae9d07b2e7f 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.html
+++ b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.html
@@ -25,7 +25,7 @@
 <tr>
        <td>screenCapture</td>
        <td></td>
-       <td></td>
+       <td>blue-circle</td>
 </tr>
 
 </tbody></table>

diff --git a/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.java b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.java
index 23a4322fb7aee726a0cbe005229a8a7f3b07a0a8..53de94917615f5ccf417eb5e067f6e79f5eaa270 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.java
+++ b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.flash;
 
-import com.vaadin.server.ExternalResource;
+import com.vaadin.server.ClassResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Flash;
 
@@ -11,8 +11,7 @@ public class FlashIsVisible extends TestBase {
         Flash player = new Flash();
         player.setWidth("400px");
         player.setHeight("300px");
-        String url = "http://www.youtube.com/v/qQ9N742QB4g&autoplay=0";
-        player.setSource(new ExternalResource(url));
+        player.setSource(new ClassResource("simple.swf"));
         addComponent(player);
     }
 

diff --git a/uitest/src/com/vaadin/tests/components/flash/simple.swf b/uitest/src/com/vaadin/tests/components/flash/simple.swf
new file mode 100644 (file)
index 0000000..ea404f3
Binary files /dev/null and b/uitest/src/com/vaadin/tests/components/flash/simple.swf differ