svn commit: r790506 - /lenya/branches/BRANCH_2_0_X/src/impl/test/org/apache/lenya/cms/usecase/AbstractUsecaseTest.java

Author: andreas
Date: Thu Jul  2 08:54:37 2009
New Revision: 790506

URL: http://svn.apache.org/viewvc?rev=790506&view=rev
Log:
Improved error handling in AbstractUsecaseTest.

Modified:
    lenya/branches/BRANCH_2_0_X/src/impl/test/org/apache/lenya/cms/usecase/AbstractUsecaseTest.java

Modified: lenya/branches/BRANCH_2_0_X/src/impl/test/org/apache/lenya/cms/usecase/AbstractUsecaseTest.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_0_X/src/impl/test/org/apache/lenya/cms/usecase/AbstractUsecaseTest.java?rev=790506&r1=790505&r2=790506&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_0_X/src/impl/test/org/apache/lenya/cms/usecase/AbstractUsecaseTest.java (original)
+++ lenya/branches/BRANCH_2_0_X/src/impl/test/org/apache/lenya/cms/usecase/AbstractUsecaseTest.java Thu Jul  2 08:54:37 2009
@@ -45,8 +45,13 @@
             invoker = (UsecaseInvoker) getManager().lookup(TestUsecaseInvoker.ROLE);
             invoker.setTestSession(session);
             invoker.invoke(getRequest().getPathInfo(), getUsecaseName(), getParameters());
-            
-            this.targetUrl = invoker.getTargetUrl();
+
+            int result = invoker.getResult();
+            if (result != UsecaseInvoker.PRECONDITIONS_FAILED
+                    && result != UsecaseInvoker.EXECUTION_CONDITIONS_FAILED
+                    && result != UsecaseInvoker.AUTHORIZATION_FAILED) {
+                this.targetUrl = invoker.getTargetUrl();
+            }
 
             List errorMessages = invoker.getErrorMessages();
             for (Iterator i = errorMessages.iterator(); i.hasNext();) {
@@ -72,9 +77,9 @@
         checkPostconditions();
 
     }
-    
+
     private String targetUrl;
-    
+
     protected String getTargetUrl() {
         if (this.targetUrl == null) {
             throw new IllegalStateException("The usecase has not yet been executed.");