[jboss-cvs] JBossAS SVN: r70999 - projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/field.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-03-19 09:43:19 -0400 (Wed, 19 Mar 2008)
New Revision: 70999

Modified:
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/field/BasicFieldAnnotationSupportTestCase.java
Log:
Verify nullify after uninstall.

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/field/BasicFieldAnnotationSupportTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/field/BasicFieldAnnotationSupportTestCase.java	2008-03-19 13:00:07 UTC (rev 70998)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/field/BasicFieldAnnotationSupportTestCase.java	2008-03-19 13:43:19 UTC (rev 70999)
@@ -78,10 +78,24 @@
       controller.install(new AbstractBeanMetaData("pb3", TestBean.class.getName()));
       controller.install(new AbstractBeanMetaData("deployer", MyDeployer.class.getName()));
       InjectTester tester = new InjectTester();
+
       testFields(tester, new InjectTesterVerifier(), BeanAccessMode.FIELDS);
+      assertTesterAfterUninstall(tester);
+
       testFields(tester, new AllInjectTesterVerifier(), BeanAccessMode.ALL);
+      assertTesterAfterUninstall(tester);
    }
 
+   protected void assertTesterAfterUninstall(InjectTester tester)
+   {
+      assertNull(tester.getPrivateBean());
+      assertNull(tester.getProtectedBean());
+      assertNull(tester.publicBean);
+      assertNull(tester.getPrivateDeployer());
+      assertNull(tester.getProtectedDeployer());
+      assertNull(tester.publicDeployer);
+   }
+
    public void testValueFactory() throws Throwable
    {
       KernelController controller = getController();
@@ -89,10 +103,21 @@
       controller.install(new AbstractBeanMetaData("pb2", TestBean.class.getName()));
       controller.install(new AbstractBeanMetaData("pb3", TestBean.class.getName()));
       ValueFactoryTester tester = new ValueFactoryTester();
+
       testFields(tester, new VFTesterVerifier(), BeanAccessMode.FIELDS);
+      assertTesterAfterInstall(tester);
+
       testFields(tester, new AllVFTesterVerifier(), BeanAccessMode.ALL);
+      assertTesterAfterInstall(tester);
    }
 
+   protected void assertTesterAfterInstall(ValueFactoryTester tester)
+   {
+      assertNull(tester.getPrivateBean());
+      assertNull(tester.getProtectedBean());
+      assertNull(tester.publicBean);
+   }
+
    public void testInstalls() throws Throwable
    {
       KernelController controller = getController();
@@ -100,10 +125,22 @@
       controller.install(new AbstractBeanMetaData("pb2", TestBean.class.getName()));
       controller.install(new AbstractBeanMetaData("pb3", TestBean.class.getName()));
       CallbacksTester tester = new CallbacksTester();
+
       testFields(tester, new CallbacksTesterVerifier(), BeanAccessMode.FIELDS);
+      assertTesterAfterInstall(tester);
+
       testFields(tester, new AllCallbacksTesterVerifier(), BeanAccessMode.ALL);
+      assertTesterAfterInstall(tester);
    }
 
+   protected void assertTesterAfterInstall(CallbacksTester tester)
+   {
+      // both - null or empty are acceptable
+      assertTrue(tester.getPrivateBeans() == null || tester.getPrivateBeans().isEmpty());
+      assertTrue(tester.getProtectedBeans() == null || tester.getProtectedBeans().isEmpty());
+      assertTrue(tester.publicBeans == null || tester.publicBeans.isEmpty());
+   }
+
    private class InjectTesterVerifier implements AfterInstallVerifier<InjectTester>
    {
       public void verify(InjectTester target)