aboutsummaryrefslogtreecommitdiffstats
path: root/uitest/src/com
diff options
context:
space:
mode:
Diffstat (limited to 'uitest/src/com')
-rw-r--r--uitest/src/com/vaadin/tests/Parameters.java2
-rw-r--r--uitest/src/com/vaadin/tests/application/NavigateWithOngoingXHR.java2
-rw-r--r--uitest/src/com/vaadin/tests/applicationservlet/InitParamUIProvider.java2
-rw-r--r--uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java2
-rw-r--r--uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1589.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2292.java2
7 files changed, 7 insertions, 7 deletions
diff --git a/uitest/src/com/vaadin/tests/Parameters.java b/uitest/src/com/vaadin/tests/Parameters.java
index feb9a8cf6b..934a98e910 100644
--- a/uitest/src/com/vaadin/tests/Parameters.java
+++ b/uitest/src/com/vaadin/tests/Parameters.java
@@ -110,7 +110,7 @@ public class Parameters extends com.vaadin.server.LegacyApplication implements
public boolean handleRequest(VaadinSession session,
VaadinRequest request, VaadinResponse response) throws IOException {
context.setValue("Context not available");
- relative.setValue(request.getRequestPathInfo());
+ relative.setValue(request.getPathInfo());
params.removeAllItems();
Map<String, String[]> parameters = request.getParameterMap();
diff --git a/uitest/src/com/vaadin/tests/application/NavigateWithOngoingXHR.java b/uitest/src/com/vaadin/tests/application/NavigateWithOngoingXHR.java
index 5e3094b66c..d32ecb583d 100644
--- a/uitest/src/com/vaadin/tests/application/NavigateWithOngoingXHR.java
+++ b/uitest/src/com/vaadin/tests/application/NavigateWithOngoingXHR.java
@@ -35,7 +35,7 @@ public class NavigateWithOngoingXHR extends AbstractTestUI {
public boolean handleRequest(VaadinSession session,
VaadinRequest request, VaadinResponse response)
throws IOException {
- if ("/slowRequestHandler".equals(request.getRequestPathInfo())) {
+ if ("/slowRequestHandler".equals(request.getPathInfo())) {
// Make the navigation request last longer to keep the
// communication error visible
// System.out.println("Got slow content request");
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/InitParamUIProvider.java b/uitest/src/com/vaadin/tests/applicationservlet/InitParamUIProvider.java
index b4f29dda06..e62cd9a4f9 100644
--- a/uitest/src/com/vaadin/tests/applicationservlet/InitParamUIProvider.java
+++ b/uitest/src/com/vaadin/tests/applicationservlet/InitParamUIProvider.java
@@ -27,7 +27,7 @@ public class InitParamUIProvider extends UIProvider {
@Override
public Class<? extends UI> getUIClass(UIClassSelectionEvent event) {
VaadinRequest request = event.getRequest();
- String pathInfo = request.getRequestPathInfo();
+ String pathInfo = request.getPathInfo();
if ("/test".equals(pathInfo)) {
return BasicJavaScriptComponent.class;
} else {
diff --git a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java
index 57fc9f3e62..984ac69d6e 100644
--- a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java
+++ b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java
@@ -87,7 +87,7 @@ public class LazyInitUIs extends AbstractTestUIProvider {
public static Label getRequestInfo(String name, VaadinRequest request) {
String info = name;
- info += "<br />pathInfo: " + request.getRequestPathInfo();
+ info += "<br />pathInfo: " + request.getPathInfo();
info += "<br />parameters: " + request.getParameterMap().keySet();
info += "<br />uri fragment: "
+ Page.getCurrent().getLocation().getFragment();
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java
index c4d496641d..6cf0514df4 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java
@@ -44,7 +44,7 @@ public class UsingXyzWhenInitializing extends UI {
layout.addComponent(new Label("Hello " + name));
- String pathInfo = request.getRequestPathInfo();
+ String pathInfo = request.getPathInfo();
if ("/viewSource".equals(pathInfo)) {
layout.addComponent(new Label("This is the source"));
} else {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
index 9b5be40aa3..db6fa682fc 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
@@ -54,7 +54,7 @@ class MyDynamicResource implements RequestHandler {
@Override
public boolean handleRequest(VaadinSession session,
VaadinRequest request, VaadinResponse response) throws IOException {
- String relativeUri = request.getRequestPathInfo();
+ String relativeUri = request.getPathInfo();
// Catch the given URI that identifies the resource, otherwise let other
// URI handlers or the Application to handle the response.
if (!relativeUri.startsWith("myresource")) {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
index 2fd843ede6..e81ad3185a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
@@ -50,7 +50,7 @@ public class Ticket2292 extends com.vaadin.server.LegacyApplication implements
@Override
public boolean handleRequest(VaadinSession session,
VaadinRequest request, VaadinResponse response) throws IOException {
- String relativeUri = request.getRequestPathInfo();
+ String relativeUri = request.getPathInfo();
if (!relativeUri.contains("icon.png")) {
return false;