You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cd...@apache.org on 2008/01/05 17:30:54 UTC

svn commit: r609168 - in /portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main: java/org/apache/pluto/testsuite/ java/org/apache/pluto/testsuite/test/jsr286/ java/org/apache/pluto/testsuite/test/jsr286/event/ webapp/WEB-INF/ webapp/jsp/

Author: cdoremus
Date: Sat Jan  5 08:30:53 2008
New Revision: 609168

URL: http://svn.apache.org/viewvc?rev=609168&view=rev
Log:
Applied event_tests.patch in PLUTO-442. Thanks Ben!

Added:
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/BaseEventTest.java   (with props)
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComplexPayloadEventTest.java   (with props)
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComposedObject.java   (with props)
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/SimplePayloadEventTest.java   (with props)
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp
Modified:
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/TestCompanionPortlet.java
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-286-config.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/navigation.inc
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/test_results.inc
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/test_results.jsp

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java?rev=609168&r1=609167&r2=609168&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java Sat Jan  5 08:30:53 2008
@@ -179,12 +179,35 @@
     }
 
 
-    public void serveResource(ResourceRequest arg0, ResourceResponse arg1)
+    public void serveResource(ResourceRequest request, ResourceResponse response)
             throws PortletException, IOException {
-        // TODO: Add resource serving support
-        super.serveResource(arg0, arg1);
+        String testId = getTestId(request);
+        PortletTest test = (PortletTest) tests.get(testId);
+        if (test != null) {
+            TestResults results = test.doTest(getPortletConfig(),
+                                              getPortletContext(),
+                                              request,
+                                              response);
+            PortletSession session = request.getPortletSession();
+            TestResults existing = (TestResults) session.getAttribute(
+                    test.getClass().getName());
+            if (existing != null) {
+                for (TestResult result : results.getCollection()) {
+                    existing.add(result);
+                }
+                request.setAttribute("results", existing);
+                session.setAttribute(test.getClass().getName(), null);
+            } else {
+                request.setAttribute("results", results);
+            }
+        }
+        if (test.getConfig().getDisplayURI().indexOf("load_resource_test") > -1) {
+            response.setContentType("text/html");
+            getPortletContext().getRequestDispatcher("/jsp/test_results.jsp")
+                .include(request, response);
+        }
     }
-
+    
     /**
      * Serves up the <code>view</code> mode.
      * TODO: more javadoc.
@@ -192,6 +215,7 @@
      * @param request  the protlet request.
      * @param response  the portlet response.
      */
+    @Override
     public void doView(RenderRequest request, RenderResponse response)
     throws PortletException, IOException {
 
@@ -253,6 +277,8 @@
             }
             request.setAttribute("prevTest", prevTestConfig);
             request.setAttribute("nextTest", nextTestConfig);
+            request.setAttribute("testId", new Integer(testId));
+            request.setAttribute("test", test);
         }
 
         // Set content type for render response, and dispatch to JSP.
@@ -263,10 +289,8 @@
         } else {
             displayUri = "/jsp/introduction.jsp";
         }
-        LOG.debug("Display URI: " + displayUri);
         PortletRequestDispatcher dispatcher = getPortletContext()
                 .getRequestDispatcher(displayUri);
