You are viewing a plain text version of this content. The canonical link for it is here.
Posted to bridges-commits@portals.apache.org by wo...@apache.org on 2010/04/22 20:01:59 UTC
svn commit: r936987 - in
/portals/bridges/bridges-script/trunk/portlet/src/test:
java/org/apache/portals/bridges/script/
resources/org/apache/portals/bridges/script/
Author: woonsan
Date: Thu Apr 22 18:01:59 2010
New Revision: 936987
URL: http://svn.apache.org/viewvc?rev=936987&view=rev
Log:
PB-104: Improving test cases to check if Portlet 2 impl in scripts working.
Modified:
portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/AbstractSimpleScriptPortletTestCase.java
portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloBeanShellScriptPortlet.java
portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloGroovyScriptPortlet.java
portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloJRubyScriptPortlet.java
portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloJythonScriptPortlet.java
portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloRhinoScriptPortlet.java
portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloBeanShell.bsh
portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloGroovy.groovy
portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloJRuby.rb
portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloJython.py
portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloRhino.js
Modified: portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/AbstractSimpleScriptPortletTestCase.java
URL: http://svn.apache.org/viewvc/portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/AbstractSimpleScriptPortletTestCase.java?rev=936987&r1=936986&r2=936987&view=diff
==============================================================================
--- portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/AbstractSimpleScriptPortletTestCase.java (original)
+++ portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/AbstractSimpleScriptPortletTestCase.java Thu Apr 22 18:01:59 2010
@@ -16,13 +16,26 @@
*/
package org.apache.portals.bridges.script;
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+
+import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
+import javax.portlet.Event;
+import javax.portlet.EventPortlet;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
import javax.portlet.Portlet;
import javax.portlet.PortletContext;
import javax.portlet.PortletException;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.ResourceServingPortlet;
+import javax.xml.namespace.QName;
import junit.framework.TestCase;
@@ -245,4 +258,44 @@ public abstract class AbstractSimpleScri
scriptPortlet.processAction(request, response);
}
+
+ public void testProcessEvent() throws Exception
+ {
+ assertTrue(scriptPortlet instanceof EventPortlet);
+
+ Map<String, String> values = new HashMap<String, String>();
+ EventRequest request = createNiceMock(EventRequest.class);
+ EventResponse response = createNiceMock(EventResponse.class);
+
+ Event event = createNiceMock(Event.class);
+ QName qname = new QName("unknown");
+
+ expect(event.getQName()).andReturn(qname);
+ expect(request.getEvent()).andReturn(event);
+ expect(request.getAttribute("values")).andReturn(values);
+
+ replay(event);
+ replay(request);
+ replay(response);
+
+ scriptPortlet.processEvent(request, response);
+ assertEquals("hello", values.get("message"));
+ }
+
+ public void testServeResource() throws Exception
+ {
+ assertTrue(scriptPortlet instanceof ResourceServingPortlet);
+
+ Map<String, String> values = new HashMap<String, String>();
+ ResourceRequest request = createNiceMock(ResourceRequest.class);
+ ResourceResponse response = createNiceMock(ResourceResponse.class);
+
+ expect(request.getAttribute("values")).andReturn(values);
+
+ replay(request);
+ replay(response);
+
+ scriptPortlet.serveResource(request, response);
+ assertEquals("hello", values.get("message"));
+ }
}
Modified: portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloBeanShellScriptPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloBeanShellScriptPortlet.java?rev=936987&r1=936986&r2=936987&view=diff
==============================================================================
--- portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloBeanShellScriptPortlet.java (original)
+++ portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloBeanShellScriptPortlet.java Thu Apr 22 18:01:59 2010
@@ -79,4 +79,16 @@ public class TestHelloBeanShellScriptPor
{
super.testProcessAction();
}
+
+ @Override
+ public void testProcessEvent() throws Exception
+ {
+ super.testProcessEvent();
+ }
+
+ @Override
+ public void testServeResource() throws Exception
+ {
+ super.testServeResource();
+ }
}
Modified: portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloGroovyScriptPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloGroovyScriptPortlet.java?rev=936987&r1=936986&r2=936987&view=diff
==============================================================================
--- portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloGroovyScriptPortlet.java (original)
+++ portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloGroovyScriptPortlet.java Thu Apr 22 18:01:59 2010
@@ -16,11 +16,24 @@
*/
package org.apache.portals.bridges.script;
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+
import java.util.HashMap;
import java.util.ListResourceBundle;
import java.util.Map;
import java.util.ResourceBundle;
+import javax.portlet.Event;
+import javax.portlet.EventPortlet;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.ResourceServingPortlet;
+import javax.xml.namespace.QName;
+
/**
* TestGroovyScriptPortlet
*
@@ -79,4 +92,16 @@ public class TestHelloGroovyScriptPortle
{
super.testProcessAction();
}
+
+ @Override
+ public void testProcessEvent() throws Exception
+ {
+ super.testProcessEvent();
+ }
+
+ @Override
+ public void testServeResource() throws Exception
+ {
+ super.testServeResource();
+ }
}
Modified: portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloJRubyScriptPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloJRubyScriptPortlet.java?rev=936987&r1=936986&r2=936987&view=diff
==============================================================================
--- portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloJRubyScriptPortlet.java (original)
+++ portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloJRubyScriptPortlet.java Thu Apr 22 18:01:59 2010
@@ -79,4 +79,16 @@ public class TestHelloJRubyScriptPortlet
{
super.testProcessAction();
}
+
+ @Override
+ public void testProcessEvent() throws Exception
+ {
+ super.testProcessEvent();
+ }
+
+ @Override
+ public void testServeResource() throws Exception
+ {
+ super.testServeResource();
+ }
}
Modified: portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloJythonScriptPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloJythonScriptPortlet.java?rev=936987&r1=936986&r2=936987&view=diff
==============================================================================
--- portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloJythonScriptPortlet.java (original)
+++ portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloJythonScriptPortlet.java Thu Apr 22 18:01:59 2010
@@ -80,4 +80,16 @@ public class TestHelloJythonScriptPortle
{
super.testProcessAction();
}
+
+ @Override
+ public void testProcessEvent() throws Exception
+ {
+ super.testProcessEvent();
+ }
+
+ @Override
+ public void testServeResource() throws Exception
+ {
+ super.testServeResource();
+ }
}
Modified: portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloRhinoScriptPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloRhinoScriptPortlet.java?rev=936987&r1=936986&r2=936987&view=diff
==============================================================================
--- portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloRhinoScriptPortlet.java (original)
+++ portals/bridges/bridges-script/trunk/portlet/src/test/java/org/apache/portals/bridges/script/TestHelloRhinoScriptPortlet.java Thu Apr 22 18:01:59 2010
@@ -111,4 +111,28 @@ public class TestHelloRhinoScriptPortlet
super.testProcessAction();
}
+
+ @Override
+ public void testProcessEvent() throws Exception
+ {
+ if (SystemUtils.isJavaVersionAtLeast(160))
+ {
+ System.out.println("[WARNING] Rhino script engine embedded in the default Java 1.6+ has not fully tested yet.");
+ return;
+ }
+
+ super.testProcessEvent();
+ }
+
+ @Override
+ public void testServeResource() throws Exception
+ {
+ if (SystemUtils.isJavaVersionAtLeast(160))
+ {
+ System.out.println("[WARNING] Rhino script engine embedded in the default Java 1.6+ has not fully tested yet.");
+ return;
+ }
+
+ super.testServeResource();
+ }
}
Modified: portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloBeanShell.bsh
URL: http://svn.apache.org/viewvc/portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloBeanShell.bsh?rev=936987&r1=936986&r2=936987&view=diff
==============================================================================
--- portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloBeanShell.bsh (original)
+++ portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloBeanShell.bsh Thu Apr 22 18:01:59 2010
@@ -17,8 +17,12 @@
import javax.portlet.GenericPortlet;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
/**
* @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
@@ -37,6 +41,16 @@ class HelloBeanShell extends GenericPort
request.getPreferences().setValue("message", request.getParameter("message"));
request.getPreferences().store();
}
+
+ public void processEvent(EventRequest request, EventResponse response)
+ {
+ request.getAttribute("values").put("message", "hello");
+ }
+
+ public void serveResource(ResourceRequest request, ResourceResponse response)
+ {
+ request.getAttribute("values").put("message", "hello");
+ }
}
// Return portlet instance as a last evaluated object
Modified: portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloGroovy.groovy
URL: http://svn.apache.org/viewvc/portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloGroovy.groovy?rev=936987&r1=936986&r2=936987&view=diff
==============================================================================
--- portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloGroovy.groovy (original)
+++ portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloGroovy.groovy Thu Apr 22 18:01:59 2010
@@ -19,8 +19,12 @@ package org.apache.portals.bridges.scrip
import javax.portlet.GenericPortlet;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
/**
* @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
@@ -39,6 +43,16 @@ public class HelloGroovy extends Generic
request.getPreferences().setValue("message", request.getParameter("message"));
request.getPreferences().store();
}
+
+ public void processEvent(EventRequest request, EventResponse response)
+ {
+ request.getAttribute("values").put("message", "hello");
+ }
+
+ public void serveResource(ResourceRequest request, ResourceResponse response)
+ {
+ request.getAttribute("values").put("message", "hello");
+ }
}
// Return portlet instance as a last evaluated object
Modified: portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloJRuby.rb
URL: http://svn.apache.org/viewvc/portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloJRuby.rb?rev=936987&r1=936986&r2=936987&view=diff
==============================================================================
--- portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloJRuby.rb (original)
+++ portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloJRuby.rb Thu Apr 22 18:01:59 2010
@@ -33,6 +33,14 @@ class HelloJRuby < javax.portlet.Generic
request.preferences.store()
end
+ def processEvent(request, response)
+ request.getAttribute("values").put("message", "hello")
+ end
+
+ def serveResource(request, response)
+ request.getAttribute("values").put("message", "hello")
+ end
+
end
# Return portlet instance as a last evaluated object
Modified: portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloJython.py
URL: http://svn.apache.org/viewvc/portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloJython.py?rev=936987&r1=936986&r2=936987&view=diff
==============================================================================
--- portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloJython.py (original)
+++ portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloJython.py Thu Apr 22 18:01:59 2010
@@ -30,8 +30,15 @@ class HelloJython(GenericPortlet):
request.preferences.setValue("message", request.getParameter("message"))
request.preferences.store();
+ def processEvent(self, request, response):
+ request.getAttribute("values").put("message", "hello")
+
+
+ def serveResource(self, request, response):
+ request.getAttribute("values").put("message", "hello")
+
+
-
# Return portlet instance as a last evaluated object
# because ScriptPortlet expects the evaluated result object as a portlet class or non-initialized portlet instance.
value = HelloJython()
Modified: portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloRhino.js
URL: http://svn.apache.org/viewvc/portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloRhino.js?rev=936987&r1=936986&r2=936987&view=diff
==============================================================================
--- portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloRhino.js (original)
+++ portals/bridges/bridges-script/trunk/portlet/src/test/resources/org/apache/portals/bridges/script/HelloRhino.js Thu Apr 22 18:01:59 2010
@@ -33,6 +33,12 @@ new GenericPortlet(
processAction: function(request, response) {
request.getPreferences().setValue("message", request.getParameter("message"));
request.getPreferences().store();
+ },
+ processEvent: function(request, response) {
+ request.getAttribute("values").put("message", "hello");
+ },
+ serveResource: function(request, response) {
+ request.getAttribute("values").put("message", "hello");
}
}
);
---------------------------------------------------------------------
To unsubscribe, e-mail: bridges-commits-unsubscribe@portals.apache.org
For additional commands, e-mail: bridges-commits-help@portals.apache.org