[jboss-cvs] JBossAS SVN: r70058 - in projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations: test/inheritance and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 25 06:19:56 EST 2008
Author: alesj
Date: 2008-02-25 06:19:56 -0500 (Mon, 25 Feb 2008)
New Revision: 70058
Added:
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubCallbackAnnotationTester.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubExternalAnnotationTester.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubFactoryAnnotationTester.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubInstallationAnnotationTester.java
Modified:
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/CallbackAnnotationTester.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/FactoryAnnotationTester.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/InstallationAnnotationTester.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/AbstractAnnotationInheritanceTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/CallbackAnnotationInheritanceTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/ConstructorAnnotationInheritanceTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/ExternalAnnotationInheritanceTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/FactoryAnnotationInheritanceTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/InstallationAnnotationInheritanceTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/PropertyAnnotationInheritanceTestCase.java
Log:
Annotation IoC inheritance tests.
Filling in missing TODOs.
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/CallbackAnnotationTester.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/CallbackAnnotationTester.java 2008-02-25 07:01:04 UTC (rev 70057)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/CallbackAnnotationTester.java 2008-02-25 11:19:56 UTC (rev 70058)
@@ -43,7 +43,7 @@
counter--;
}
- public Object getValue()
+ public Integer getValue()
{
return counter;
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/FactoryAnnotationTester.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/FactoryAnnotationTester.java 2008-02-25 07:01:04 UTC (rev 70057)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/FactoryAnnotationTester.java 2008-02-25 11:19:56 UTC (rev 70058)
@@ -31,6 +31,10 @@
{
private Object value;
+ public FactoryAnnotationTester()
+ {
+ }
+
public FactoryAnnotationTester(Object value)
{
this.value = value;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/InstallationAnnotationTester.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/InstallationAnnotationTester.java 2008-02-25 07:01:04 UTC (rev 70057)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/InstallationAnnotationTester.java 2008-02-25 11:19:56 UTC (rev 70058)
@@ -43,7 +43,7 @@
counter--;
}
- public Object getValue()
+ public Integer getValue()
{
return counter;
}
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubCallbackAnnotationTester.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubCallbackAnnotationTester.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubCallbackAnnotationTester.java 2008-02-25 11:19:56 UTC (rev 70058)
@@ -0,0 +1,29 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.kernel.annotations.support;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class SubCallbackAnnotationTester extends CallbackAnnotationTester
+{
+}
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubExternalAnnotationTester.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubExternalAnnotationTester.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubExternalAnnotationTester.java 2008-02-25 11:19:56 UTC (rev 70058)
@@ -0,0 +1,29 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.kernel.annotations.support;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class SubExternalAnnotationTester extends ExternalAnnotationTester
+{
+}
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubFactoryAnnotationTester.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubFactoryAnnotationTester.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubFactoryAnnotationTester.java 2008-02-25 11:19:56 UTC (rev 70058)
@@ -0,0 +1,29 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.kernel.annotations.support;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class SubFactoryAnnotationTester extends FactoryAnnotationTester
+{
+}
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubInstallationAnnotationTester.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubInstallationAnnotationTester.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubInstallationAnnotationTester.java 2008-02-25 11:19:56 UTC (rev 70058)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.kernel.annotations.support;
+
+import org.jboss.beans.metadata.api.annotations.InstallMethod;
+import org.jboss.beans.metadata.api.annotations.UninstallMethod;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class SubInstallationAnnotationTester extends InstallationAnnotationTester
+{
+}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/AbstractAnnotationInheritanceTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/AbstractAnnotationInheritanceTest.java 2008-02-25 07:01:04 UTC (rev 70057)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/AbstractAnnotationInheritanceTest.java 2008-02-25 11:19:56 UTC (rev 70058)
@@ -22,6 +22,9 @@
package org.jboss.test.kernel.annotations.test.inheritance;
import org.jboss.test.kernel.annotations.test.AbstractRunAnnotationsTest;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
/**
* Testing annotations inheritance.
@@ -35,6 +38,12 @@
super(name);
}
+ protected KernelControllerContext install(String name, Class<?> clazz) throws Throwable
+ {
+ KernelController controller = getController();
+ return controller.install(new AbstractBeanMetaData(name, clazz.getName()));
+ }
+
protected void doTestAfterInstall(Class<?> clazz, Object target)
{
assertInstanceOf(target, clazz);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/CallbackAnnotationInheritanceTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/CallbackAnnotationInheritanceTestCase.java 2008-02-25 07:01:04 UTC (rev 70057)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/CallbackAnnotationInheritanceTestCase.java 2008-02-25 11:19:56 UTC (rev 70058)
@@ -22,6 +22,9 @@
package org.jboss.test.kernel.annotations.test.inheritance;
import junit.framework.Test;
+import org.jboss.test.kernel.annotations.support.CallbackAnnotationTester;
+import org.jboss.test.kernel.annotations.support.SubCallbackAnnotationTester;
+import org.jboss.test.kernel.annotations.support.MyDeployer;
/**
* Callback annotation inheritance test.
@@ -42,5 +45,15 @@
public void testInheritance() throws Throwable
{
+ install("deployer", MyDeployer.class);
+ SubCallbackAnnotationTester tester = new SubCallbackAnnotationTester();
+ runAnnotationsOnTarget(tester);
+ assertTrue(0 == tester.getValue());
}
+
+ protected void doTestAfterInstall(Object target)
+ {
+ CallbackAnnotationTester tester = (CallbackAnnotationTester)target;
+ assertTrue(1 == tester.getValue());
+ }
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/ConstructorAnnotationInheritanceTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/ConstructorAnnotationInheritanceTestCase.java 2008-02-25 07:01:04 UTC (rev 70057)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/ConstructorAnnotationInheritanceTestCase.java 2008-02-25 11:19:56 UTC (rev 70058)
@@ -22,9 +22,7 @@
package org.jboss.test.kernel.annotations.test.inheritance;
import junit.framework.Test;
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.test.kernel.annotations.support.ConstructorInheritanceTester;
import org.jboss.test.kernel.annotations.support.SubConstructorInheritanceTester;
@@ -47,12 +45,10 @@
public void testInheritance() throws Throwable
{
- KernelController controller = getController();
- controller.install(new AbstractBeanMetaData("somebean", Object.class.getName()));
- SubConstructorInheritanceTester tester = new SubConstructorInheritanceTester();
- runAnnotationsOnTarget(tester);
+ install("somebean", Object.class);
+ runAnnotationsOnTarget(new SubConstructorInheritanceTester());
- ControllerContext kcc = controller.install(new AbstractBeanMetaData("cit", ConstructorInheritanceTester.class.getName()));
+ ControllerContext kcc = install("cit", ConstructorInheritanceTester.class);
assertNotNull(kcc);
assertNotNull(kcc.getTarget());
assertInstanceOf(kcc.getTarget(), ConstructorInheritanceTester.class);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/ExternalAnnotationInheritanceTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/ExternalAnnotationInheritanceTestCase.java 2008-02-25 07:01:04 UTC (rev 70057)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/ExternalAnnotationInheritanceTestCase.java 2008-02-25 11:19:56 UTC (rev 70058)
@@ -22,6 +22,7 @@
package org.jboss.test.kernel.annotations.test.inheritance;
import junit.framework.Test;
+import org.jboss.test.kernel.annotations.support.SubExternalAnnotationTester;
/**
* External annotation inheritance test.
@@ -42,6 +43,6 @@
public void testInheritance() throws Throwable
{
- //TODO
+ runAnnotationsOnTarget(new SubExternalAnnotationTester());
}
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/FactoryAnnotationInheritanceTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/FactoryAnnotationInheritanceTestCase.java 2008-02-25 07:01:04 UTC (rev 70057)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/FactoryAnnotationInheritanceTestCase.java 2008-02-25 11:19:56 UTC (rev 70058)
@@ -22,6 +22,8 @@
package org.jboss.test.kernel.annotations.test.inheritance;
import junit.framework.Test;
+import org.jboss.test.kernel.annotations.support.FactoryAnnotationTester;
+import org.jboss.test.kernel.annotations.support.SubFactoryAnnotationTester;
/**
* Factory annotation inheritance test.
@@ -42,6 +44,8 @@
public void testInheritance() throws Throwable
{
- //TODO
+ FactoryAnnotationTester tester = new SubFactoryAnnotationTester();
+ runAnnotationsOnTarget(tester);
+ assertNull(tester.getValue());
}
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/InstallationAnnotationInheritanceTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/InstallationAnnotationInheritanceTestCase.java 2008-02-25 07:01:04 UTC (rev 70057)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/InstallationAnnotationInheritanceTestCase.java 2008-02-25 11:19:56 UTC (rev 70058)
@@ -22,6 +22,9 @@
package org.jboss.test.kernel.annotations.test.inheritance;
import junit.framework.Test;
+import org.jboss.test.kernel.annotations.support.InstallationAnnotationTester;
+import org.jboss.test.kernel.annotations.support.MyDeployer;
+import org.jboss.test.kernel.annotations.support.SubInstallationAnnotationTester;
/**
* Installation annotation inheritance test.
@@ -42,6 +45,15 @@
public void testInheritance() throws Throwable
{
- //TODO
+ install("deployer", MyDeployer.class);
+ InstallationAnnotationTester tester = new SubInstallationAnnotationTester();
+ runAnnotationsOnTarget(tester);
+ assertTrue(0 == tester.getValue());
}
+
+ protected void doTestAfterInstall(Object target)
+ {
+ InstallationAnnotationTester tester = (InstallationAnnotationTester)target;
+ assertTrue(1 == tester.getValue());
+ }
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/PropertyAnnotationInheritanceTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/PropertyAnnotationInheritanceTestCase.java 2008-02-25 07:01:04 UTC (rev 70057)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/inheritance/PropertyAnnotationInheritanceTestCase.java 2008-02-25 11:19:56 UTC (rev 70058)
@@ -22,8 +22,6 @@
package org.jboss.test.kernel.annotations.test.inheritance;
import junit.framework.Test;
-import org.jboss.kernel.spi.dependency.KernelController;
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.test.kernel.annotations.support.SubPropertyInheritanceTester;
/**
@@ -45,10 +43,10 @@
public void testInheritance() throws Throwable
{
- KernelController controller = getController();
- controller.install(new AbstractBeanMetaData("somebean", Object.class.getName()));
+ install("somebean", Object.class);
SubPropertyInheritanceTester tester = new SubPropertyInheritanceTester();
- runAnnotationsOnTarget(tester);
+ runAnnotationsOnTarget(new SubPropertyInheritanceTester());
+ assertNull(tester.getValue());
}
protected void doTestAfterInstall(Object target)
More information about the jboss-cvs-commits
mailing list