You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/06/29 22:41:57 UTC
svn commit: r418132 - in /tapestry/tapestry4/trunk: ./ framework/
framework/src/java/org/apache/tapestry/
framework/src/test/org/apache/tapestry/engine/
framework/src/test/org/apache/tapestry/enhance/
framework/src/test/org/apache/tapestry/junit/mock/ ...
Author: jkuhnert
Date: Thu Jun 29 13:41:56 2006
New Revision: 418132
URL: http://svn.apache.org/viewvc?rev=418132&view=rev
Log:
Testing fixes
Modified:
tapestry/tapestry4/trunk/framework/pom.xml
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/ApplicationServlet.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestEnhancementOperation.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventInvokerTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestApplicationSpecificationInitializer.java
tapestry/tapestry4/trunk/pom.xml
Modified: tapestry/tapestry4/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/pom.xml?rev=418132&r1=418131&r2=418132&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/pom.xml (original)
+++ tapestry/tapestry4/trunk/framework/pom.xml Thu Jun 29 13:41:56 2006
@@ -157,6 +157,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3-SNAPSHOT</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>user.language</name>
+ <value>en_US</value>
+ </property>
+ </systemProperties>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/ApplicationServlet.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/ApplicationServlet.java?rev=418132&r1=418131&r2=418132&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/ApplicationServlet.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/ApplicationServlet.java Thu Jun 29 13:41:56 2006
@@ -319,5 +319,7 @@
_registry.shutdown();
_registry = null;
}
+
+ super.destroy();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java?rev=418132&r1=418131&r2=418132&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java Thu Jun 29 13:41:56 2006
@@ -123,16 +123,19 @@
public void testGetLinkComplex()
{
IComponent component = newComponent();
- WebRequest request = newWebRequest(false, newWebSession());
+ IRequestCycle cycle = newCycle();
+
IPage activePage = newPage("ActivePage");
IPage componentPage = newPage("ComponentPage");
- IRequestCycle cycle = newCycle();
- LinkFactory lf = newLinkFactory();
- ILink link = newLink();
-
+
trainGetPage(cycle, activePage);
trainGetPage(component, componentPage);
-
+
+ LinkFactory lf = newLinkFactory();
+ ILink link = newLink();
+
+ WebRequest request = newWebRequest(false, newWebSession());
+
Map parameters = new HashMap();
trainGetIdPath(component, "fred.barney");
@@ -202,8 +205,7 @@
IRequestCycle cycle = newCycle();
IPage page = newPage();
IAction action = newAction();
- WebSession session = newWebSession(false);
- WebRequest request = newWebRequest(session);
+
ResponseRenderer rr = newResponseRenderer();
trainGetParameter(cycle, ServiceConstants.COMPONENT, "fred.barney");
@@ -217,9 +219,14 @@
cycle.activate(page);
trainGetNestedComponent(page, "fred.barney", action);
-
+
trainGetRequiresSession(action, true);
-
+
+ WebSession session = newMock(WebSession.class);
+ WebRequest request = newWebRequest(session);
+
+ expect(session.isNew()).andReturn(false);
+
cycle.rewindPage("action-id", action);
rr.renderResponse(cycle);
@@ -284,9 +291,9 @@
IRequestCycle cycle = newCycle();
IPage page = newPage();
IAction action = newAction();
- WebRequest request = newWebRequest(null);
+ // WebRequest request = newWebRequest(null);
Location l = newLocation();
-
+
trainGetParameter(cycle, ServiceConstants.COMPONENT, "fred.barney");
trainGetParameter(cycle, ServiceConstants.CONTAINER, null);
trainGetParameter(cycle, ServiceConstants.PAGE, "ActivePage");
@@ -294,13 +301,15 @@
trainGetParameter(cycle, ServiceConstants.SESSION, "T");
trainGetPage(cycle, "ActivePage", page);
-
+
cycle.activate(page);
trainGetNestedComponent(page, "fred.barney", action);
-
+
trainGetRequiresSession(action, true);
+ WebRequest request = newWebRequest(null);
+
trainGetExtendedId(action, "ActivePage/fred.barney");
trainGetLocation(page, l);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java?rev=418132&r1=418131&r2=418132&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java Thu Jun 29 13:41:56 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.engine;
-import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.*;
import java.util.Map;
@@ -45,7 +45,8 @@
protected IPage newPage(String name)
{
IPage result = newMock(IPage.class);
-
+ checkOrder(result, false);
+
expect(result.getPageName()).andReturn(name);
return result;
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestEnhancementOperation.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestEnhancementOperation.java?rev=418132&r1=418131&r2=418132&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestEnhancementOperation.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestEnhancementOperation.java Thu Jun 29 13:41:56 2006
@@ -47,7 +47,6 @@
import org.apache.tapestry.link.ServiceLink;
import org.apache.tapestry.services.ComponentConstructor;
import org.apache.tapestry.spec.IComponentSpecification;
-import org.easymock.internal.matchers.Null;
import org.testng.annotations.Configuration;
import org.testng.annotations.Test;
@@ -451,9 +450,9 @@
// String because "FRED_VALUE" is a String
fab.addField("fred", String.class);
-
+
replay();
-
+
EnhancementOperationImpl eo = new EnhancementOperationImpl(new DefaultClassResolver(),
spec, BaseComponent.class, cf, null);
@@ -477,7 +476,8 @@
body.addln("fred_0 = $2;");
body.end();
- fab.addConstructor(aryEq(new Class[] { String.class, Map.class }), isA(Class[].class), eq(body.toString()));
+ fab.addConstructor(aryEq(new Class[] { String.class, Map.class }), (Class[])isNull(),
+ eq(body.toString()));
replay();
@@ -718,10 +718,10 @@
ClassFab fab = newMock(ClassFab.class);
- fab.addInterface(PageDetachListener.class);
-
expect(cf.newClass("$BaseComponent_97", BaseComponent.class)).andReturn(fab);
+ fab.addInterface(PageDetachListener.class);
+
replay();
EnhancementOperationImpl eo = new EnhancementOperationImpl(cr, spec, BaseComponent.class,
@@ -847,9 +847,9 @@
ClassFab fab = newMock(ClassFab.class);
- expect(cf.newClass("$ExitingAbstractMethodFixture_97", ExistingAbstractMethodFixture.class))
+ expect(cf.newClass(endsWith("$ExistingAbstractMethodFixture_97"), eq(TestEnhancementOperation.ExistingAbstractMethodFixture.class)))
.andReturn(fab);
-
+
replay();
EnhancementOperationImpl eo = new EnhancementOperationImpl(cr, spec,
@@ -901,11 +901,11 @@
ClassFab classFab = newMock(ClassFab.class);
+ ClassFactory cf = newClassFactory(ServiceLink.class, classFab);
+
Throwable t = new RuntimeException("Inconceivable!");
expect(classFab.createClass()).andThrow(t);
-
- ClassFactory cf = newClassFactory(ServiceLink.class, classFab);
replay();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java?rev=418132&r1=418131&r2=418132&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java Thu Jun 29 13:41:56 2006
@@ -128,7 +128,7 @@
* Closes System.out and System.err, then restores them to their original values.
*/
@Configuration(afterTestMethod = true)
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
System.err.close();
System.setErr(_savedErr);
@@ -137,6 +137,8 @@
System.setOut(_savedOut);
_requestNumber = 0;
+ _request = null;
+ _response = null;
}
@DataProvider(name = "mockTestScripts")
@@ -206,7 +208,7 @@
executeRequest(request);
}
-
+
_servlet.destroy();
PropertyUtils.clearCache();
@@ -944,7 +946,7 @@
return new PrintStream(bos, true);
}
- @Configuration(afterSuite = true)
+ @Configuration(afterTestClass = true)
public static void deleteDir()
{
File file = new File(getBaseDirectory() + "/target/.private");
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventInvokerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventInvokerTest.java?rev=418132&r1=418131&r2=418132&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventInvokerTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventInvokerTest.java Thu Jun 29 13:41:56 2006
@@ -129,6 +129,8 @@
expect(listenerMap.getListener("fooListener")).andReturn(listener);
+ listenerInvoker.invokeListener(listener, comp, cycle);
+
replay();
invoker.invokeListeners(comp, cycle, event);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestApplicationSpecificationInitializer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestApplicationSpecificationInitializer.java?rev=418132&r1=418131&r2=418132&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestApplicationSpecificationInitializer.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/TestApplicationSpecificationInitializer.java Thu Jun 29 13:41:56 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.services.impl;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.assertSame;
@@ -48,7 +48,8 @@
*/
@Test
public class TestApplicationSpecificationInitializer extends BaseComponentTestCase
-{
+{
+
public void testOnClasspath() throws Exception
{
DefaultClassResolver cr = new DefaultClassResolver();
@@ -65,24 +66,22 @@
cf.setClassResolver(cr);
i.setClasspathResourceFactory(cf);
-
+
HttpServlet servlet = new ServletFixture();
ServletConfig config = newMock(ServletConfig.class);
-
- trainForServletInit(config);
-
- expect(config.getInitParameter(ApplicationSpecificationInitializer.APP_SPEC_PATH_PARAM))
- .andReturn(appSpecResource.getPath());
-
+
IApplicationSpecification as = new ApplicationSpecification();
ISpecificationParser parser = newMock(ISpecificationParser.class);
-
+
i.setParser(parser);
-
+
+ expect(config.getInitParameter(ApplicationSpecificationInitializer.APP_SPEC_PATH_PARAM))
+ .andReturn(appSpecResource.getPath());
+
expect(parser.parseApplicationSpecification(appSpecResource)).andReturn(as);
-
+
ApplicationGlobals ag = new ApplicationGlobalsImpl();
i.setGlobals(ag);
@@ -101,17 +100,6 @@
verify();
}
- private void trainForServletInit(ServletConfig config)
- {
- ServletContext context = newMock(ServletContext.class);
-
- expect(config.getServletContext()).andReturn(context);
-
- expect(config.getServletName()).andReturn("test");
-
- context.log("test: init");
- }
-
public void testInAppContextFolder() throws Exception
{
DefaultClassResolver cr = new DefaultClassResolver();
@@ -132,8 +120,6 @@
ServletConfig config = newMock(ServletConfig.class);
- trainForServletInit(config);
-
expect(config.getInitParameter(ApplicationSpecificationInitializer.APP_SPEC_PATH_PARAM))
.andReturn(null);
@@ -194,9 +180,7 @@
HttpServlet servlet = new ServletFixture();
ServletConfig config = newMock(ServletConfig.class);
-
- trainForServletInit(config);
-
+
expect(config.getInitParameter(ApplicationSpecificationInitializer.APP_SPEC_PATH_PARAM))
.andReturn(null);
@@ -260,8 +244,6 @@
ServletConfig config = newMock(ServletConfig.class);
- trainForServletInit(config);
-
expect(config.getInitParameter(ApplicationSpecificationInitializer.APP_SPEC_PATH_PARAM)).andReturn(null);
expect(config.getServletContext()).andReturn(context);
@@ -315,20 +297,17 @@
HttpServlet servlet = new ServletFixture();
ServletConfig config = newMock(ServletConfig.class);
- checkOrder(config, false);
+
+ expect(config.getInitParameter(ApplicationSpecificationInitializer.APP_SPEC_PATH_PARAM))
+ .andReturn(null);
expect(config.getServletContext()).andReturn(context).anyTimes();
expect(config.getServletName()).andReturn("dino").anyTimes();
- context.log("dino: init");
-
- expect(config.getInitParameter(ApplicationSpecificationInitializer.APP_SPEC_PATH_PARAM))
- .andReturn(null);
-
expect(context.getResource("/WEB-INF/dino/dino.application"))
.andReturn(getClass().getResource("ParseApp.application")).times(2);
-
+
replay();
servlet.init(config);
@@ -348,6 +327,7 @@
assertEquals("ParseApp", ag.getSpecification().getName());
verify();
-
+
+ registry.shutdown();
}
}
Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?rev=418132&r1=418131&r2=418132&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Thu Jun 29 13:41:56 2006
@@ -155,7 +155,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>