-        LOG.debug("request dispatcher: " + dispatcher);
         dispatcher.include(request, response);
     }
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/TestCompanionPortlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/TestCompanionPortlet.java?rev=609168&r1=609167&r2=609168&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/TestCompanionPortlet.java (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/TestCompanionPortlet.java Sat Jan  5 08:30:53 2008
@@ -19,21 +19,74 @@
 
 import java.io.IOException;
 
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
 import javax.portlet.GenericPortlet;
 import javax.portlet.PortletException;
+import javax.portlet.ProcessEvent;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
+import org.apache.pluto.testsuite.test.jsr286.event.ComplexPayloadEventTest;
+import org.apache.pluto.testsuite.test.jsr286.event.ComposedObject;
+import org.apache.pluto.testsuite.test.jsr286.event.SimplePayloadEventTest;
+
 public class TestCompanionPortlet extends GenericPortlet {
 
+    public static final String EVENT_INFO_PARAM = "eventInfoParameter";
+    
     @Override
     protected void doView(RenderRequest request, RenderResponse response)
             throws PortletException, IOException {
         response.setContentType("text/html");
         
+        String eventInfo = request.getParameter(EVENT_INFO_PARAM); 
+        request.setAttribute("eventInfo", eventInfo);
+        
         getPortletContext()
             .getRequestDispatcher("/jsp/TestCompanionPortlet.jsp")
                 .include(request, response);
     }
+
+    @ProcessEvent(name = SimplePayloadEventTest.SIMPLE_PAYLOAD_EVENT)
+    public void processSimplePayload(EventRequest request, 
+            EventResponse response) throws PortletException, IOException {
+        
+        StringBuilder feedback = new StringBuilder();
+        feedback.append("Simple Payload Event received.");
+
+        if (!SimplePayloadEventTest.SIMPLE_VALUE_PAYLOAD.equals(
+                request.getEvent().getValue())) {
+            feedback.append("  Payload DID NOT match expected value.");
+        } else {
+            feedback.append("  Payload matched expected value.");
+        }
+        
+        response.setRenderParameter(EVENT_INFO_PARAM, feedback.toString());
+    }
     
+    @ProcessEvent(name = ComplexPayloadEventTest.COMPLEX_PAYLOAD_EVENT)
+    public void processComplexPayload(EventRequest request, 
+            EventResponse response) throws PortletException, IOException {
+        
+        StringBuilder feedback = new StringBuilder();
+        feedback.append("Complex Payload Event received.");
+
+        boolean failed = false;
+        ComposedObject value = (ComposedObject) request.getEvent().getValue();
+        if (!ComplexPayloadEventTest.TEST_COLOR.equals(value.getColor())) {
+            feedback.append("  Color DID NOT match expected value.");
+            failed = true;
+        }
+        if (!ComplexPayloadEventTest.TEST_POINT.equals(value.getPoint())) {
+            feedback.append("  Point DID NOT match expected value.");
+            failed = true;
+        }
+        if (!failed) {
+            feedback.append("  Payload matched expected values.");
+        }
+        
+        response.setRenderParameter(EVENT_INFO_PARAM, feedback.toString());
+    }
+        
 }

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/BaseEventTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/BaseEventTest.java?rev=609168&view=auto
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/BaseEventTest.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/BaseEventTest.java Sat Jan  5 08:30:53 2008
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.pluto.testsuite.test.jsr286.event;
+
+import java.lang.reflect.Method;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletRequest;
+import javax.portlet.StateAwareResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.testsuite.TestResult;
+import org.apache.pluto.testsuite.annotations.DefaultTestPhase;
+import org.apache.pluto.testsuite.annotations.TestPhase;
+import org.apache.pluto.testsuite.test.AbstractReflectivePortletTest;
+
+@DefaultTestPhase(PortletRequest.EVENT_PHASE)
+public abstract class BaseEventTest extends AbstractReflectivePortletTest {
+  
+    private int numMethodsCache = -1;
+    
+    protected Log LOG = LogFactory.getLog(getClass());
+    
+    @TestPhase(PortletRequest.ACTION_PHASE)
+    public TestResult checkFireEventsFromActionPhase(ActionRequest request,
+            ActionResponse response) {
+        tally(response);
+        TestResult result = new TestResult();
+        result.setReturnCode(TestResult.UNDEFINED);
+        result.setDescription("Fire several events to test processing." +
+                " Be sure to check to Companion portlet to make sure" +
+                " that all tests are correctly run.");
+        result.setSpecPLT("15.2.3");
+        fireEvents(request, response);
+        
+        return result;
+    }
+
+    /*
+    @TestPhase(PortletRequest.RENDER_PHASE)
+    public TestResult checkCorrectNumberOfMethods(RenderRequest request) {
+        TestResult result = new TestResult();
+        result.setDescription("Check to make sure that all of the test " +
+        		"methods were triggered. More accurately, checks to " +
+        		"make sure that all of the methods that are capable " +
+        		"of accepting a StateAwareResponse have called the " +
+        		"tally() method during this request.");
+        int actual = getTally(request);
+        int expected = getNumberOfMethodsThatShouldRun(request); 
+        if (actual == expected) {
+            result.setReturnCode(TestResult.PASSED);
+        } else {
+            result.setReturnCode(TestResult.FAILED);
+            result.setDescription("Expected " + expected + " test methods " +
+                    "to run, but actually " + actual + " ran.");
+        }
+        return result;
+    }
+    */
+    
+    protected int getNumberOfMethodsThatShouldRun(PortletRequest request) {
+        if (numMethodsCache == -1) {
+            Class<?> clazz = getClass();
+            for (Method m : clazz.getMethods()) {
+                if (m.getName().startsWith("check") && 
+                        m.getReturnType().equals(TestResult.class)) {
+                    for (Class<?> paramType : m.getParameterTypes()) {
+                        if (StateAwareResponse.class
+                                .isAssignableFrom(paramType)) {
+                            numMethodsCache++;
+                        }
+                    }
+                }
+            }
+        }
+        return numMethodsCache;
+    }
+    
+    protected void tally(StateAwareResponse response) {
+        // Eventually will track how many test methods run...
+        // Maybe should move to the AbstractReflectivePortletTest class?
+    }
+    
+    protected abstract void fireEvents(
+                        ActionRequest request, ActionResponse response);
+    
+    
+}

Propchange: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/BaseEventTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/BaseEventTest.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/BaseEventTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComplexPayloadEventTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComplexPayloadEventTest.java?rev=609168&view=auto
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComplexPayloadEventTest.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComplexPayloadEventTest.java Sat Jan  5 08:30:53 2008
@@ -0,0 +1,95 @@
+package org.apache.pluto.testsuite.test.jsr286.event;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.PortletRequest;
+
+import org.apache.pluto.testsuite.TestResult;
+import org.apache.pluto.testsuite.annotations.DefaultTestPhase;
+
+@DefaultTestPhase(PortletRequest.EVENT_PHASE)
+public class ComplexPayloadEventTest extends BaseEventTest {
+
+    public static final String TEST_COLOR = "red";
+    
+    //public static final Point TEST_POINT = new Point(1, -1);
+
+    public static final String TEST_POINT = "1, 1";
+    
+    public static final String COMPLEX_PAYLOAD_EVENT = 
+                                                "event-with-complex-value"; 
+    
+    @Override
+    protected void fireEvents(ActionRequest request, ActionResponse response) {
+        ComposedObject payload = new ComposedObject(TEST_COLOR, TEST_POINT);
+        response.setEvent(COMPLEX_PAYLOAD_EVENT, payload);
+    }
+    
+    public TestResult checkExpectedEventWasFired(EventRequest request,
+            EventResponse response) {
+        tally(response);
+        TestResult result = new TestResult();
+        result.setSpecPLT("15.2.2");
+        result.setDescription("Check to make sure the the " + 
+                COMPLEX_PAYLOAD_EVENT + " event was fired.");
+        if (COMPLEX_PAYLOAD_EVENT.equals(request.getEvent().getName())) {
+            result.setReturnCode(TestResult.PASSED);
+        } else {
+            result.setReturnCode(TestResult.FAILED);
+            result.setResultMessage("Expected event name to be '" +
+                    COMPLEX_PAYLOAD_EVENT + "' but it was actually '" +
+                    request.getEvent().getName().getClass().getName() + "'");
+        }
+        return result;
+    }
+    
+    public TestResult checkEventPayloadIsCorrectClass(EventRequest request,
+            EventResponse response) {
+        tally(response);
+        TestResult result = new TestResult();
+        result.setSpecPLT("15.2.2");
+        result.setDescription("Check to make sure that payload is an instance" +
+        		"of " + ComposedObject.class);
+        Object value = request.getEvent().getValue();
+        if (value == null) {
+            result.setReturnCode(TestResult.FAILED);
+            result.setResultMessage("Expected event payload type to be '" + 
+                    ComposedObject.class.getName() + "' but it was null.");
+        } else if (value instanceof ComposedObject) {
+            result.setReturnCode(TestResult.PASSED);
+        } else {
+            result.setReturnCode(TestResult.FAILED);
+            result.setResultMessage("Expected event payload type to be '" + 
+                    ComposedObject.class.getName() + "' but it was actually '" +
+    		    request.getEvent().getValue() + "'");
+        }
+        return result;
+    }
+    
+    public TestResult checkEventPayloadIsCorrect(EventRequest request,
+            EventResponse response) {
+        tally(response);
+        TestResult result = new TestResult();
+        result.setSpecPLT("15.2.2");
+        result.setDescription(
+                "Check to make sure that the payload carries the " +
+    		"proper state information from the event.");
+        ComposedObject value = (ComposedObject) request.getEvent().getValue();
+        if (!TEST_COLOR.equals(value.getColor())) {
+            result.setReturnCode(TestResult.FAILED);
+            result.setResultMessage("Expected payload color to be " + 
+                    TEST_COLOR + " but it was " + value.getColor());
+        } else if (!TEST_POINT.equals(value.getPoint())) { 
+            result.setReturnCode(TestResult.FAILED);
+            result.setResultMessage("Expected payload point to be " + 
+                    TEST_POINT + " but it was " + value.getPoint());
+        } else {
+            result.setReturnCode(TestResult.PASSED);
+        }
+        return result;
+    }
+    
+    
+}
\ No newline at end of file

Propchange: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComplexPayloadEventTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComplexPayloadEventTest.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComplexPayloadEventTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComposedObject.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComposedObject.java?rev=609168&view=auto
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComposedObject.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComposedObject.java Sat Jan  5 08:30:53 2008
@@ -0,0 +1,57 @@
+package org.apache.pluto.testsuite.test.jsr286.event;
+
+import java.io.Serializable;
+
+/**
+ * A serializable object for use with the event tests.
+ */
+public class ComposedObject implements Serializable {
+
+    private static final long serialVersionUID = -116040162572322649L;
+   
+    private String color;
+
+    /* Doesn't really work with JAXB; probably needs some type of annotation */
+    //private Point point;
+    
+    private String point;
+    
+    public ComposedObject() {
+        super();
+    }
+
+    public ComposedObject(String color, /*Point*/ String point) {
+        super();
+        this.point = point;
+        this.color = color;
+    }
+
+    /*
+    public Point getPoint() {
+        return point;
+    }
+
+    public void setPoint(Point point) {
+        this.point = point;
+    }
+    */
+    
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public String getPoint() {
+        return point;
+    }
+
+    public void setPoint(String point) {
+        this.point = point;
+    }
+    
+}
+
+ 
\ No newline at end of file

Propchange: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComposedObject.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComposedObject.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/ComposedObject.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/SimplePayloadEventTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/SimplePayloadEventTest.java?rev=609168&view=auto
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/SimplePayloadEventTest.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/SimplePayloadEventTest.java Sat Jan  5 08:30:53 2008
@@ -0,0 +1,93 @@
+package org.apache.pluto.testsuite.test.jsr286.event;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.Event;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.PortletRequest;
+
+import org.apache.pluto.testsuite.TestResult;
+import org.apache.pluto.testsuite.annotations.DefaultTestPhase;
+
+@DefaultTestPhase(PortletRequest.EVENT_PHASE)
+public class SimplePayloadEventTest extends BaseEventTest {
+
+    public static final String SIMPLE_VALUE_PAYLOAD = "SIMPLE_STRING_VALUE";
+    
+    public static final String SIMPLE_PAYLOAD_EVENT = "event-with-simple-value";
+    
+    @Override
+    protected void fireEvents(ActionRequest request, ActionResponse response) {
+        response.setEvent(SIMPLE_PAYLOAD_EVENT, SIMPLE_VALUE_PAYLOAD);
+    }
+
+    public TestResult checkExpectedEventWasFired(EventRequest request,
+            EventResponse response) {
+        tally(response);
+        TestResult result = new TestResult();
+        result.setSpecPLT("15.2.2");
+        result.setDescription("Check to make sure the the " + 
+                SIMPLE_PAYLOAD_EVENT + " event was fired.");
+        Event event = request.getEvent();
+        if (event == null) {
+            throw new NullPointerException("No event was received!");
+        }
+        if (SIMPLE_PAYLOAD_EVENT.equals(event.getName())) {
+            result.setReturnCode(TestResult.PASSED);
+        } else {
+            result.setReturnCode(TestResult.FAILED);
+            result.setResultMessage("Expected event name to be '" +
+                    SIMPLE_PAYLOAD_EVENT + "' but it was actually '" +
+                    event.getName() + "'");
+        }
+        return result;
+    }
+    
+    public TestResult checkEventPayloadIsCorrectClass(EventRequest request,
+            EventResponse response) {
+        tally(response);
+        TestResult result = new TestResult();
+        result.setSpecPLT("15.2.2");
+        result.setDescription("Check to make sure that payload is an instance" +
+                        "of " + String.class);
+        Event event = request.getEvent();
+        if (event == null) {
+            throw new NullPointerException("No event received!");
+        }
+        Object value = event.getValue();
+        if (value == null) {
+            result.setReturnCode(TestResult.FAILED);
+            result.setResultMessage("Expected event payload type to be '" + 
+                    String.class.getName() + "' but it was null.");
+        } else if (value instanceof String) {
+            result.setReturnCode(TestResult.PASSED);
+        } else {
+            result.setReturnCode(TestResult.FAILED);
+            result.setResultMessage("Expected event payload type to be '" + 
+                    String.class.getName() + "' but it was actually '" +
+                    value.getClass().getName() + "'");
+        }
+        return result;
+    }
+    
+    public TestResult checkEventPayloadIsCorrect(EventRequest request,
+            EventResponse response) {
+        tally(response);
+        TestResult result = new TestResult();
+        result.setSpecPLT("15.2.2");
+        result.setDescription(
+                "Check to make sure that the payload carries the " +
+                "proper state information from the event.");
+        String value = (String) request.getEvent().getValue();
+        if (!SIMPLE_VALUE_PAYLOAD.equals(value)) {
+            result.setReturnCode(TestResult.FAILED);
+            result.setResultMessage("Expected payload color to be " + 
+                    SIMPLE_VALUE_PAYLOAD + " but it was " + value);
+        } else {
+            result.setReturnCode(TestResult.PASSED);
+        }
+        return result;
+    }
+    
+}

Propchange: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/SimplePayloadEventTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/SimplePayloadEventTest.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/SimplePayloadEventTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml?rev=609168&r1=609167&r2=609168&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml Sat Jan  5 08:30:53 2008
@@ -181,11 +181,31 @@
     <supported-processing-event>
       <name>trigger-event-phase</name>
     </supported-processing-event>
+
+    <supported-processing-event>
+    	<name>event-with-complex-value</name>
+    </supported-processing-event>
+    
+    <supported-processing-event>
+    	<name>event-with-simple-value</name>
+    </supported-processing-event>
     
     <supported-publishing-event>
       <name>trigger-event-phase</name>
     </supported-publishing-event>
     
+    <supported-publishing-event>
+    	<name>event-with-simple-value</name>
+    </supported-publishing-event>
+    
+    <supported-publishing-event>
+    	<name>event-with-complex-value</name>
+    </supported-publishing-event>
+
+	<supported-publishing-event>
+  		<qname xmlns:pluto="http://portals.apache.org/pluto/altns">event-with-qname</qname>
+  	</supported-publishing-event>
+    
   </portlet>
 
   <portlet>
@@ -207,6 +227,18 @@
       <keywords>JSR 286,Tests</keywords>
     </portlet-info>
     
+    <supported-processing-event>
+    	<name>event-with-simple-value</name>
+    </supported-processing-event>
+    
+    <supported-processing-event>
+    	<name>event-with-complex-value</name>
+    </supported-processing-event>
+
+	<supported-processing-event>
+  		<qname xmlns:pluto="http://portals.apache.org/pluto/altns">event-with-qname</qname>
+  	</supported-processing-event>
+    
   </portlet>
 
   <filter>
@@ -264,6 +296,21 @@
   <event-definition>
   	<name>trigger-event-phase</name>
   	<value-type>java.lang.String</value-type>
+  </event-definition>
+
+  <event-definition>
+    <name>event-with-simple-value</name>
+    <value-type>java.lang.String</value-type>
+  </event-definition>
+
+  <event-definition>
+    <name>event-with-complex-value</name>
+    <value-type>org.apache.pluto.testsuite.test.jsr286.event.ComposedObject</value-type>
+  </event-definition>
+  
+  <event-definition>
+  	<qname xmlns:pluto="http://portals.apache.org/pluto/altns">event-with-qname</qname>
+  	<value-type>java.lang.Integer</value-type>	
   </event-definition>
 
 </portlet-app>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-286-config.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-286-config.xml?rev=609168&r1=609167&r2=609168&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-286-config.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-286-config.xml Sat Jan  5 08:30:53 2008
@@ -32,7 +32,7 @@
   <testsuite-config>
     <name>Resource Filter Test</name>
     <class>org.apache.pluto.testsuite.test.jsr286.filter.ResourceFilterTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
+    <display-uri>/jsp/load_resource_test.jsp</display-uri>
   </testsuite-config>
    
   <testsuite-config>
@@ -40,5 +40,17 @@
     <class>org.apache.pluto.testsuite.test.jsr286.filter.EventFilterTest</class>
     <display-uri>/jsp/test_results.jsp</display-uri>
   </testsuite-config>
-
+  
+  <testsuite-config>
+  	<name>Simple Payload Event Test</name>
+  	<class>org.apache.pluto.testsuite.test.jsr286.event.SimplePayloadEventTest</class>
+  	<display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+  
+  <testsuite-config>
+  	<name>Complex Payload Event Test</name>
+  	<class>org.apache.pluto.testsuite.test.jsr286.event.ComplexPayloadEventTest</class>
+  	<display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+ 
 </testportlet-config>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp?rev=609168&r1=609167&r2=609168&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp Sat Jan  5 08:30:53 2008
@@ -62,5 +62,10 @@
         </tbody>
     </table>
  --%>
- 
+<c:if test="${not empty eventInfo}">
+	<p>
+		<h4>Information from last event:</h4>
+		<p><c:out value="${eventInfo}" /></p>
+	</p>
+</c:if>
 </div>

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp?rev=609168&view=auto
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp Sat Jan  5 08:30:53 2008
@@ -0,0 +1,66 @@
+<%@taglib prefix="portlet" uri="http://java.sun.com/portlet_2_0" %>
+<%@taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
+<portlet:defineObjects />
+<TABLE style="font-size: -1">
+<TR><TH colspan="2" style="background-color:blue;color:white;">MANUAL TEST</TH></TR>
+<TR><TH></TH>
+    <TH><c:out value="${test.config.name}" /></TH></TR>
+<TR><TD colspan="2">
+		Output from this test will be loaded in a separate window using the
+		generated ResourceURL.  If the window does not open automatically,
+		<a id="<portlet:namespace />windowlink"
+				href="<portlet:resourceURL>
+						<portlet:param name='testId' value='<%= ((Integer) renderRequest.getAttribute("testId")).toString() %>' /><portlet:param name='nocache' value='<%= Long.toString(System.currentTimeMillis()) %>' />
+					</portlet:resourceURL>" target="_blank">
+			Click here to open the new window.
+		</a>
+	</TD>
+</TR>
+</TABLE>	
+	<script type="text/javascript">
+	<!--
+	(function() {
+		var $ = function(something) {
+			return document.getElementById(something);
+		}
+		var link = $('<portlet:namespace />windowlink'); 
+		var resourceURL = link.href;
+		link.onclick = function() {
+			window.open(resourceURL, '_blank', 'scrollbars=yes,resizable=yes,width=400,height=300');
+			return false;
+		}
+		link.onclick();
+<%--	
+	 Originally, I was going to use Ajax to load the resource URL, but I found that
+	 window.open is a little cleaner; keeping this around just in case though
+	
+		
+		
+		var getXHR = function() {
+			try { return new XMLHttpRequest(); } catch (e) {}
+			try{ return new ActiveXObject("MSXML3.XMLHTTP") }catch(e){}
+	        try{ return new ActiveXObject("MSXML2.XMLHTTP.3.0") }catch(e){}
+	        try{ return new ActiveXObject("Msxml2.XMLHTTP") }catch(e){}
+	        try{ return new ActiveXObject("Microsoft.XMLHTTP") }catch(e){}
+	        throw new Error("Could not find an XMLHttpRequest alternative.") 
+		}
+	
+		var xhr = getXHR();
+		xhr.onreadystatechange = function() {
+			if (xhr.readyState == 4 && xhr.status == 200) {
+				$('<portlet:namespace />contentArea').innerHTML = xhr.responseText;
+			} else if (xhr.readyState == 4) {
+				var win = window.open('', '_blank', 'scrollbars=yes,resizable=yes,width=400,height=300');
+				win.document.write(xhr.responseText);
+				win.document.close();
+			}
+		};
+		
+		xhr.open("get", resourceURL, true);
+		xhr.send();
+	--%>
+	})(); 
+	//-->
+	</script>
+
+<%@ include file="navigation.inc" %>	
\ No newline at end of file

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/navigation.inc
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/navigation.inc?rev=609168&r1=609167&r2=609168&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/navigation.inc (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/navigation.inc Sat Jan  5 08:30:53 2008
@@ -21,20 +21,21 @@
 <%@ page import="org.apache.pluto.testsuite.TestConfig"%>
 
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
 
 <portlet:defineObjects/>
 
+<% if (request instanceof javax.portlet.RenderRequest) {%>
 <center>
   <table>
     <tr>
       <td align="center" nowrap="true">
         
         <%-- Run Previous Test ============================================ --%>
-        <portlet:actionURL secure="<%= renderRequest.isSecure() ? "True" : "False" %>"
+        <portlet:actionURL secure="<%= request.isSecure() ? "True" : "False" %>"
                            var="url">
           <portlet:param name="nextTestId"
-                         value="<%= renderRequest.getParameter("testId") %>"/>
+                         value="<%= request.getParameter("testId") %>"/>
           <c:forEach var="param" items="${prevTest.actionParameters}">
             <%
                 TestConfig.Parameter parameter = (TestConfig.Parameter) pageContext.findAttribute("param");
@@ -45,25 +46,25 @@
           </c:forEach>
         </portlet:actionURL>
         <a href="<%= url %>">
-          <img src="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/images/previous.png") %>"
+          <img src="<%= response.encodeURL(request.getContextPath() + "/images/previous.png") %>"
                border="0">
         </a>
         
         <%-- Return to Introduction ======================================= --%>
-        <portlet:actionURL secure="<%= renderRequest.isSecure() ? "True" : "False" %>"
+        <portlet:actionURL secure="<%= request.isSecure() ? "True" : "False" %>"
                            var="url">
           <portlet:param name="testId" value="<%= null %>"/>
         </portlet:actionURL>
         <a href="<%= url %>">
-          <img src="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/images/return_index.png") %>"
+          <img src="<%= response.encodeURL(request.getContextPath() + "/images/return_index.png") %>"
                border="0">
         </a>
         
         <%-- Run Next Test ================================================ --%>
-        <portlet:actionURL secure="<%= renderRequest.isSecure() ? "True" : "False" %>"
+        <portlet:actionURL secure="<%= request.isSecure() ? "True" : "False" %>"
                            var="url">
           <portlet:param name="previousTestId"
-                         value="<%= renderRequest.getParameter("testId") %>"/>
+                         value="<%= request.getParameter("testId") %>"/>
           <c:forEach var="param" items="${nextTest.actionParameters}">
             <%
                 TestConfig.Parameter parameter = (TestConfig.Parameter) pageContext.findAttribute("param");
@@ -74,7 +75,7 @@
           </c:forEach>
         </portlet:actionURL>
         <a href="<%= url %>">
-          <img src="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/images/next.png") %>"
+          <img src="<%= response.encodeURL(request.getContextPath() + "/images/next.png") %>"
                border="0">
         </a>
         
