Change-Id: Ifdfac8f2088042e2eeb4618b66a9e4dc315f7e24tags/7.6.0.alpha7
@@ -20,13 +20,19 @@ import org.junit.Test; | |||
import com.vaadin.testbench.elements.ButtonElement; | |||
import com.vaadin.testbench.elements.CheckBoxElement; | |||
import com.vaadin.testbench.elements.NotificationElement; | |||
import com.vaadin.testbench.parallel.BrowserUtil; | |||
import com.vaadin.tests.tb3.MultiBrowserThemeTest; | |||
public class CriticalNotificationsTest extends MultiBrowserThemeTest { | |||
@Override | |||
protected boolean useNativeEventsForIE11() { | |||
return false; | |||
protected boolean useNativeEventsForIE() { | |||
if (BrowserUtil.isIE(getDesiredCapabilities(), 11)) { | |||
// Use JavaScript events only for IE11 | |||
return false; | |||
} else { | |||
return true; | |||
} | |||
} | |||
@Test |
@@ -22,6 +22,7 @@ import java.util.regex.Matcher; | |||
import java.util.regex.Pattern; | |||
import org.junit.Assert; | |||
import org.junit.Before; | |||
import org.junit.Test; | |||
import org.openqa.selenium.Point; | |||
import org.openqa.selenium.WebElement; | |||
@@ -39,15 +40,23 @@ public abstract class AbstractContextClickTest extends MultiBrowserTest { | |||
private Pattern defaultLog = Pattern | |||
.compile("[0-9]+. ContextClickEvent: [(]([0-9]+), ([0-9]+)[)]"); | |||
@Override | |||
protected boolean useNativeEventsForIE() { | |||
return false; | |||
} | |||
@Override | |||
public List<DesiredCapabilities> getBrowsersToTest() { | |||
return getBrowsersSupportingContextMenu(); | |||
} | |||
@Test | |||
public void testDefaultListener() { | |||
@Before | |||
public void setUp() { | |||
openTestURL(); | |||
} | |||
@Test | |||
public void testDefaultListener() { | |||
addOrRemoveDefaultListener(); | |||
assertDefaultContextClickListener(1); |
@@ -24,8 +24,6 @@ import com.vaadin.testbench.elements.GridElement; | |||
public class GridContextClickTest extends AbstractContextClickTest { | |||
@Test | |||
public void testBodyContextClickWithTypedListener() { | |||
openTestURL(); | |||
addOrRemoveTypedListener(); | |||
contextClick($(GridElement.class).first().getCell(0, 0)); | |||
@@ -43,8 +41,6 @@ public class GridContextClickTest extends AbstractContextClickTest { | |||
@Test | |||
public void testHeaderContextClickWithTypedListener() { | |||
openTestURL(); | |||
addOrRemoveTypedListener(); | |||
contextClick($(GridElement.class).first().getHeaderCell(0, 0)); | |||
@@ -62,8 +58,6 @@ public class GridContextClickTest extends AbstractContextClickTest { | |||
@Test | |||
public void testFooterContextClickWithTypedListener() { | |||
openTestURL(); | |||
addOrRemoveTypedListener(); | |||
contextClick($(GridElement.class).first().getFooterCell(0, 0)); |
@@ -21,8 +21,6 @@ public class ListenerAddAndRemoveTest extends TableContextClickTestBase { | |||
@Test | |||
public void testAddAndRemoveListeners() { | |||
openTestURL(); | |||
// Add typed listener | |||
addOrRemoveTypedListener(); | |||
@@ -29,6 +29,7 @@ public class TableContextClick extends | |||
Table table = new Table(); | |||
table.setContainerDataSource(PersonContainer.createWithTestData()); | |||
table.setFooterVisible(true); | |||
table.setHeight("400px"); | |||
return table; | |||
} | |||
@@ -25,8 +25,6 @@ public class TableContextClickTest extends TableContextClickTestBase { | |||
@Test | |||
public void testBodyContextClickWithTypedListener() { | |||
openTestURL(); | |||
addOrRemoveTypedListener(); | |||
assertTypedContextClickListener(1); | |||
@@ -34,8 +32,6 @@ public class TableContextClickTest extends TableContextClickTestBase { | |||
@Test | |||
public void testHeaderContextClickWithTypedListener() { | |||
openTestURL(); | |||
addOrRemoveTypedListener(); | |||
contextClick($(TableElement.class).first().getHeaderCell(0)); | |||
@@ -53,8 +49,6 @@ public class TableContextClickTest extends TableContextClickTestBase { | |||
@Test | |||
public void testFooterContextClickWithTypedListener() { | |||
openTestURL(); | |||
addOrRemoveTypedListener(); | |||
contextClick($(TableElement.class).first().getFooterCell(0)); |
@@ -905,7 +905,7 @@ public abstract class AbstractTB3Test extends ParallelTest { | |||
} | |||
/** | |||
* Should the "native events" be enabled for Internet Explorer 11. | |||
* Should the "native events" be enabled for Internet Explorer. | |||
* <p> | |||
* Native events sometimes cause failure in clicking on buttons/checkboxes | |||
* but are possibly needed for some operations. | |||
@@ -913,7 +913,7 @@ public abstract class AbstractTB3Test extends ParallelTest { | |||
* @return true, to use "native events", false to use generated Javascript | |||
* events | |||
*/ | |||
protected boolean useNativeEventsForIE11() { | |||
protected boolean useNativeEventsForIE() { | |||
return true; | |||
} | |||
@@ -96,13 +96,9 @@ public abstract class MultiBrowserTest extends PrivateTB3Configuration { | |||
InternetExplorerDriver.ENABLE_PERSISTENT_HOVERING, | |||
false); | |||
} | |||
if (BrowserUtil.isIE(desiredCapabilities, 11)) { | |||
// Only for IE 11 for now, can be expanded to other versions if | |||
// they have the same problems | |||
if (!useNativeEventsForIE11()) { | |||
desiredCapabilities.setCapability( | |||
InternetExplorerDriver.NATIVE_EVENTS, false); | |||
} | |||
if (!useNativeEventsForIE()) { | |||
desiredCapabilities.setCapability( | |||
InternetExplorerDriver.NATIVE_EVENTS, false); | |||
} | |||
} | |||