[jboss-cvs] JBossAS SVN: r100408 - in projects/kernel/branches/resolver/dependency: src/test/java/org/jboss/test/dependency/controller/test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 4 07:30:57 EST 2010
Author: kabir.khan at jboss.com
Date: 2010-02-04 07:30:56 -0500 (Thu, 04 Feb 2010)
New Revision: 100408
Modified:
projects/kernel/branches/resolver/dependency/pom.xml
projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/BadDependencyInfoTestCase.java
projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyTestCase.java
Log:
Run tests using both dependency resolver mechanisms. Rework OnDemandTestCase to work with both modes. Exclude BadDependencyInfoTestCase from indexing resolver run
Modified: projects/kernel/branches/resolver/dependency/pom.xml
===================================================================
--- projects/kernel/branches/resolver/dependency/pom.xml 2010-02-04 11:13:54 UTC (rev 100407)
+++ projects/kernel/branches/resolver/dependency/pom.xml 2010-02-04 12:30:56 UTC (rev 100408)
@@ -27,16 +27,54 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- the tessuite will be run twice.
+ the first/default execution will run with the standard dependency resolver
+ if there are failures, the next execution won't be run -->
+ <testFailureIgnore>false</testFailureIgnore>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <excludes>
+ <exclude>**/AbstractDependencyTest*</exclude>
+ <exclude>**/TestControllerContext*</exclude>
+ <exclude>**/TestDelegate*</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>jboss.mc.dependency.resolver</name>
+ <value>STANDARD</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <!-- this execution will run with the indexing dependency resolver
+ the reports from the previous testsuite run will be overriden
+ which is ok, since if the previous execution fails, this execution shouldn't start -->
+ <id>indexing-resolver-tests</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
<configuration>
- <skip>true</skip>
+ <testFailureIgnore>false</testFailureIgnore>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
<excludes>
- <exclude>*</exclude>
- </excludes>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <exclude>**/AbstractDependencyTest*</exclude>
+ <exclude>**/TestControllerContext*</exclude>
+ <exclude>**/TestDelegate*</exclude>
+ <!-- BadDependencyInfoTestCase is tied to how standard resolver works -->
+ <exclude>**/BadDependencyInfoTestCase*</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>jboss.mc.dependency.resolver</name>
+ <value>INDEXING</value>
+ </property>
+ </systemProperties>
</configuration>
- </plugin>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -80,84 +118,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>tests-standard-resolver</id>
- <activation>
- <property>
- <name>!disable-tests-standard-resolver</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- <excludes>
- <exclude>**/AbstractDependencyTest*</exclude>
- <exclude>**/TestControllerContext*</exclude>
- <exclude>**/TestDelegate*</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>jboss.mc.dependency.resolver</name>
- <value>STANDARD</value>
- </property>
- </systemProperties>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/standard-resolver</reportsDirectory>
- <outputName>surefire-report-standard-resolver</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>tests-indexing-resolver</id>
- <activation>
- <property>
- <name>!disable-tests-indexing-resolver</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- <excludes>
- <exclude>**/AbstractDependencyTest*</exclude>
- <exclude>**/TestControllerContext*</exclude>
- <exclude>**/TestDelegate*</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>jboss.mc.dependency.resolver</name>
- <value>INDEXING</value>
- </property>
- </systemProperties>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/indexing-resolver</reportsDirectory>
- <outputName>surefire-report-indexing-resolver</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
Modified: projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/BadDependencyInfoTestCase.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/BadDependencyInfoTestCase.java 2010-02-04 11:13:54 UTC (rev 100407)
+++ projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/BadDependencyInfoTestCase.java 2010-02-04 12:30:56 UTC (rev 100408)
@@ -54,61 +54,61 @@
return suite(BadDependencyInfoTestCase.class);
}
-// public void testDependencyInfoMethods() throws Throwable
-// {
-// Method[] methods = DependencyInfo.class.getDeclaredMethods();
-// for(int i = numberOfInvocations; i >= 0; i--)
-// {
-// for (Method method : methods)
-// {
-// AbstractControllerContext context = new AbstractControllerContext(
-// method.getName(),
-// new MockControllerContextActions(),
-// ProxyDependencyInfo.createDependencyInfo(method, i)
-// );
-// try
-// {
-// install(context);
-// assertTrue(context.getName().toString(), ControllerState.ERROR.equals(context.getState()) || ControllerState.INSTALLED.equals(context.getState()));
-// }
-// catch (Throwable t)
-// {
-// assertEquals("getLifecycleCallbacks", method.getName());
-// assertInstanceOf(t, RuntimeException.class);
-// }
-// try
-// {
-// uninstall(context);
-// }
-// catch (Throwable t)
-// {
-// assertEquals("getLifecycleCallbacks", method.getName());
-// assertInstanceOf(t, Error.class);
-// }
-// }
-// }
-// }
-//
-// public void testDependencyItemMethodsOnMe() throws Throwable
-// {
-// Method[] methods = DependencyItem.class.getDeclaredMethods();
-// for(int i = numberOfInvocations; i >= 0; i--)
-// {
-// for (Method method : methods)
-// {
-// for(ControllerState whenRequired : getStateModel())
-// {
-// ControllerContext context = createControllerContext(method.getName());
-// DependencyInfo info = context.getDependencyInfo();
-// info.addDependsOnMe(ProxyDependencyItem.createDependencyInfo(method, i, whenRequired));
-// install(context);
-// assertTrue(context.getName().toString(), ControllerState.ERROR.equals(context.getState()) || ControllerState.INSTALLED.equals(context.getState()));
-// uninstall(context);
-// }
-// }
-// }
-// }
+ public void testDependencyInfoMethods() throws Throwable
+ {
+ Method[] methods = DependencyInfo.class.getDeclaredMethods();
+ for(int i = numberOfInvocations; i >= 0; i--)
+ {
+ for (Method method : methods)
+ {
+ AbstractControllerContext context = new AbstractControllerContext(
+ method.getName(),
+ new MockControllerContextActions(),
+ ProxyDependencyInfo.createDependencyInfo(method, i)
+ );
+ try
+ {
+ install(context);
+ assertTrue(context.getName().toString(), ControllerState.ERROR.equals(context.getState()) || ControllerState.INSTALLED.equals(context.getState()));
+ }
+ catch (Throwable t)
+ {
+ assertEquals("getLifecycleCallbacks", method.getName());
+ assertInstanceOf(t, RuntimeException.class);
+ }
+ try
+ {
+ uninstall(context);
+ }
+ catch (Throwable t)
+ {
+ assertEquals("getLifecycleCallbacks", method.getName());
+ assertInstanceOf(t, Error.class);
+ }
+ }
+ }
+ }
+ public void testDependencyItemMethodsOnMe() throws Throwable
+ {
+ Method[] methods = DependencyItem.class.getDeclaredMethods();
+ for(int i = numberOfInvocations; i >= 0; i--)
+ {
+ for (Method method : methods)
+ {
+ for(ControllerState whenRequired : getStateModel())
+ {
+ ControllerContext context = createControllerContext(method.getName());
+ DependencyInfo info = context.getDependencyInfo();
+ info.addDependsOnMe(ProxyDependencyItem.createDependencyInfo(method, i, whenRequired));
+ install(context);
+ assertTrue(context.getName().toString(), ControllerState.ERROR.equals(context.getState()) || ControllerState.INSTALLED.equals(context.getState()));
+ uninstall(context);
+ }
+ }
+ }
+ }
+
public void testDependencyItemMethodsOnMeResolved() throws Throwable
{
ControllerContext bean = createControllerContext("bean");
@@ -164,53 +164,53 @@
}
}
-// public void testDependencyItemMethodsOnThem() throws Throwable
-// {
-// Method[] methods = DependencyItem.class.getDeclaredMethods();
-// for(int i = numberOfInvocations; i >= 0; i--)
-// {
-// for (Method method : methods)
-// {
-// for(ControllerState whenRequired : getStateModel())
-// {
-// ControllerContext context = createControllerContext(method.getName());
-// DependencyInfo info = context.getDependencyInfo();
-// info.addIDependOn(ProxyDependencyItem.createDependencyInfo(method, i, whenRequired));
-// install(context);
-// ControllerState previous = getStateModel().getPreviousState(whenRequired);
-// assertTrue(context.getName().toString(), ControllerState.ERROR.equals(context.getState()) || previous == null || previous.equals(context.getState()));
-// uninstall(context);
-// }
-// }
-// }
-// }
-//
-// public void testDependencyItemMethodsOnThemResolved() throws Throwable
-// {
-// ControllerContext bean = createControllerContext("bean");
-// Method[] methods = DependencyItem.class.getDeclaredMethods();
-// for(int i = numberOfInvocations; i >= 0; i--)
-// {
-// for (Method method : methods)
-// {
-// for(ControllerState whenRequired : getStateModel())
-// {
-// ControllerContext context = createControllerContext(method.getName());
-// DependencyInfo info = context.getDependencyInfo();
-// info.addIDependOn(ProxyDependencyItem.createDependencyInfo(method, i, whenRequired));
-// install(context);
-// install(bean);
-// assertEquals(bean.getName().toString(), ControllerState.INSTALLED, bean.getState());
-// assertTrue(context.getName().toString(), ControllerState.ERROR.equals(context.getState()) || ControllerState.INSTALLED.equals(context.getState()));
-// uninstall(bean);
-// ControllerState previous = getStateModel().getPreviousState(whenRequired);
-// if (previous == null)
-// previous = ControllerState.INSTALLED;
-// if (ControllerState.ERROR.equals(context.getState()) == false)
-// assertEquals(previous, context.getState());
-// uninstall(context);
-// }
-// }
-// }
-// }
+ public void testDependencyItemMethodsOnThem() throws Throwable
+ {
+ Method[] methods = DependencyItem.class.getDeclaredMethods();
+ for(int i = numberOfInvocations; i >= 0; i--)
+ {
+ for (Method method : methods)
+ {
+ for(ControllerState whenRequired : getStateModel())
+ {
+ ControllerContext context = createControllerContext(method.getName());
+ DependencyInfo info = context.getDependencyInfo();
+ info.addIDependOn(ProxyDependencyItem.createDependencyInfo(method, i, whenRequired));
+ install(context);
+ ControllerState previous = getStateModel().getPreviousState(whenRequired);
+ assertTrue(context.getName().toString(), ControllerState.ERROR.equals(context.getState()) || previous == null || previous.equals(context.getState()));
+ uninstall(context);
+ }
+ }
+ }
+ }
+
+ public void testDependencyItemMethodsOnThemResolved() throws Throwable
+ {
+ ControllerContext bean = createControllerContext("bean");
+ Method[] methods = DependencyItem.class.getDeclaredMethods();
+ for(int i = numberOfInvocations; i >= 0; i--)
+ {
+ for (Method method : methods)
+ {
+ for(ControllerState whenRequired : getStateModel())
+ {
+ ControllerContext context = createControllerContext(method.getName());
+ DependencyInfo info = context.getDependencyInfo();
+ info.addIDependOn(ProxyDependencyItem.createDependencyInfo(method, i, whenRequired));
+ install(context);
+ install(bean);
+ assertEquals(bean.getName().toString(), ControllerState.INSTALLED, bean.getState());
+ assertTrue(context.getName().toString(), ControllerState.ERROR.equals(context.getState()) || ControllerState.INSTALLED.equals(context.getState()));
+ uninstall(bean);
+ ControllerState previous = getStateModel().getPreviousState(whenRequired);
+ if (previous == null)
+ previous = ControllerState.INSTALLED;
+ if (ControllerState.ERROR.equals(context.getState()) == false)
+ assertEquals(previous, context.getState());
+ uninstall(context);
+ }
+ }
+ }
+ }
}
Modified: projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyTestCase.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyTestCase.java 2010-02-04 11:13:54 UTC (rev 100407)
+++ projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/OnDemandDependencyTestCase.java 2010-02-04 12:30:56 UTC (rev 100408)
@@ -310,9 +310,22 @@
assertEquals(-1, delegate3.configureUninstallOrder);
assertEquals(-1, delegate3.instantiateUninstallOrder);
assertEquals(-1, delegate3.describeUninstallOrder);
- assertDoubleEquals(49, 50, delegate2.createInstallOrder, delegate3.createInstallOrder);
- assertDoubleEquals(51, 52, delegate2.startInstallOrder, delegate3.startInstallOrder);
- assertDoubleEquals(53, 54, delegate2.installInstallOrder, delegate3.installInstallOrder);
+ //Check that delegates 1 and 2 have new create, start and install orders
+
+ int createOrder2 = delegate2.createInstallOrder;
+ int createOrder3 = delegate3.createInstallOrder;
+ int startOrder2 = delegate2.startInstallOrder;
+ int startOrder3 = delegate3.startInstallOrder;
+ int installOrder2 = delegate2.installInstallOrder;
+ int installOrder3 = delegate3.installInstallOrder;
+
+ assertTrue(createOrder2 > 28);
+ assertTrue(startOrder2 > 29);
+ assertTrue(installOrder2 > 30);
+ assertTrue(createOrder3 > 16);
+ assertTrue(startOrder3 > 17);
+ assertTrue(installOrder3 > 18);
+
assertDoubleEquals(31, 34, delegate2.installUninstallOrder, delegate3.installUninstallOrder);
assertDoubleEquals(32, 35, delegate2.startUninstallOrder, delegate3.startUninstallOrder);
assertDoubleEquals(33, 36, delegate2.createUninstallOrder, delegate3.createUninstallOrder);
@@ -321,9 +334,12 @@
assertEquals(13, delegate3.describeInstallOrder);
assertEquals(14, delegate3.instantiateInstallOrder);
assertEquals(15, delegate3.configureInstallOrder);
- assertDoubleEquals(49, 50, delegate2.createInstallOrder, delegate3.createInstallOrder);
- assertDoubleEquals(51, 52, delegate2.startInstallOrder, delegate3.startInstallOrder);
- assertDoubleEquals(53, 54, delegate2.installInstallOrder, delegate3.installInstallOrder);
+ assertEquals(createOrder2, delegate2.createInstallOrder);
+ assertEquals(startOrder2, delegate2.startInstallOrder);
+ assertEquals(installOrder2, delegate2.installInstallOrder);
+ assertEquals(createOrder3, delegate3.createInstallOrder);
+ assertEquals(startOrder3, delegate3.startInstallOrder);
+ assertEquals(installOrder3, delegate3.installInstallOrder);
assertEquals(55, delegate3.installUninstallOrder);
assertEquals(56, delegate3.startUninstallOrder);
assertEquals(57, delegate3.createUninstallOrder);
@@ -334,9 +350,12 @@
assertEquals(25, delegate2.describeInstallOrder);
assertEquals(26, delegate2.instantiateInstallOrder);
assertEquals(27, delegate2.configureInstallOrder);
- assertDoubleEquals(49, 50, delegate2.createInstallOrder, delegate3.createInstallOrder);
- assertDoubleEquals(51, 52, delegate2.startInstallOrder, delegate3.startInstallOrder);
- assertDoubleEquals(53, 54, delegate2.installInstallOrder, delegate3.installInstallOrder);
+ assertEquals(createOrder2, delegate2.createInstallOrder);
+ assertEquals(startOrder2, delegate2.startInstallOrder);
+ assertEquals(installOrder2, delegate2.installInstallOrder);
+ assertEquals(createOrder3, delegate3.createInstallOrder);
+ assertEquals(startOrder3, delegate3.startInstallOrder);
+ assertEquals(installOrder3, delegate3.installInstallOrder);
assertEquals(61, delegate2.installUninstallOrder);
assertEquals(62, delegate2.startUninstallOrder);
assertEquals(63, delegate2.createUninstallOrder);
More information about the jboss-cvs-commits
mailing list