[webbeans-commits] Webbeans SVN: r3693 - in ri/branches/kabir-builder: tests/src/main/java/org/jboss/webbeans/test and 8 other directories.

Author: kabir.khan(a)jboss.com Date: 2009-09-17 05:20:54 -0400 (Thu, 17 Sep 2009) New Revision: 3693 Added: ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/ ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/ ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBean.java ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBeanImpl.java ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator1.java ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator2.java ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecoratorTest.java ri/branches/kabir-builder/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator/ ri/branches/kabir-builder/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator/simple/ ri/branches/kabir-builder/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator/simple/beans.xml Removed: ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/ ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBean.java ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBeanImpl.java ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator1.java ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator2.java ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecoratorTest.java ri/branches/kabir-builder/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator/simple/ ri/branches/kabir-builder/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator/simple/beans.xml Modified: ri/branches/kabir-builder/ ri/branches/kabir-builder/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java ri/branches/kabir-builder/tests/src/test/resources/META-INF/jboss-test-harness.properties ri/branches/kabir-builder/version-matrix/pom.xml Log: Merged revisions 3688,3690 via svnmerge from https://svn.jboss.org/repos/webbeans/ri/trunk ....... r3688 | pete.muir(a)jboss.org | 2009-09-16 21:29:05 +0100 (Wed, 16 Sep 2009) | 1 line minor cleanup to test setup ....... r3690 | kabir.khan(a)jboss.com | 2009-09-17 10:03:41 +0100 (Thu, 17 Sep 2009) | 1 line Add decorator test ....... Property changes on: ri/branches/kabir-builder ___________________________________________________________________ Name: svnmerge-integrated - /ri/trunk:1-3686 + /ri/trunk:1-3690 Modified: ri/branches/kabir-builder/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java =================================================================== --- ri/branches/kabir-builder/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java 2009-09-17 09:17:02 UTC (rev 3692) +++ ri/branches/kabir-builder/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java 2009-09-17 09:20:54 UTC (rev 3693) @@ -24,6 +24,7 @@ import org.jboss.webbeans.mock.MockServletContext; import org.jboss.webbeans.mock.el.EL; import org.jboss.webbeans.servlet.ServletHelper; +import org.jboss.webbeans.test.harness.AbstractStandaloneContainersImpl; import org.jboss.webbeans.util.collections.EnumerationList; import org.testng.ITestContext; import org.testng.annotations.AfterClass; @@ -43,7 +44,7 @@ { getCurrentConfiguration().getExtraPackages().add(AbstractWebBeansTest.class.getPackage().getName()); getCurrentConfiguration().getExtraPackages().add(EL.class.getPackage().getName()); - getCurrentConfiguration().getExtraPackages().add(MockServletContext.class.getPackage().getName()); + //getCurrentConfiguration().getExtraPackages().add(MockServletContext.class.getPackage().getName()); } super.beforeSuite(context); } Copied: ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator (from rev 3690, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator) Copied: ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple (from rev 3690, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple) Deleted: ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBean.java 2009-09-17 09:03:41 UTC (rev 3690) +++ ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBean.java 2009-09-17 09:20:54 UTC (rev 3693) @@ -1,38 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2006, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.webbeans.test.unit.decorator.simple; - -/** - * - * @author <a href=&quot;kabir.khan(a)jboss.com&quot;&gt;Kabir Khan</a> - * @version $Revision: 1.1 $ - */ -public interface SimpleBean -{ - int echo1(int i); - - int echo2(int i); - - int echo3(int i); - - int echo4(int i); -} Copied: ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBean.java (from rev 3690, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBean.java) =================================================================== --- ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBean.java (rev 0) +++ ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBean.java 2009-09-17 09:20:54 UTC (rev 3693) @@ -0,0 +1,38 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2006, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.webbeans.test.unit.decorator.simple; + +/** + * + * @author <a href=&quot;kabir.khan(a)jboss.com&quot;&gt;Kabir Khan</a> + * @version $Revision: 1.1 $ + */ +public interface SimpleBean +{ + int echo1(int i); + + int echo2(int i); + + int echo3(int i); + + int echo4(int i); +} Deleted: ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBeanImpl.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBeanImpl.java 2009-09-17 09:03:41 UTC (rev 3690) +++ ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBeanImpl.java 2009-09-17 09:20:54 UTC (rev 3693) @@ -1,52 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2006, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.webbeans.test.unit.decorator.simple; - -/** - * - * @author <a href=&quot;kabir.khan(a)jboss.com&quot;&gt;Kabir Khan</a> - * @version $Revision: 1.1 $ - */ -public class SimpleBeanImpl implements SimpleBean -{ - - public int echo1(int i) - { - return i; - } - - public int echo2(int i) - { - return i; - } - - public int echo3(int i) - { - return i; - } - - public int echo4(int i) - { - return i; - } - -} Copied: ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBeanImpl.java (from rev 3690, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBeanImpl.java) =================================================================== --- ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBeanImpl.java (rev 0) +++ ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleBeanImpl.java 2009-09-17 09:20:54 UTC (rev 3693) @@ -0,0 +1,52 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2006, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.webbeans.test.unit.decorator.simple; + +/** + * + * @author <a href=&quot;kabir.khan(a)jboss.com&quot;&gt;Kabir Khan</a> + * @version $Revision: 1.1 $ + */ +public class SimpleBeanImpl implements SimpleBean +{ + + public int echo1(int i) + { + return i; + } + + public int echo2(int i) + { + return i; + } + + public int echo3(int i) + { + return i; + } + + public int echo4(int i) + { + return i; + } + +} Deleted: ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator1.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator1.java 2009-09-17 09:03:41 UTC (rev 3690) +++ ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator1.java 2009-09-17 09:20:54 UTC (rev 3693) @@ -1,58 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2006, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.webbeans.test.unit.decorator.simple; - -import javax.decorator.Decorates; -import javax.decorator.Decorator; - -/** - * - * @author <a href=&quot;kabir.khan(a)jboss.com&quot;&gt;Kabir Khan</a> - * @version $Revision: 1.1 $ - */ -@Decorator -public class SimpleDecorator1 -{ - @Decorates - SimpleBean delegate; - - public static boolean echo1; - public static boolean echo3; - - public static void reset() - { - echo1 = false; - echo3 = false; - } - - public int echo1(int i) - { - echo1 = true; - return delegate.echo1(i); - } - - public int echo3(int i) - { - echo3 = true; - return delegate.echo1(i); - } -} Copied: ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator1.java (from rev 3690, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator1.java) =================================================================== --- ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator1.java (rev 0) +++ ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator1.java 2009-09-17 09:20:54 UTC (rev 3693) @@ -0,0 +1,58 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2006, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.webbeans.test.unit.decorator.simple; + +import javax.decorator.Decorates; +import javax.decorator.Decorator; + +/** + * + * @author <a href=&quot;kabir.khan(a)jboss.com&quot;&gt;Kabir Khan</a> + * @version $Revision: 1.1 $ + */ +@Decorator +public class SimpleDecorator1 +{ + @Decorates + SimpleBean delegate; + + public static boolean echo1; + public static boolean echo3; + + public static void reset() + { + echo1 = false; + echo3 = false; + } + + public int echo1(int i) + { + echo1 = true; + return delegate.echo1(i); + } + + public int echo3(int i) + { + echo3 = true; + return delegate.echo1(i); + } +} Deleted: ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator2.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator2.java 2009-09-17 09:03:41 UTC (rev 3690) +++ ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator2.java 2009-09-17 09:20:54 UTC (rev 3693) @@ -1,58 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2006, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.webbeans.test.unit.decorator.simple; - -import javax.decorator.Decorates; -import javax.decorator.Decorator; - -/** - * - * @author <a href=&quot;kabir.khan(a)jboss.com&quot;&gt;Kabir Khan</a> - * @version $Revision: 1.1 $ - */ -@Decorator -public class SimpleDecorator2 -{ - @Decorates - SimpleBean delegate; - - public static boolean echo2; - public static boolean echo3; - - public static void reset() - { - echo2 = false; - echo3 = false; - } - - public int echo2(int i) - { - echo2 = true; - return delegate.echo1(i); - } - - public int echo3(int i) - { - echo3 = true; - return delegate.echo1(i); - } -} Copied: ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator2.java (from rev 3690, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator2.java) =================================================================== --- ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator2.java (rev 0) +++ ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator2.java 2009-09-17 09:20:54 UTC (rev 3693) @@ -0,0 +1,58 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2006, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.webbeans.test.unit.decorator.simple; + +import javax.decorator.Decorates; +import javax.decorator.Decorator; + +/** + * + * @author <a href=&quot;kabir.khan(a)jboss.com&quot;&gt;Kabir Khan</a> + * @version $Revision: 1.1 $ + */ +@Decorator +public class SimpleDecorator2 +{ + @Decorates + SimpleBean delegate; + + public static boolean echo2; + public static boolean echo3; + + public static void reset() + { + echo2 = false; + echo3 = false; + } + + public int echo2(int i) + { + echo2 = true; + return delegate.echo1(i); + } + + public int echo3(int i) + { + echo3 = true; + return delegate.echo1(i); + } +} Deleted: ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecoratorTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecoratorTest.java 2009-09-17 09:03:41 UTC (rev 3690) +++ ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecoratorTest.java 2009-09-17 09:20:54 UTC (rev 3693) @@ -1,54 +0,0 @@ -package org.jboss.webbeans.test.unit.decorator.simple; - -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.jsr299.BeansXml; -import org.jboss.webbeans.test.AbstractWebBeansTest; -import org.testng.annotations.Test; - -/** - * - * @author <a href=&quot;kabir.khan(a)jboss.com&quot;&gt;Kabir Khan</a> - * @version $Revision: 1.1 $ - */ -@Artifact -(a)BeansXml(&quot;beans.xml&quot;) -public class SimpleDecoratorTest extends AbstractWebBeansTest -{ - @Test - public void testSimpleDecorator() - { - SimpleBean simpleBean = getCurrentManager().getInstanceByType(SimpleBean.class); - - resetDecorators(); - assert simpleBean.echo1(1) == 1; - assertDecorators(true, false, false); - - resetDecorators(); - assert simpleBean.echo2(2) == 2; - assertDecorators(false, true, false); - - //Only SimpleDecorator1 gets invoked, although I think SimpleDecorator2 should get invoked too - resetDecorators(); - assert simpleBean.echo3(3) == 3; - assertDecorators(false, false, true); - - resetDecorators(); - assert simpleBean.echo4(4) == 4; - assertDecorators(false, false, false); - } - - private void resetDecorators() - { - SimpleDecorator1.reset(); - SimpleDecorator2.reset(); - } - - private void assertDecorators(boolean echo1, boolean echo2, boolean echo3) - { - assert SimpleDecorator1.echo1 == echo1; - assert SimpleDecorator1.echo3 == echo3; - assert SimpleDecorator2.echo2 == echo2; - assert SimpleDecorator2.echo3 == echo3; - } -} - Copied: ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecoratorTest.java (from rev 3690, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecoratorTest.java) =================================================================== --- ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecoratorTest.java (rev 0) +++ ri/branches/kabir-builder/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecoratorTest.java 2009-09-17 09:20:54 UTC (rev 3693) @@ -0,0 +1,54 @@ +package org.jboss.webbeans.test.unit.decorator.simple; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.testng.annotations.Test; + +/** + * + * @author <a href=&quot;kabir.khan(a)jboss.com&quot;&gt;Kabir Khan</a> + * @version $Revision: 1.1 $ + */ +@Artifact +(a)BeansXml(&quot;beans.xml&quot;) +public class SimpleDecoratorTest extends AbstractWebBeansTest +{ + @Test + public void testSimpleDecorator() + { + SimpleBean simpleBean = getCurrentManager().getInstanceByType(SimpleBean.class); + + resetDecorators(); + assert simpleBean.echo1(1) == 1; + assertDecorators(true, false, false); + + resetDecorators(); + assert simpleBean.echo2(2) == 2; + assertDecorators(false, true, false); + + //Only SimpleDecorator1 gets invoked, although I think SimpleDecorator2 should get invoked too + resetDecorators(); + assert simpleBean.echo3(3) == 3; + assertDecorators(false, false, true); + + resetDecorators(); + assert simpleBean.echo4(4) == 4; + assertDecorators(false, false, false); + } + + private void resetDecorators() + { + SimpleDecorator1.reset(); + SimpleDecorator2.reset(); + } + + private void assertDecorators(boolean echo1, boolean echo2, boolean echo3) + { + assert SimpleDecorator1.echo1 == echo1; + assert SimpleDecorator1.echo3 == echo3; + assert SimpleDecorator2.echo2 == echo2; + assert SimpleDecorator2.echo3 == echo3; + } +} + Modified: ri/branches/kabir-builder/tests/src/test/resources/META-INF/jboss-test-harness.properties =================================================================== --- ri/branches/kabir-builder/tests/src/test/resources/META-INF/jboss-test-harness.properties 2009-09-17 09:17:02 UTC (rev 3692) +++ ri/branches/kabir-builder/tests/src/test/resources/META-INF/jboss-test-harness.properties 2009-09-17 09:20:54 UTC (rev 3693) @@ -1 +1 @@ -corg.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher +org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher Copied: ri/branches/kabir-builder/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator (from rev 3690, ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator) Copied: ri/branches/kabir-builder/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator/simple (from rev 3690, ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator/simple) Deleted: ri/branches/kabir-builder/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator/simple/beans.xml =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator/simple/beans.xml 2009-09-17 09:03:41 UTC (rev 3690) +++ ri/branches/kabir-builder/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator/simple/beans.xml 2009-09-17 09:20:54 UTC (rev 3693) @@ -1,6 +0,0 @@ -<beans> - <decorators> - <class>org.jboss.webbeans.test.unit.decorator.simple.SimpleDecorator1</class> - <class>org.jboss.webbeans.test.unit.decorator.simple.SimpleDecorator2</class> - </decorators> -</beans> Copied: ri/branches/kabir-builder/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator/simple/beans.xml (from rev 3690, ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator/simple/beans.xml) =================================================================== --- ri/branches/kabir-builder/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator/simple/beans.xml (rev 0) +++ ri/branches/kabir-builder/tests/src/test/resources/org/jboss/webbeans/test/unit/decorator/simple/beans.xml 2009-09-17 09:20:54 UTC (rev 3693) @@ -0,0 +1,6 @@ +<beans> + <decorators> + <class>org.jboss.webbeans.test.unit.decorator.simple.SimpleDecorator1</class> + <class>org.jboss.webbeans.test.unit.decorator.simple.SimpleDecorator2</class> + </decorators> +</beans> Modified: ri/branches/kabir-builder/version-matrix/pom.xml =================================================================== --- ri/branches/kabir-builder/version-matrix/pom.xml 2009-09-17 09:17:02 UTC (rev 3692) +++ ri/branches/kabir-builder/version-matrix/pom.xml 2009-09-17 09:20:54 UTC (rev 3693) @@ -49,7 +49,7 @@ <properties> <jsr299.tck.version>1.0.0-SNAPSHOT</jsr299.tck.version> <webbeans.version>1.0.0-SNAPSHOT</webbeans.version> - <webbeans.servlet.version>1.0.0.CR1</webbeans.servlet.version> + <webbeans.servlet.version>1.0.0-SNAPSHOT</webbeans.servlet.version> <webbeans.se.version>1.0.0-SNAPSHOT</webbeans.se.version> <jboss.test.harness.version>1.0.0-SNAPSHOT</jboss.test.harness.version> </properties> @@ -352,7 +352,7 @@ <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>catalina</artifactId> - <version>6.0.18</version> + <version>6.0.20</version> </dependency> <dependency>