Updated to be Root-based and added debug ids to ease testing

diff --git a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java b/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java
deleted file mode 100644 (file)
index 7ba6f2c..0000000
--- a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.vaadin.tests.integration;
-
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.EventRequest;
-import javax.portlet.EventResponse;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-import javax.portlet.WindowState;
-
-import com.vaadin.Application;
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.gwt.client.ui.label.ContentMode;
-import com.vaadin.terminal.gwt.server.PortletApplicationContext2;
-import com.vaadin.terminal.gwt.server.PortletApplicationContext2.PortletListener;
-import com.vaadin.ui.Embedded;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.Link;
-import com.vaadin.ui.Notification;
-import com.vaadin.ui.Root;
-import com.vaadin.ui.Root.LegacyWindow;
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.Upload;
-import com.vaadin.ui.Upload.Receiver;
-
-/**
- * Adapted from old PortletDemo to support integration testing.
- */
-public class JSR286PortletApplication extends Application.LegacyApplication {
-
-    LegacyWindow main = new LegacyWindow();
-    TextField tf = new TextField("Some value");
-    Label userInfo = new Label();
-    Link portletEdit = new Link();
-    Link portletMax = new Link();
-    Link someAction = null;
-
-    @Override
-    public void init() {
-        setMainWindow(main);
-
-        Embedded appResourceTest = new Embedded(
-                "Test of ApplicationResources with full path",
-                new FlagSeResource(this));
-        main.addComponent(appResourceTest);
-        Embedded specialNameResourceTest = new Embedded(
-                "Test ApplicationResources with special names",
-                new SpecialNameResource(this));
-        main.addComponent(specialNameResourceTest);
-
-        userInfo.setCaption("User info");
-        userInfo.setContentMode(ContentMode.PREFORMATTED);
-        main.addComponent(userInfo);
-
-        tf.setEnabled(false);
-        tf.setImmediate(true);
-        main.addComponent(tf);
-
-        portletEdit.setEnabled(false);
-        main.addComponent(portletEdit);
-        portletMax.setEnabled(false);
-        main.addComponent(portletMax);
-
-        Upload upload = new Upload("Upload a file", new Receiver() {
-
-            public OutputStream receiveUpload(String filename, String mimeType) {
-                return new ByteArrayOutputStream();
-            }
-        });
-        main.addComponent(upload);
-
-        if (getContext() instanceof PortletApplicationContext2) {
-            PortletApplicationContext2 ctx = (PortletApplicationContext2) getContext();
-            ctx.addPortletListener(this, new DemoPortletListener());
-        } else {
-            getMainWindow().showNotification("Not inited via Portal!",
-                    Notification.TYPE_ERROR_MESSAGE);
-        }
-
-    }
-
-    private class DemoPortletListener implements PortletListener {
-
-        public void handleActionRequest(ActionRequest request,
-                ActionResponse response, Root window) {
-            main.addComponent(new Label("Action received"));
-        }
-
-        public void handleRenderRequest(RenderRequest request,
-                RenderResponse response, Root window) {
-            // Portlet up-and-running, enable stuff
-            portletEdit.setEnabled(true);
-            portletMax.setEnabled(true);
-
-            // Editable if we're in editmode
-            tf.setEnabled((request.getPortletMode() == PortletMode.EDIT));
-
-            // Show notification about current mode and state
-            getMainWindow().showNotification(
-                    "Portlet status",
-                    "Mode: " + request.getPortletMode() + " State: "
-                            + request.getWindowState(),
-                    Notification.TYPE_WARNING_MESSAGE);
-
-            // Display current user info
-            Map<?, ?> uinfo = (Map<?, ?>) request
-                    .getAttribute(PortletRequest.USER_INFO);
-            if (uinfo != null) {
-                String s = "";
-                for (Iterator<?> it = uinfo.keySet().iterator(); it.hasNext();) {
-                    Object key = it.next();
-                    Object val = uinfo.get(key);
-                    s += key + ": " + val + "\n";
-                }
-                if (request.isUserInRole("administrator")) {
-                    s += "(administrator)";
-                }
-                userInfo.setValue(s);
-            } else {
-                userInfo.setValue("-");
-            }
-
-            // Create Edit/Done link (actionUrl)
-            PortletURL url = response.createActionURL();
-            try {
-                url.setPortletMode((request.getPortletMode() == PortletMode.VIEW ? PortletMode.EDIT
-                        : PortletMode.VIEW));
-                portletEdit.setResource(new ExternalResource(url.toString()));
-                portletEdit
-                        .setCaption((request.getPortletMode() == PortletMode.VIEW ? "Edit"
-                                : "Done"));
-            } catch (Exception e) {
-                portletEdit.setEnabled(false);
-            }
-            // Create Maximize/Normal link (actionUrl)
-            url = response.createActionURL();
-            try {
-                url.setWindowState((request.getWindowState() == WindowState.NORMAL ? WindowState.MAXIMIZED
-                        : WindowState.NORMAL));
-                portletMax.setResource(new ExternalResource(url.toString()));
-                portletMax
-                        .setCaption((request.getWindowState() == WindowState.NORMAL ? "Maximize"
-                                : "Back to normal"));
-            } catch (Exception e) {
-                portletMax.setEnabled(false);
-            }
-
-            if (someAction == null) {
-                url = response.createActionURL();
-                try {
-                    someAction = new Link("An action", new ExternalResource(
-                            url.toString()));
-                    main.addComponent(someAction);
-                } catch (Exception e) {
-                    // Oops
-                    System.err.println("Could not create someAction: " + e);
-                }
-
-            }
-        }
-
-        public void handleEventRequest(EventRequest request,
-                EventResponse response, Root window) {
-            // events not used by this test
-        }
-
-        public void handleResourceRequest(ResourceRequest request,
-                ResourceResponse response, Root window) {
-            // nothing special to do here
-        }
-    }
-
-}

