diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-09-23 15:15:02 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-09-23 15:15:02 +0300 |
| commit | e577bf9f0c99f340ef5d05e60f01f1378b68d097 (patch) | |
| tree | 66e36de4d64184edbfca11c602839061ebe5b684 /uitest/src | |
| parent | 0f7bcffdb9f753148d1027ff380c9520bb78bfd8 (diff) | |
| parent | c7aaa0413f63d938791e760b23fb3f609f285aa0 (diff) | |
| download | vaadin-framework-e577bf9f0c99f340ef5d05e60f01f1378b68d097.tar.gz vaadin-framework-e577bf9f0c99f340ef5d05e60f01f1378b68d097.zip | |
Merge changes from origin/7.1
0e048a5 Clarified error message (#12583)
d0af7d1 Add async-supported to all servlets to enable push testing (#12573)
1de4389 Use JUnit 4.11 in all modules (#12572)
d6954f8 Include TestBench 3.1.1 in the project (#12572)
cdb9a49 Enable native scrolling in all iOS versions newer than 5, not just iOS 6 (#12324)
0e2780a Ensure string converter is always set
cf796e2 Add v-iosN classname for all iOS versions instead of just N=6 (#12324)
46ac1e6 Update release notes to more closely be like 7.0.x (#12544)
d9f204f PostLayoutListener javadocs (#12562)
c7aaa04 Don't try to cast a connector to Widget. Fixes #12619
Change-Id: Icff34ba20a330e633c1b29ca8fd77d84b79841f5
Diffstat (limited to 'uitest/src')
| -rw-r--r-- | uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java | 8 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html | 51 |
2 files changed, 57 insertions, 2 deletions
diff --git a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java index 5ab2134cdb..a8d639cbc8 100644 --- a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java +++ b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java @@ -24,10 +24,12 @@ import java.net.ServerSocket; import java.net.Socket; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.EnumSet; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; +import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -181,7 +183,8 @@ public class DevelopmentServerLauncher { String[] paths = serverArgs.get("slowdown").split(","); for (String p : paths) { System.out.println("Slowing down: " + p); - webappcontext.addFilter(SlowFilter.class, p, 1); + webappcontext.addFilter(SlowFilter.class, p, + EnumSet.of(DispatcherType.REQUEST)); } } // --cache=/run/APP/PUBLISHED/*,/other/path/asd.jpg @@ -190,7 +193,8 @@ public class DevelopmentServerLauncher { String[] paths = serverArgs.get("cache").split(","); for (String p : paths) { System.out.println("Enabling cache for: " + p); - webappcontext.addFilter(CacheFilter.class, p, 1); + webappcontext.addFilter(CacheFilter.class, p, + EnumSet.of(DispatcherType.REQUEST)); } } diff --git a/uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html b/uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html new file mode 100644 index 0000000000..844636cb02 --- /dev/null +++ b/uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html @@ -0,0 +1,51 @@ +<?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="http://localhost:8888/"/> + <title>DnDOnSubtree</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.dd.DDTest8?restartApplication</td> + <td></td> + </tr> + <tr> + <td>drag</td> + <td>vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[3]</td> + <td>11,8</td> + </tr> + <!-- Drop on Bar5, which is a subtree target --> + <tr> + <td>drop</td> + <td>vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[6]</td> + <td>34,9</td> + </tr> + <tr> + <td>mouseClick</td> + <td> + vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[5]/expand + </td> + <td>10,8</td> + </tr> + <!-- Assert that the dragged & dropped node is now a child of Bar5 --> + <tr> + <td>assertElementPresent</td> + <td> + vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[5]/n[0] + </td> + <td></td> + </tr> + </tbody> +</table> +</body> +</html> |