From f80ea2b57f4a16fa4b6787576c62a4ddbd3d5849 Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Wed, 18 Mar 2015 11:08:43 +0200 Subject: [PATCH] Migrate FlashIsVisible embedded test from TB2 to TB4 Change-Id: Ibb5c4e5ade99cddcc6bd96d19e00685eabca3812 --- .../embedded/FlashIsVisibleTest.java | 32 ++++++++++++++++++ .../components/embedded/FlashIsVisible.html | 33 ------------------- 2 files changed, 32 insertions(+), 33 deletions(-) create mode 100644 uitest/src/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java delete mode 100644 uitest/tb2/com/vaadin/tests/components/embedded/FlashIsVisible.html 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 index 0000000000..64d70df88f --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java @@ -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 index ffa2ac11ec..0000000000 --- a/uitest/tb2/com/vaadin/tests/components/embedded/FlashIsVisible.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - -New Test - - - - - - - - - - - - - - - - - - - - - - - -
New Test
open/run/com.vaadin.tests.components.embedded.FlashIsVisible
pause5000
screenCaptureblue-circle
- - -- 2.39.5