summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.html2
-rw-r--r--uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.java11
-rw-r--r--uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.html2
-rw-r--r--uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.java5
-rw-r--r--uitest/src/com/vaadin/tests/components/flash/simple.swfbin0 -> 437 bytes
5 files changed, 12 insertions, 8 deletions
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
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/flash/simple.swf
Binary files differ