[jboss-cvs] JBossAS SVN: r71636 - in projects/microcontainer/trunk/aop-mc-int/src: tests/org/jboss/test/microcontainer/test and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2008-04-02 17:05:21 -0400 (Wed, 02 Apr 2008)
New Revision: 71636

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/HasInstanceAnnotationTestCase.xml
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/HasInstanceAnnotationTestCase.java
Log:
Revert to previous version. I accidentally committed some experimental stuff

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/HasInstanceAnnotationTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/HasInstanceAnnotationTestCase.xml	2008-04-02 21:00:28 UTC (rev 71635)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/HasInstanceAnnotationTestCase.xml	2008-04-02 21:05:21 UTC (rev 71636)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
-<!--
+
   <bean name="Bean1" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
     <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="",exposedInterface=org.jboss.test.microcontainer.support.SimpleBean.class)</annotation>
   </bean>
@@ -36,15 +36,4 @@
       <value>123</value>
     </property>
   </bean>
-  -->
-  <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
-  
-  <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="all(@org.jboss.test.microcontainer.support.ContainsIA2)">
-    <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
-  </bind>
-
-  <bean name="Bean7" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
-    <annotation>@org.jboss.test.microcontainer.support.ContainsIA2</annotation>
-  </bean>
-
 </deployment>

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/HasInstanceAnnotationTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/HasInstanceAnnotationTestCase.java	2008-04-02 21:00:28 UTC (rev 71635)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/HasInstanceAnnotationTestCase.java	2008-04-02 21:05:21 UTC (rev 71636)
@@ -43,15 +43,13 @@
 
    public void testInstanceAnnotation() throws Throwable
    {
-//      assertIsPojo("Bean1");
-//      assertIsPojo("Bean2");
-//
-//      assertIsAspectized("Bean3");
-//      assertIsAspectized("Bean4");
-//
-//      assertIsAspectized("Bean5");
-//      assertIsAspectized("Bean6");
-      
-      assertIsAspectized("Bean7");
+      assertIsPojo("Bean1");
+      assertIsPojo("Bean2");
+
+      assertIsAspectized("Bean3");
+      assertIsAspectized("Bean4");
+
+      assertIsAspectized("Bean5");
+      assertIsAspectized("Bean6");
    }
 }