From: Artur Signell <artur@vaadin.com>
Date: Thu, 7 Feb 2013 06:16:06 +0000 (+0200)
Subject: Replaced fragile flash test with a stable one using a local swf (#10807)
X-Git-Tag: 7.0.1~50
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fa95bdee6675ad6fc56b0d021227e5e25fe9316e;p=vaadin-framework.git

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 d3debf3417..ffa2ac11ec 100644
--- 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 1724fc11b7..5aec7f07c6 100644
--- 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 82834cf405..f3f8f50526 100644
--- 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 23a4322fb7..53de949176 100644
--- 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
index 0000000000..ea404f307f
Binary files /dev/null and b/uitest/src/com/vaadin/tests/components/flash/simple.swf differ