[jboss-cvs] JBossAS SVN: r57768 - in projects/microcontainer/trunk/aop-mc-int/src: resources/tests/org/jboss/test/microcontainer/test tests/org/jboss/test/microcontainer/test
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Oct 22 09:48:18 EDT 2006
Author: kabir.khan at jboss.com
Date: 2006-10-22 09:48:11 -0400 (Sun, 22 Oct 2006)
New Revision: 57768
Modified:
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCase.java
Log:
[JBAOP-274] Test nested annotations from mc xml
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml 2006-10-22 13:03:00 UTC (rev 57767)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml 2006-10-22 13:48:11 UTC (rev 57768)
@@ -13,11 +13,11 @@
<property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
</aop:aspect>
- <!-- TODO JBAOP-274 Figure out how to create nested dependencies with beans.xml
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Containing(dependency=@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1"), contained=@org.jboss.test.microcontainer.support.Contained(dependencies= {@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2"), @org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency3")}))</annotation>
</bean>
- -->
+
<bean name="AnnotatedIntercepted" class="org.jboss.test.microcontainer.support.NestedAnnotatedSimpleBeanImpl">
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
</bean>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml 2006-10-22 13:03:00 UTC (rev 57767)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml 2006-10-22 13:48:11 UTC (rev 57768)
@@ -13,11 +13,11 @@
<property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
</aop:aspect>
- <!-- TODO JBAOP-274 Figure out how to create nested dependencies with beans.xml
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Containing(dependency=@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1"), contained=@org.jboss.test.microcontainer.support.Contained(dependencies= {@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2"), @org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency3")}))</annotation>
</bean>
- -->
+
<bean name="AnnotatedIntercepted" class="org.jboss.test.microcontainer.support.NestedMethodAnnotatedSimpleBeanImpl">
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
</bean>
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCase.java 2006-10-22 13:03:00 UTC (rev 57767)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCase.java 2006-10-22 13:48:11 UTC (rev 57768)
@@ -61,6 +61,7 @@
try
{
checkInterceptedAndInjected("AnnotatedIntercepted");
+ checkInterceptedAndInjected("Intercepted");
}
finally
{
@@ -81,17 +82,22 @@
try
{
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
try
{
deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic0.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic1.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic2.xml");
checkInterceptedAndInjected("AnnotatedIntercepted");
+ checkInterceptedAndInjected("Intercepted");
undeploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic2.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
}
finally
{
@@ -103,12 +109,16 @@
{
deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic1.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic2.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic0.xml");
checkInterceptedAndInjected("AnnotatedIntercepted");
+ checkInterceptedAndInjected("Intercepted");
undeploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic0.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
}
finally
{
@@ -121,12 +131,16 @@
{
deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic1.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic2.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic0.xml");
checkInterceptedAndInjected("AnnotatedIntercepted");
+ checkInterceptedAndInjected("Intercepted");
undeploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic0.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
}
finally
{
@@ -156,7 +170,7 @@
assertNotNull(dependency3);
InterceptorWithAnnotationDependency.intercepted = null;
- NestedAnnotatedSimpleBeanImpl bean = (NestedAnnotatedSimpleBeanImpl) getBean(name);
+ SimpleBean bean = (SimpleBean) getBean(name);
assertNotNull(bean);
bean.someMethod();
assertNotNull(InterceptorWithNestedAnnotationDependency.intercepted1);
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCase.java 2006-10-22 13:03:00 UTC (rev 57767)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCase.java 2006-10-22 13:48:11 UTC (rev 57768)
@@ -61,6 +61,7 @@
try
{
checkInterceptedAndInjected("AnnotatedIntercepted");
+ checkInterceptedAndInjected("Intercepted");
}
finally
{
@@ -81,17 +82,22 @@
try
{
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
try
{
deploy("InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic0.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
deploy("InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic1.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
deploy("InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic2.xml");
checkInterceptedAndInjected("AnnotatedIntercepted");
+ checkInterceptedAndInjected("Intercepted");
undeploy("InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic2.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
}
finally
{
@@ -103,12 +109,16 @@
{
deploy("InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic1.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
deploy("InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic2.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
deploy("InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic0.xml");
checkInterceptedAndInjected("AnnotatedIntercepted");
+ checkInterceptedAndInjected("Intercepted");
undeploy("InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic0.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
}
finally
{
@@ -121,12 +131,16 @@
{
deploy("InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic1.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
deploy("InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic2.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
deploy("InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic0.xml");
checkInterceptedAndInjected("AnnotatedIntercepted");
+ checkInterceptedAndInjected("Intercepted");
undeploy("InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic0.xml");
checkNotInstalled("AnnotatedIntercepted");
+ checkNotInstalled("Intercepted");
}
finally
{
@@ -156,7 +170,7 @@
assertNotNull(dependency3);
InterceptorWithAnnotationDependency.intercepted = null;
- NestedMethodAnnotatedSimpleBeanImpl bean = (NestedMethodAnnotatedSimpleBeanImpl) getBean(name);
+ SimpleBean bean = (SimpleBean) getBean(name);
assertNotNull(bean);
bean.someMethod();
assertNotNull(InterceptorWithNestedAnnotationDependency.intercepted1);
More information about the jboss-cvs-commits
mailing list