diff --git a/tests/testbench/com/vaadin/tests/integration/JSR286PortletRoot.java b/tests/testbench/com/vaadin/tests/integration/JSR286PortletRoot.java
new file mode 100644 (file)
index 0000000..e022a8b
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/integration/JSR286PortletRoot.java
@@ -0,0 +1,188 @@
+package com.vaadin.tests.integration;
+
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.PortletMode;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.WindowState;
+
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.terminal.gwt.client.ui.label.ContentMode;
+import com.vaadin.terminal.gwt.server.PortletApplicationContext2;
+import com.vaadin.terminal.gwt.server.PortletApplicationContext2.PortletListener;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Notification;
+import com.vaadin.ui.Root;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Upload;
+import com.vaadin.ui.Upload.Receiver;
+import com.vaadin.ui.VerticalLayout;
+
+/**
+ * Adapted from old PortletDemo to support integration testing.
+ */
+public class JSR286PortletRoot extends Root {
+
+    TextField tf = new TextField("Some value");
+    Label userInfo = new Label();
+    Link portletEdit = new Link();
+    Link portletMax = new Link();
+    Link someAction = null;
+
+    @Override
+    protected void init(WrappedRequest request) {
+        VerticalLayout main = new VerticalLayout();
+        tf.setDebugId("tf");
+        userInfo.setDebugId("userInfo");
+        portletEdit.setDebugId("portletEdit");
+        portletMax.setDebugId("portletMax");
+        Embedded appResourceTest = new Embedded(
+                "Test of ApplicationResources with full path",
+                new FlagSeResource(getApplication()));
+        main.addComponent(appResourceTest);
+        Embedded specialNameResourceTest = new Embedded(
+                "Test ApplicationResources with special names",
+                new SpecialNameResource(getApplication()));
+        main.addComponent(specialNameResourceTest);
+
+        userInfo.setCaption("User info");
+        userInfo.setContentMode(ContentMode.PREFORMATTED);
+        main.addComponent(userInfo);
+
+        tf.setEnabled(false);
+        tf.setImmediate(true);
+        main.addComponent(tf);
+
+        portletEdit.setEnabled(false);
+        main.addComponent(portletEdit);
+        portletMax.setEnabled(false);
+        main.addComponent(portletMax);
+
+        Upload upload = new Upload("Upload a file", new Receiver() {
+
+            public OutputStream receiveUpload(String filename, String mimeType) {
+                return new ByteArrayOutputStream();
+            }
+        });
+        main.addComponent(upload);
+
+        if (getApplication().getContext() instanceof PortletApplicationContext2) {
+            PortletApplicationContext2 ctx = (PortletApplicationContext2) getApplication()
+                    .getContext();
+            ctx.addPortletListener(getApplication(), new DemoPortletListener());
+        } else {
+            showNotification("Not inited via Portal!",
+                    Notification.TYPE_ERROR_MESSAGE);
+        }
+
+    }
+
+    private class DemoPortletListener implements PortletListener {
+
+        public void handleActionRequest(ActionRequest request,
+                ActionResponse response, Root window) {
+            getContent().addComponent(new Label("Action received"));
+        }
+
+        public void handleRenderRequest(RenderRequest request,
+                RenderResponse response, Root window) {
+            // Portlet up-and-running, enable stuff
+            portletEdit.setEnabled(true);
+            portletMax.setEnabled(true);
+
+            // Editable if we're in editmode
+            tf.setEnabled((request.getPortletMode() == PortletMode.EDIT));
+
+            // Show notification about current mode and state
+            showNotification(
+                    "Portlet status",
+                    "Mode: " + request.getPortletMode() + " State: "
+                            + request.getWindowState(),
+                    Notification.TYPE_WARNING_MESSAGE);
+
+            // Display current user info
+            Map<?, ?> uinfo = (Map<?, ?>) request
+                    .getAttribute(PortletRequest.USER_INFO);
+            if (uinfo != null) {
+                String s = "";
+                for (Iterator<?> it = uinfo.keySet().iterator(); it.hasNext();) {
+                    Object key = it.next();
+                    Object val = uinfo.get(key);
+                    s += key + ": " + val + "\n";
+                }
+                if (request.isUserInRole("administrator")) {
+                    s += "(administrator)";
+                }
+                userInfo.setValue(s);
+            } else {
+                userInfo.setValue("-");
+            }
+
+            // Create Edit/Done link (actionUrl)
+            PortletURL url = response.createActionURL();
+            try {
+                url.setPortletMode((request.getPortletMode() == PortletMode.VIEW ? PortletMode.EDIT
+                        : PortletMode.VIEW));
+                portletEdit.setResource(new ExternalResource(url.toString()));
+                portletEdit
+                        .setCaption((request.getPortletMode() == PortletMode.VIEW ? "Edit"
+                                : "Done"));
+            } catch (Exception e) {
+                portletEdit.setEnabled(false);
+            }
+            // Create Maximize/Normal link (actionUrl)
+            url = response.createActionURL();
+            try {
+                url.setWindowState((request.getWindowState() == WindowState.NORMAL ? WindowState.MAXIMIZED
+                        : WindowState.NORMAL));
+                portletMax.setResource(new ExternalResource(url.toString()));
+                portletMax
+                        .setCaption((request.getWindowState() == WindowState.NORMAL ? "Maximize"
+                                : "Back to normal"));
+            } catch (Exception e) {
+                portletMax.setEnabled(false);
+            }
+
+            if (someAction == null) {
+                url = response.createActionURL();
+                try {
+                    someAction = new Link("An action", new ExternalResource(
+                            url.toString()));
+                    someAction.setDebugId("someAction");
+
+                    addComponent(someAction);
+                } catch (Exception e) {
+                    // Oops
+                    System.err.println("Could not create someAction: " + e);
+                }
+
+            }
+        }
+
+        public void handleEventRequest(EventRequest request,
+                EventResponse response, Root window) {
+            // events not used by this test
+        }
+
+        public void handleResourceRequest(ResourceRequest request,
+                ResourceResponse response, Root window) {
+            // nothing special to do here
+        }
+    }
+
+}