[jboss-cvs] JBossAS SVN: r100090 - projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 28 17:19:46 EST 2010
Author: kabir.khan at jboss.com
Date: 2010-01-28 17:19:45 -0500 (Thu, 28 Jan 2010)
New Revision: 100090
Added:
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependsOnMeCleanupTestCase.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ScopedDependsOnMeCleanupTestCase.java
Modified:
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependencyTestSuite.java
Log:
[JBKERNEL-84] Test that dependsOnMe gets cleared with scoping enabled
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependencyTestSuite.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependencyTestSuite.java 2010-01-28 22:02:02 UTC (rev 100089)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependencyTestSuite.java 2010-01-28 22:19:45 UTC (rev 100090)
@@ -124,6 +124,8 @@
suite.addTest(OptionalTestCase.suite());
suite.addTest(OptionalXMLTestCase.suite());
suite.addTest(OptionalAnnotationTestCase.suite());
+ suite.addTest(DependsOnMeCleanupTestCase.suite());
+ suite.addTest(ScopedDependsOnMeCleanupTestCase.suite());
return suite;
}
}
Added: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependsOnMeCleanupTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependsOnMeCleanupTestCase.java (rev 0)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/DependsOnMeCleanupTestCase.java 2010-01-28 22:19:45 UTC (rev 100090)
@@ -0,0 +1,176 @@
+/*
+* 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.test.kernel.dependency.test;
+
+import java.util.Set;
+
+import junit.framework.Test;
+
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.DependencyInfo;
+import org.jboss.dependency.spi.DependencyItem;
+import org.jboss.test.kernel.dependency.support.SimpleBeanImpl;
+import org.jboss.test.kernel.dependency.support.SimpleBeanWithDependencyImpl;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class DependsOnMeCleanupTestCase extends OldAbstractKernelDependencyTest
+{
+ public static Test suite()
+ {
+ return suite(DependsOnMeCleanupTestCase.class);
+ }
+
+ public DependsOnMeCleanupTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ public DependsOnMeCleanupTestCase(String name, boolean xmltest) throws Throwable
+ {
+ super(name, xmltest, true);
+ }
+
+ public void testCleanDependenciesPlainDependency() throws Throwable
+ {
+ cleanDependenciesPlainDependency();
+ executeTest();
+ }
+
+ protected void cleanDependenciesPlainDependency()
+ {
+ BeanMetaDataBuilder builder1 = BeanMetaDataBuilder.createBuilder("Name1", SimpleBeanImpl.class.getName());
+
+ BeanMetaDataBuilder builder2 = BeanMetaDataBuilder.createBuilder("Name2", SimpleBeanImpl.class.getName());
+ builder2.addDependency("Name1");
+ addAnnotation((AbstractBeanMetaData)builder2.getBeanMetaData());
+
+ setBeanMetaDatas(new BeanMetaData[] {builder1.getBeanMetaData(), builder2.getBeanMetaData()});
+ }
+
+ public void testCleanDependenciesNormalInject() throws Throwable
+ {
+ cleanDependenciesNormalInject();
+ executeTest();
+ }
+
+ protected void cleanDependenciesNormalInject()
+ {
+ BeanMetaDataBuilder builder1 = BeanMetaDataBuilder.createBuilder("Name1", SimpleBeanImpl.class.getName());
+
+ BeanMetaDataBuilder builder2 = BeanMetaDataBuilder.createBuilder("Name2", SimpleBeanWithDependencyImpl.class.getName());
+ builder2.addPropertyMetaData("simpleBean",builder2.createInject("Name1"));
+ addAnnotation((AbstractBeanMetaData)builder2.getBeanMetaData());
+
+ setBeanMetaDatas(new BeanMetaData[] {builder1.getBeanMetaData(), builder2.getBeanMetaData()});
+ }
+
+ public void testCleanDependenciesContextualInject() throws Throwable
+ {
+ cleanDependenciesContextualInject();
+ executeTest();
+ }
+
+ protected void cleanDependenciesContextualInject()
+ {
+ BeanMetaDataBuilder builder1 = BeanMetaDataBuilder.createBuilder("Name1", SimpleBeanImpl.class.getName());
+
+ BeanMetaDataBuilder builder2 = BeanMetaDataBuilder.createBuilder("Name2", SimpleBeanWithDependencyImpl.class.getName());
+ builder2.addPropertyMetaData("simpleBean",builder2.createContextualInject());
+ addAnnotation((AbstractBeanMetaData)builder2.getBeanMetaData());
+
+ setBeanMetaDatas(new BeanMetaData[] {builder1.getBeanMetaData(), builder2.getBeanMetaData()});
+ }
+
+ protected void executeTest() throws Throwable
+ {
+ ControllerContext context1 = assertInstall(offSetNumber(0), "Name1");
+ ControllerContext context2 = assertInstall(offSetNumber(1), "Name2");
+ checkDependsOnMe(context1, context2);
+
+ assertUninstall("Name2");
+ checkNoDependsOnMe(context1);
+
+ context2 = assertInstall(offSetNumber(1), "Name2");
+ checkDependsOnMe(context1, context2);
+
+ assertUninstall("Name1");
+ checkNoDependsOnMe(context1);
+ }
+
+ protected void checkDependsOnMe(ControllerContext dependency, ControllerContext dependent)
+ {
+ DependencyInfo dependencyInfo = dependency.getDependencyInfo();
+ assertNotNull(dependencyInfo);
+ Set<DependencyItem> dependsOnMe = dependencyInfo.getDependsOnMe(null);
+ assertNotNull(dependsOnMe);
+ assertTrue(dependsOnMe.size() > 0);
+
+
+ DependencyInfo dependentInfo = dependent.getDependencyInfo();
+ assertNotNull(dependentInfo);
+ Set<DependencyItem> iDependOn = dependentInfo.getIDependOn(null);
+ assertNotNull(iDependOn);
+
+ assertEquals(dependsOnMe.size(), iDependOn.size());
+
+ assertTrue(dependsOnMe.containsAll(iDependOn));
+ }
+
+ protected void checkNoDependsOnMe(ControllerContext dependency)
+ {
+ DependencyInfo dependencyInfo = dependency.getDependencyInfo();
+ assertNotNull(dependencyInfo);
+ Set<DependencyItem> dependsOnMe = dependencyInfo.getDependsOnMe(null);
+ assertTrue(dependsOnMe == null || dependsOnMe.size() == 0);
+ }
+
+ protected void addAnnotation(AbstractBeanMetaData bmd)
+ {
+ }
+
+ protected void assertControllers(ControllerContext...contexts)
+ {
+ if (contexts.length <= 1)
+ return;
+
+ for (int i = 1 ; i < contexts.length ; i++)
+ {
+ assertNotSame(contexts[0].getController(), contexts[i].getController());
+ if (i > 1)
+ assertSame(contexts[i].getController(), contexts[i-1].getController());
+ }
+ }
+
+ protected int offSetNumber(int i)
+ {
+ return i;
+ }
+
+
+}
Added: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ScopedDependsOnMeCleanupTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ScopedDependsOnMeCleanupTestCase.java (rev 0)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ScopedDependsOnMeCleanupTestCase.java 2010-01-28 22:19:45 UTC (rev 100090)
@@ -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.test.kernel.dependency.test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.Test;
+
+import org.jboss.beans.metadata.plugins.AbstractAnnotationMetaData;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.spi.AnnotationMetaData;
+import org.jboss.metadata.plugins.scope.DeploymentScope;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ScopedDependsOnMeCleanupTestCase extends DependsOnMeCleanupTestCase
+{
+ public static Test suite()
+ {
+ return suite(ScopedDependsOnMeCleanupTestCase.class);
+ }
+
+ public ScopedDependsOnMeCleanupTestCase(String name) throws Throwable
+ {
+ super(name, false);
+ }
+
+ protected void addAnnotation(AbstractBeanMetaData bmd)
+ {
+ Set<AnnotationMetaData> annotations = new HashSet<AnnotationMetaData>();
+ annotations.add(new AbstractAnnotationMetaData("@" + DeploymentScope.class.getName() + "(\"somedeployment\")"));
+ bmd.setAnnotations(annotations);
+ }
+
+}
More information about the jboss-cvs-commits
mailing list