svn commit: r1244206 - /tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java

[ka...@apache.org]

Author: kaosko
Date: Tue Feb 14 20:42:36 2012
New Revision: 1244206

URL: http://svn.apache.org/viewvc?rev=1244206&view=rev
Log:
OPEN - issueTAP5-1833: Merge functionality of Tynamo.org's
tapestry-exceptionpage module with the built-in ExceptionHandler
- Fix test failing when run together with the rest. Clearly, I've had
too much Mockito since I still don't quite understand why tests that
don't have any expectations interfere with the one that has, but just
reinitialize all mocks for each test.

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java?rev=1244206&r1=1244205&r2=1244206&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java Tue Feb 14 20:42:36 2012
@@ -30,21 +30,21 @@ import org.apache.tapestry5.services.Req
 import org.apache.tapestry5.services.Response;
 import org.easymock.EasyMock;
 import org.slf4j.Logger;
-import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 @SuppressWarnings("serial")
 public class DefaultRequestExceptionHandlerTest extends InternalBaseTestCase {
     private Map<Class, Object> mockConfiguration = new HashMap<Class, Object>();
-    RequestPageCache pageCache = mockRequestPageCache();
-    PageResponseRenderer renderer = mockPageResponseRenderer();
-    Logger logger = mockLogger();
-    Request request = mockRequest();
-    Response response = mockResponse();
-    ComponentClassResolver componentClassResolver = mockComponentClassResolver();
-    LinkSource linkSource = mockLinkSource();
-    ServiceResources serviceResources = mockServiceResources();
-	private DefaultRequestExceptionHandler exceptionHandler = new DefaultRequestExceptionHandler(pageCache, renderer, logger, "exceptionpage", request, response, componentClassResolver, linkSource, serviceResources, mockConfiguration);
+    RequestPageCache pageCache;
+    PageResponseRenderer renderer;
+    Logger logger;
+    Request request;
+    Response response;
+    ComponentClassResolver componentClassResolver;
+    LinkSource linkSource;
+    ServiceResources serviceResources;
+	private DefaultRequestExceptionHandler exceptionHandler;
 
 	private static class MyContextAwareException extends Throwable implements ContextAwareException {
 		private Object[] context;
@@ -63,10 +63,19 @@ public class DefaultRequestExceptionHand
 	    
 	}
 	
-    @BeforeClass
+    @BeforeMethod
     public void setup_tests() throws Exception
     {
         mockConfiguration.clear();
+        pageCache = mockRequestPageCache();
+        renderer = mockPageResponseRenderer();
+        logger = mockLogger();
+        request = mockRequest();
+        response = mockResponse();
+        componentClassResolver = mockComponentClassResolver();
+        linkSource = mockLinkSource();
+        serviceResources = mockServiceResources();
+        exceptionHandler = new DefaultRequestExceptionHandler(pageCache, renderer, logger, "exceptionpage", request, response, componentClassResolver, linkSource, serviceResources, mockConfiguration);
     }