From 47fc8be59f5cc1db153db57901f4ed2c93fe4082 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Tue, 5 May 2009 18:37:43 +0000
Subject: [PATCH] added test for custom controller stereotype

---
 .../ServletAnnotationControllerTests.java     | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
index 266136ab66..5b0cd45dd2 100644
--- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
+++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
@@ -18,6 +18,10 @@ package org.springframework.web.servlet.mvc.annotation;
 
 import java.io.IOException;
 import java.io.Writer;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.lang.reflect.Method;
 import java.security.Principal;
 import java.text.SimpleDateFormat;
@@ -116,6 +120,16 @@ public class ServletAnnotationControllerTests {
 		assertEquals("test", response.getContentAsString());
 	}
 
+	@Test
+	public void customAnnotationController() throws Exception {
+		initServlet(CustomAnnotationController.class);
+
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/myPath.do");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		servlet.service(request, response);
+		assertEquals("Invalid response status code", HttpServletResponse.SC_OK, response.getStatus());
+	}
+
 	@Test
 	public void requiredParamMissing() throws Exception {
 		initServlet(RequiredParamController.class);
@@ -124,6 +138,7 @@ public class ServletAnnotationControllerTests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		servlet.service(request, response);
 		assertEquals("Invalid response status code", HttpServletResponse.SC_BAD_REQUEST, response.getStatus());
+		assertTrue(servlet.getWebApplicationContext().isSingleton("controller"));
 	}
 
 	@Test
@@ -1440,6 +1455,20 @@ public class ServletAnnotationControllerTests {
 		}
 	}
 
+	@Target({ElementType.TYPE})
+	@Retention(RetentionPolicy.RUNTIME)
+	@Controller
+	public @interface MyControllerAnnotation {
+	}
+
+	@MyControllerAnnotation
+	public static class CustomAnnotationController {
+
+		@RequestMapping("/myPath.do")
+		public void myHandle() {
+		}
+	}
+
 	@Controller
 	public static class RequiredParamController {