From 668207d59d72d5cb1eb169551314c5c290f685f8 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Wed, 29 Sep 2010 13:45:50 +0000
Subject: [PATCH] fixed Portlet UnavailableException tests (SPR-7542)

---
 .../mvc/annotation/PortletAnnotationControllerTests.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java b/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
index a0c387a04ed..6225c2cf703 100644
--- a/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
+++ b/org.springframework.web.portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@ import javax.portlet.PortletRequest;
 import javax.portlet.PortletSession;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.UnavailableException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -73,6 +72,7 @@ import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.context.support.GenericWebApplicationContext;
 import org.springframework.web.portlet.DispatcherPortlet;
 import org.springframework.web.portlet.ModelAndView;
+import org.springframework.web.portlet.NoHandlerFoundException;
 import org.springframework.web.portlet.context.StaticPortletApplicationContext;
 import org.springframework.web.portlet.mvc.AbstractController;
 import org.springframework.web.servlet.View;
@@ -382,9 +382,9 @@ public class PortletAnnotationControllerTests extends TestCase {
 		MockRenderResponse response = new MockRenderResponse();
 		try {
 			portlet.render(request, response);
-			fail("Should have thrown UnavailableException");
+			fail("Should have thrown NoHandlerFoundException");
 		}
-		catch (UnavailableException ex) {
+		catch (NoHandlerFoundException ex) {
 			// expected
 		}