SPR-6416, tests

Micha Kiener · Micha Kiener · commit 0fda041e4305 · 2010-01-18T08:30:52.000Z
diff --git a/org.springframework.context/src/test/java/org/springframework/conversation/BasicConversationTests.java b/org.springframework.context/src/test/java/org/springframework/conversation/BasicConversationTests.java
@@ -344,6 +344,28 @@ public void testImplicitConversationEnding() {
 		assertNull(manager.getCurrentConversation());
 	}
 
+	@Test
+	public void testConversationAnnotation() {
+		ConversationalServiceBean serviceBean = context.getBean(ConversationalServiceBean.class);
+		assertNotNull(serviceBean);
+
+		assertNull(serviceBean.getStartingConversation());
+		assertNull(serviceBean.getEndingConversation());
+		assertNull(serviceBean.getConversationalConversation());
+
+		serviceBean.startConversation();
+		Conversation conversation1 = serviceBean.getStartingConversation();
+		assertNotNull(conversation1);
+		assertNull(serviceBean.getEndingConversation());
+		assertNull(serviceBean.getConversationalConversation());
+
+		serviceBean.endConversation();
+		Conversation conversation2 = serviceBean.getEndingConversation();
+		assertNotNull(conversation2);
+		assertSame(conversation1, conversation2);
+		assertNull(serviceBean.getConversationalConversation());
+	}
+
 	protected static String getContextLocation() {
 		return "org/springframework/conversation/conversationTestContext.xml";
 	}
diff --git a/org.springframework.context/src/test/java/org/springframework/conversation/ConversationalServiceBean.java b/org.springframework.context/src/test/java/org/springframework/conversation/ConversationalServiceBean.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-2008 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. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.springframework.conversation;
+
+
+/**
+ * @author Micha Kiener
+ * @since 3.1
+ */
+public interface ConversationalServiceBean {
+
+	public void startConversation();
+
+	public void endConversation();
+
+	public void doInConversation();
+
+	public Conversation getStartingConversation();
+
+	public Conversation getEndingConversation();
+
+	public Conversation getConversationalConversation();
+}
diff --git a/org.springframework.context/src/test/java/org/springframework/conversation/ConversationalServiceBeanImpl.java b/org.springframework.context/src/test/java/org/springframework/conversation/ConversationalServiceBeanImpl.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2008 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. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.springframework.conversation;
+
+import org.springframework.conversation.annotation.BeginConversation;
+import org.springframework.conversation.annotation.Conversational;
+import org.springframework.conversation.annotation.EndConversation;
+import org.springframework.conversation.manager.ConversationManager;
+
+/**
+ * A test service bean using the different conversation annotations.
+ * 
+ * @author Micha Kiener
+ * @since 3.1
+ */
+public class ConversationalServiceBeanImpl implements ConversationalServiceBean {
+	private ConversationManager manager;
+
+	private Conversation startingConversation;
+	private Conversation endingConversation;
+	private Conversation conversationalConversation;
+
+	@BeginConversation
+	public void startConversation() {
+		startingConversation = manager.getCurrentConversation();
+	}
+
+	@EndConversation
+	public void endConversation() {
+		endingConversation = manager.getCurrentConversation();
+	}
+
+	@Conversational
+	public void doInConversation() {
+		conversationalConversation = manager.getCurrentConversation();
+	}
+
+	public Conversation getStartingConversation() {
+		return startingConversation;
+	}
+
+	public Conversation getEndingConversation() {
+		return endingConversation;
+	}
+
+	public Conversation getConversationalConversation() {
+		return conversationalConversation;
+	}
+
+	public void setConversationManager(ConversationManager manager) {
+		this.manager = manager;
+	}
+}
diff --git a/org.springframework.context/src/test/java/org/springframework/conversation/conversationTestContext.xml b/org.springframework.context/src/test/java/org/springframework/conversation/conversationTestContext.xml
@@ -8,13 +8,18 @@
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
     
-    <context:annotation-config />
+    <aop:aspectj-autoproxy/>
+    <context:annotation-config/>
     
     <bean id="conversationManager" class="org.springframework.conversation.manager.ConversationManagerImpl">
         <property name="defaultConversationTimeout" value="0"/>
         <property name="conversationStore" ref="conversationStore"/>
         <property name="conversationResolver" ref="conversationResolver"/>
     </bean>
+
+    <bean id="conversationAnnotationAdvice" class="org.springframework.conversation.annotation.ConversationAdvice">
+        <property name="conversationManager" ref="conversationManager"/>
+    </bean>
     
     <bean id="conversationStore" class="org.springframework.conversation.SingletonConversationStore">
         <property name="useFallbackMap" value="false"/>
@@ -29,4 +34,8 @@
     </bean>
     
     <bean id="testBean" class="org.springframework.conversation.ConversationalBean" scope="conversation"/>
+    
+    <bean id="testService" class="org.springframework.conversation.ConversationalServiceBeanImpl">
+        <property name="conversationManager" ref="conversationManager"/>
+    </bean>
 </beans>