@@ -83,5 +84,5 @@
   </table>
 </center>
 
-
+<% } %>
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/test_results.inc
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/test_results.inc?rev=609168&r1=609167&r2=609168&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/test_results.inc (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/test_results.inc Sat Jan  5 08:30:53 2008
@@ -20,7 +20,7 @@
 <%@ page import="org.apache.pluto.testsuite.TestResult" %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
 
 <%
     pageContext.setAttribute("PASSED_CODE", new Integer(TestResult.PASSED));
@@ -40,7 +40,7 @@
       </tr>
       <tr>
         <td valign="top">
-          <img src="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/images/question.gif") %>"
+          <img src="<%= response.encodeURL(request.getContextPath() + "/images/question.gif") %>"
                border="0" />
         </td>
         <td>
@@ -91,15 +91,15 @@
       <td valign="top">
         <c:choose>
           <c:when test="${result.returnCode == PASSED_CODE}">
-            <img src="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/images/yes.gif") %>"
+            <img src="<%= response.encodeURL(request.getContextPath() + "/images/yes.gif") %>"
                  border="0" />
           </c:when>
           <c:when test="${result.returnCode == FAILED_CODE}">
-            <img src="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/images/no.gif") %>"
+            <img src="<%= response.encodeURL(request.getContextPath() + "/images/no.gif") %>"
                  border="0" />
           </c:when>
           <c:otherwise>
-            <img src="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/images/question.gif") %>"
+            <img src="<%= response.encodeURL(request.getContextPath() + "/images/question.gif") %>"
                  border="0" />
           </c:otherwise>
         </c:choose>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/test_results.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/test_results.jsp?rev=609168&r1=609167&r2=609168&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/test_results.jsp (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/test_results.jsp Sat Jan  5 08:30:53 2008
@@ -17,7 +17,7 @@
 limitations under the License.
 --%>
 
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
 
 <portlet:defineObjects/>