[jboss-cvs] aop-mc-int/src/tests/org/jboss/test/microcontainer/test ...

[Kabir Khan]

  User: kkhan   
  Date: 06/07/11 09:54:20

  Modified:    src/tests/org/jboss/test/microcontainer/test 
                        InterceptorWithNestedAnnotationDependencyTestCase.java
  Log:
  Tidy up
  
  Revision  Changes    Path
  1.2       +11 -33    aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InterceptorWithNestedAnnotationDependencyTestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- InterceptorWithNestedAnnotationDependencyTestCase.java	11 Jul 2006 13:36:38 -0000	1.1
  +++ InterceptorWithNestedAnnotationDependencyTestCase.java	11 Jul 2006 13:54:20 -0000	1.2
  @@ -80,18 +80,18 @@
         deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml");
         try
         {
  -         checkNotInstalledAndDescribed("AnnotatedIntercepted");
  +         checkNotInstalled("AnnotatedIntercepted");
   
            try
            {
               deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic0.xml");
  -            checkNotInstalledAndDescribed("AnnotatedIntercepted");
  +            checkNotInstalled("AnnotatedIntercepted");
               deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic1.xml");
  -            checkNotInstalledAndDescribed("AnnotatedIntercepted");
  +            checkNotInstalled("AnnotatedIntercepted");
               deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic2.xml");
               checkInterceptedAndInjected("AnnotatedIntercepted");
               undeploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic2.xml");
  -            checkNotInstalledAndDescribed("AnnotatedIntercepted");
  +            checkNotInstalled("AnnotatedIntercepted");
            }
            finally
            {
  @@ -102,13 +102,13 @@
            try
            {
               deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic1.xml");
  -            checkNotInstalledAndDescribed("AnnotatedIntercepted");
  +            checkNotInstalled("AnnotatedIntercepted");
               deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic2.xml");
  -            checkNotInstalledAndDescribed("AnnotatedIntercepted");
  +            checkNotInstalled("AnnotatedIntercepted");
               deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic0.xml");
               checkInterceptedAndInjected("AnnotatedIntercepted");
               undeploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic0.xml");
  -            checkNotInstalledAndDescribed("AnnotatedIntercepted");
  +            checkNotInstalled("AnnotatedIntercepted");
            }
            finally
            {
  @@ -120,13 +120,13 @@
            try
            {
               deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic1.xml");
  -            checkNotInstalledAndDescribed("AnnotatedIntercepted");
  +            checkNotInstalled("AnnotatedIntercepted");
               deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic2.xml");
  -            checkNotInstalledAndDescribed("AnnotatedIntercepted");
  +            checkNotInstalled("AnnotatedIntercepted");
               deploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic0.xml");
               checkInterceptedAndInjected("AnnotatedIntercepted");
               undeploy("InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic0.xml");
  -            checkNotInstalledAndDescribed("AnnotatedIntercepted");
  +            checkNotInstalled("AnnotatedIntercepted");
            }
            finally
            {
  @@ -167,29 +167,7 @@
         assertTrue(dependency3 == InterceptorWithNestedAnnotationDependency.intercepted3);
      }   
   
  -   private void checkNotInstalledAndNotDescribed(String name)
  -   {
  -      try
  -      {
  -         getBean(name);
  -         fail("'" + name + "' should not be installed yet");
  -      }
  -      catch (IllegalStateException expected)
  -      {
  -      }
  -      
  -      try
  -      {
  -         getBean(name, ControllerState.DESCRIBED);
  -         fail("'" + name + "' should not be described");
  -      }
  -      catch(IllegalStateException expected)
  -      {
  -         
  -      }
  -   }
  -   
  -   private void checkNotInstalledAndDescribed(String name)
  +   private void checkNotInstalled(String name)
      {
         try
         {