Permalink
Browse files

Set up all the transformers tests to use the cached classloader from …

…the checkouts target/model-test-classpath-cache folder
  • Loading branch information...
1 parent 747b568 commit ab48d70583e18d2636ae3719e7c5fd351d216cde @kabir kabir committed Mar 6, 2013
View
@@ -47,6 +47,10 @@
<includes>
<include>org/jboss/as/ejb3/**/*TestCase.java</include>
</includes>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
@@ -135,8 +135,10 @@
<argLine>-javaagent:${org.jboss.byteman:byteman:jar}=port:9091,boot:${org.jboss.byteman:byteman:jar}</argLine>
<systemPropertyVariables>
<org.jboss.byteman.contrib.bmunit.agent.inhibit>true</org.jboss.byteman.contrib.bmunit.agent.inhibit>
- <org.jboss.byteman.contrib.bmunit.agent.port>9091</org.jboss.byteman.contrib.bmunit.agent.port>
- </systemPropertyVariables>
+ <org.jboss.byteman.contrib.bmunit.agent.port>9091</org.jboss.byteman.contrib.bmunit.agent.port>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
@@ -107,6 +107,8 @@
<systemPropertyVariables>
<org.jboss.byteman.contrib.bmunit.agent.inhibit>true</org.jboss.byteman.contrib.bmunit.agent.inhibit>
<org.jboss.byteman.contrib.bmunit.agent.port>9091</org.jboss.byteman.contrib.bmunit.agent.port>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
</systemPropertyVariables>
</configuration>
</plugin>
View
@@ -94,6 +94,10 @@
<includes>
<include>org/jboss/as/cmp/**/*TestCase.java</include>
</includes>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
View
@@ -38,6 +38,23 @@
<name>JBoss Application Server: Config Admin</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <enableAssertions>true</enableAssertions>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
View
@@ -43,6 +43,10 @@
<include>**/*TestCase.java</include>
</includes>
<enableAssertions>false</enableAssertions>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
@@ -53,7 +53,7 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<enableAssertions>true</enableAssertions>
<systemPropertyVariables>
- <org.jboss.model.test.root>${org.jboss.model.test.root}</org.jboss.model.test.root>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
<org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
</systemPropertyVariables>
</configuration>
View
@@ -38,6 +38,23 @@
<name>JBoss Application Server: EE</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <enableAssertions>true</enableAssertions>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>javax.validation</groupId>
View
@@ -47,6 +47,10 @@ vi:ts=4:sw=4:expandtab
<includes>
<include>org/jboss/as/ejb3/**/*TestCase.java</include>
</includes>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
View
@@ -76,10 +76,21 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <enableAssertions>true</enableAssertions>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
<dependencies>
<dependency>
<groupId>org.jacorb</groupId>
View
@@ -45,6 +45,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<enableAssertions>true</enableAssertions>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
View
@@ -35,6 +35,23 @@
<artifactId>jboss-as-jdr</artifactId>
<name>JBoss Application Server: JDR</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <enableAssertions>true</enableAssertions>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>commons-cli</groupId>
View
@@ -49,6 +49,10 @@
<include>**/*TestCase.java</include>
</includes>
<enableAssertions>false</enableAssertions>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
View
@@ -39,6 +39,23 @@
<name>JBoss Application Server: JPA Subsystem</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <enableAssertions>true</enableAssertions>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<!-- Internal -->
@@ -101,6 +101,7 @@ private void testTransformers_1_1_0_RejectExpressions(ModelTestControllerVersion
builder.createLegacyKernelServicesBuilder(null, controllerVersion, oldVersion)
.setExtensionClassName(JPAExtension.class.getName())
+ .addMavenResourceURL("org.jboss.as:jboss-as-jpa-spi:" + controllerVersion.getMavenGavVersion())
.addMavenResourceURL("org.jboss.as:jboss-as-jpa:" + controllerVersion.getMavenGavVersion());
KernelServices mainServices = builder.build();
View
@@ -100,7 +100,10 @@
<configuration>
<systemPropertyVariables>
<module.path>${basedir}${file.separator}src${file.separator}test${file.separator}resources${file.separator}modules${path.separator}${basedir}${file.separator}src${file.separator}test${file.separator}resources${file.separator}modules2</module.path>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
</systemPropertyVariables>
+
</configuration>
</plugin>
</plugins>
View
@@ -48,6 +48,10 @@
<include>**/*TestCase.java</include>
</includes>
<enableAssertions>false</enableAssertions>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
View
@@ -65,7 +65,9 @@
<jboss.server.config.dir>${project.build.directory}${file.separator}config</jboss.server.config.dir>
<org.jboss.byteman.contrib.bmunit.agent.inhibit>true</org.jboss.byteman.contrib.bmunit.agent.inhibit>
<org.jboss.byteman.contrib.bmunit.agent.port>9091</org.jboss.byteman.contrib.bmunit.agent.port>
- </systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
View
@@ -37,6 +37,23 @@
<packaging>jar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <enableAssertions>true</enableAssertions>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
View
@@ -45,6 +45,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
View
@@ -46,6 +46,10 @@
<include>**/*TestCase.java</include>
</includes>
<enableAssertions>false</enableAssertions>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
@@ -47,7 +47,7 @@
//Use this property on the lightning runs to make sure that people have set the root and cache properties
private static final String STRICT_PROPERTY = "org.jboss.model.test.cache.strict";
- private static final String ROOT_PROPERTY = "org.jboss.model.test.root";
+ private static final String ROOT_PROPERTY = "org.jboss.model.test.cache.root";
private static final String CACHE_FOLDER_PROPERTY = "org.jboss.model.test.classpath.cache";
View
@@ -38,6 +38,23 @@
<name>JBoss Application Server: Naming Subsystem</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <enableAssertions>true</enableAssertions>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
View
@@ -140,6 +140,10 @@
<value>org.jboss.logmanager.LogManager</value>
</property>
</systemProperties>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
View
@@ -38,6 +38,23 @@
<name>JBoss Application Server: POJO Subsystem</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <enableAssertions>true</enableAssertions>
+ <systemPropertyVariables>
+ <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+ <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.jboss</groupId>
View
@@ -283,10 +283,15 @@
<!-- tools.jar location, this needs to be overriden on OSX -->
<com.sun.tools.path>${java.home}/../lib/tools.jar</com.sun.tools.path>
+ <!--
+ See ChildFirstClassLoaderBuilder in model-test for the explanation of the org.jboss.model.test.cache.root and org.jboss.model.test.classpath.cache properties.
+ If used in conjunction with org.jboss.model.test.classpath.cache -Dorg.jboss.model.test.cache.strict on the command line, transformers tests must
+ propagate these to the test when run
+ -->
<!-- The name of the root checkout folder to create org.jboss.model.test.classpath.cache under for subsystem-test and core-model-test -->
- <org.jboss.model.test.root>jboss-as</org.jboss.model.test.root>
+ <org.jboss.model.test.cache.root>jboss-as</org.jboss.model.test.cache.root>
<!-- Location relative to root that will be used for the cached legacy classpaths used by subsystem-test and core-model-test-->
- <org.jboss.model.test.classpath.cache>target/classpath</org.jboss.model.test.classpath.cache>
+ <org.jboss.model.test.classpath.cache>target/model-test-classpath-cache</org.jboss.model.test.classpath.cache>
</properties>
<modules>
Oops, something went wrong.

0 comments on commit ab48d70

Please sign in to comment.