diff options
author | John Ahlroos <john@vaadin.com> | 2012-08-31 10:10:03 +0300 |
---|---|---|
committer | John Ahlroos <john@vaadin.com> | 2012-08-31 10:10:03 +0300 |
commit | 340cd7899812b444941584d383d930fe8155159b (patch) | |
tree | 5989b22f0db52cd578aad087afc9f9fe4d63fb9d /uitest/src/com/vaadin/tests/components/flash | |
parent | 8b546f207714a663d4e2996f514cdc077cc9dafc (diff) | |
parent | 7b25b3886ea95bc6495506fbe9472e45fcbde684 (diff) | |
download | vaadin-framework-340cd7899812b444941584d383d930fe8155159b.tar.gz vaadin-framework-340cd7899812b444941584d383d930fe8155159b.zip |
Merge branch 'master' into layoutgraph
Conflicts:
client/src/com/vaadin/client/ComponentLocator.java
client/src/com/vaadin/client/ui/AbstractComponentConnector.java
Diffstat (limited to 'uitest/src/com/vaadin/tests/components/flash')
3 files changed, 96 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.html b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.html new file mode 100644 index 0000000000..82834cf405 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.html @@ -0,0 +1,33 @@ +<?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.flash.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></td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.java b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.java new file mode 100644 index 0000000000..23a4322fb7 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.java @@ -0,0 +1,30 @@ +package com.vaadin.tests.components.flash; + +import com.vaadin.server.ExternalResource; +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Flash; + +public class FlashIsVisible extends TestBase { + + @Override + protected void setup() { + 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)); + addComponent(player); + } + + @Override + protected String getDescription() { + return "Flash plugin should load and be visible on all browsers"; + } + + @Override + protected Integer getTicketNumber() { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/uitest/src/com/vaadin/tests/components/flash/FlashPresentation.java b/uitest/src/com/vaadin/tests/components/flash/FlashPresentation.java new file mode 100644 index 0000000000..5c28feb7f8 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/flash/FlashPresentation.java @@ -0,0 +1,33 @@ +package com.vaadin.tests.components.flash; + +import com.vaadin.server.ExternalResource; +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Flash; + +public class FlashPresentation extends TestBase { + + @Override + protected String getDescription() { + return "The embedded flash should have the movie parameter set to \"someRandomValue\" and an allowFullScreen parameter set to \"true\"."; + } + + @Override + protected Integer getTicketNumber() { + return 3367; + } + + @Override + public void setup() { + Flash player = new Flash(); + player.setWidth("400px"); + player.setHeight("300px"); + String url = "http://www.youtube.com/v/qQ9N742QB4g&autoplay=1"; + player.setSource(new ExternalResource(url)); + player.setParameter("movie", "someRandomValue"); + player.setParameter("allowFullScreen", "true"); + player.setAlternateText("Flash alternative text"); + + addComponent(player); + } + +} |