modules/enterprise/server/itests-2/pom.xml | 254 +++++++--- modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 18 modules/enterprise/server/itests-2/src/test/resources/jbossas-oracle-ds.xml | 36 - modules/enterprise/server/itests-2/src/test/resources/jbossas-postgres-ds.xml | 40 - 4 files changed, 188 insertions(+), 160 deletions(-)
New commits: commit f3e251a2cf7921cf4b920d38cd1532efaac1ff80 Author: Jay Shaughnessy jshaughn@jshaughn.csb Date: Fri Nov 16 16:03:04 2012 -0500
Allow the tests to run against postgres or oracle. For oracle you need -Poracle.
diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index 1773fee..292dd5e 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -210,7 +210,7 @@ <executions>
<execution> - <id>prepare AS container</id> + <id>prepare Standalone XML</id> <phase>process-test-resources</phase> <configuration> <target> @@ -384,12 +384,96 @@ </replacefilter>
<replacefilter> + <replacetoken></drivers></replacetoken> + <replacevalue><![CDATA[ + <!-- FOR RHQ TESTING --> + <driver name="postgres" module="org.rhq.postgres"> + <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class> + </driver> + <driver name="oracle" module="org.rhq.oracle"> + <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class> + </driver> + </drivers>]]></replacevalue> + </replacefilter> + + <replacefilter> + <replacetoken></cache-container></replacetoken> + <replacevalue><![CDATA[ + </cache-container> + <!-- FOR RHQ TESTING --> + <cache-container name="rhq" jndi-name="java:jboss/infinispan/rhq"> + <local-cache name="rhqCache"> + <transaction mode="NONE"/> + <eviction strategy="LRU" max-entries="50000"/> + <expiration max-idle="100000"/> + </local-cache> + </cache-container>]]></replacevalue> + </replacefilter> + + </replace> + + <property + name="jboss.modules.dir" + location="${jboss.unzip.location}/modules" /> + <echo>Adding JDBC modules to ${jboss.modules.dir} ...</echo> + <copy + file="${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar" + toDir="${jboss.modules.dir}/org/rhq/oracle/main" + failonerror="false" + verbose="true" /> + <echo file="${jboss.modules.dir}/org/rhq/oracle/main/module.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> +<module xmlns="urn:jboss:module:1.1" name="org.rhq.oracle"> + <resources> + <resource-root path="ojdbc6-${ojdbc6.version}.jar"/> + </resources> + <dependencies> + <module name="javax.api"/> + <module name="javax.transaction.api"/> + </dependencies> +</module> +]]></echo> + <copy + file="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar" + toDir="${jboss.modules.dir}/org/rhq/postgres/main" + verbose="true" /> + <echo file="${jboss.modules.dir}/org/rhq/postgres/main/module.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> +<module xmlns="urn:jboss:module:1.1" name="org.rhq.postgres"> + <resources> + <resource-root path="postgresql-${postgresql.version}.jar"/> + </resources> + <dependencies> + <module name="javax.api"/> + <module name="javax.transaction.api"/> + </dependencies> +</module> +]]></echo> + + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>prepare Postgres datasource</id> + <phase>process-test-resources</phase> + <configuration> + <skip>${skip.postgres}</skip> + <target> + <property + name="jboss.conf" + location="${jboss.unzip.location}/standalone/configuration/standalone.xml" /> + <echo>Will now add test configuration datasource to JBossAS config file: ${jboss.conf}</echo> + <replace file="${jboss.conf}"> + + <replacefilter> <replacetoken></datasource></replacetoken> <replacevalue><![CDATA[ </datasource> <!-- FOR RHQ TESTING --> <datasource jta="false" jndi-name="java:jboss/datasources/NoTxRHQDS" pool-name="NoTxRHQDS" enabled="true" use-java-context="true"> - <connection-url>${rhq.server.database.connection-url:jdbc:postgresql://127.0.0.1:5432/rhq}</connection-url> + <connection-url>${rhq.test.ds.connection-url:jdbc:postgresql://127.0.0.1:5432/rhq}</connection-url> <connection-property name="char.encoding"> UTF-8 </connection-property> @@ -416,13 +500,13 @@ </datasource> <xa-datasource jta="true" jndi-name="java:jboss/datasources/RHQDS" pool-name="RHQDS" enabled="true" use-java-context="true"> <xa-datasource-property name="DatabaseName"> - ${rhq.server.database.db-name:rhq} + ${rhq.test.ds.db-name:rhq} </xa-datasource-property> <xa-datasource-property name="PortNumber"> - ${rhq.server.database.port:5432} + ${rhq.test.ds.port:5432} </xa-datasource-property> <xa-datasource-property name="ServerName"> - ${rhq.server.database.server-name:127.0.0.1} + ${rhq.test.ds.server-name:127.0.0.1} </xa-datasource-property> <driver>postgres</driver> <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> @@ -447,71 +531,88 @@ </xa-datasource>]]></replacevalue> </replacefilter>
- <replacefilter> - <replacetoken></drivers></replacetoken> - <replacevalue><![CDATA[ - <!-- FOR RHQ TESTING --> - <driver name="postgres" module="org.rhq.postgres"> - <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class> - </driver> - <driver name="oracle" module="org.rhq.oracle"> - <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class> - </driver> - </drivers>]]></replacevalue> - </replacefilter> + </replace> + + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>prepare Oracle datasource</id> + <phase>process-test-resources</phase> + <configuration> + <skip>${skip.oracle}</skip> + <target> + <property + name="jboss.conf" + location="${jboss.unzip.location}/standalone/configuration/standalone.xml" /> + <echo>Will now add test configuration datasource to JBossAS config file: ${jboss.conf}</echo> + <replace file="${jboss.conf}">
<replacefilter> - <replacetoken></cache-container></replacetoken> + <replacetoken></datasource></replacetoken> <replacevalue><![CDATA[ - </cache-container> - <!-- FOR RHQ TESTING --> - <cache-container name="rhq" jndi-name="java:jboss/infinispan/rhq"> - <local-cache name="rhqCache"> - <transaction mode="NONE"/> - <eviction strategy="LRU" max-entries="50000"/> - <expiration max-idle="100000"/> - </local-cache> - </cache-container>]]></replacevalue> + </datasource> + <!-- FOR RHQ TESTING --> + <datasource jta="false" jndi-name="java:jboss/datasources/NoTxRHQDS" pool-name="NoTxRHQDS" enabled="true" use-java-context="true"> + <connection-url>${rhq.test.ds.connection-url:jdbc:oracle:thin:@127.0.0.1:1521:XE}</connection-url> + <connection-property name="char.encoding"> + UTF-8 + </connection-property> + <driver>oracle</driver> + <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> + <pool> + <min-pool-size>2</min-pool-size> + <max-pool-size>5</max-pool-size> + </pool> + <security> + <security-domain>RHQDSSecurityDomain</security-domain> + </security> + <validation> + <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleValidConnectionChecker" /> + <stale-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleStaleConnectionChecker" /> + <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter" /> + </validation> + <timeout> + <blocking-timeout-millis>30000</blocking-timeout-millis> + <idle-timeout-minutes>15</idle-timeout-minutes> + </timeout> + <statement> + <prepared-statement-cache-size>75</prepared-statement-cache-size> + </statement> + </datasource> + <xa-datasource jta="true" jndi-name="java:jboss/datasources/RHQDS" pool-name="RHQDS" enabled="true" use-java-context="true"> + <xa-datasource-property name="URL">${rhq.test.ds.connection-url:jdbc:oracle:thin:@127.0.0.1:1521:XE}</xa-datasource-property> + <xa-datasource-property name="ConnectionProperties">SetBigStringTryClob=true</xa-datasource-property> + <driver>oracle</driver> + <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> + <xa-pool> + <min-pool-size>5</min-pool-size> + <max-pool-size>50</max-pool-size> + </xa-pool> + <security> + <security-domain>RHQDSSecurityDomain</security-domain> + </security> + <validation> + <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleValidConnectionChecker" /> + <stale-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleStaleConnectionChecker" /> + <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter" /> + </validation> + <timeout> + <blocking-timeout-millis>30000</blocking-timeout-millis> + <idle-timeout-minutes>15</idle-timeout-minutes> + </timeout> + <statement> + <prepared-statement-cache-size>75</prepared-statement-cache-size> + </statement> + </xa-datasource>]]></replacevalue> </replacefilter>
</replace>
- <property - name="jboss.modules.dir" - location="${jboss.unzip.location}/modules" /> - <echo>Adding JDBC modules to ${jboss.modules.dir} ...</echo> - <copy - file="${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar" - toDir="${jboss.modules.dir}/org/rhq/oracle/main" - failonerror="false" - verbose="true" /> - <echo file="${jboss.modules.dir}/org/rhq/oracle/main/module.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> -<module xmlns="urn:jboss:module:1.1" name="org.rhq.oracle"> - <resources> - <resource-root path="ojdbc6-${ojdbc6.version}.jar"/> - </resources> - <dependencies> - <module name="javax.api"/> - <module name="javax.transaction.api"/> - </dependencies> -</module> -]]></echo> - <copy - file="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar" - toDir="${jboss.modules.dir}/org/rhq/postgres/main" - verbose="true" /> - <echo file="${jboss.modules.dir}/org/rhq/postgres/main/module.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> -<module xmlns="urn:jboss:module:1.1" name="org.rhq.postgres"> - <resources> - <resource-root path="postgresql-${postgresql.version}.jar"/> - </resources> - <dependencies> - <module name="javax.api"/> - <module name="javax.transaction.api"/> - </dependencies> -</module> -]]></echo> - </target> </configuration> <goals> @@ -564,10 +665,10 @@ <exclude>**/LdapGroupManagerBeanTest.java</exclude> <exclude>**/SynchronizationManagerBeanTest.java</exclude> <exclude>org/rhq/**/performance/**/*.java</exclude> - - <!-- exclude the db tests which are not expected to run in this suite --> + + <!-- exclude the db tests which are not expected to run in this suite --> <exclude>org/rhq/enterprise/server/db/**</exclude> - <!-- exclude any unexpected packages --> + <!-- exclude any unexpected packages --> <exclude>com/**/*.java</exclude> </excludes> </configuration> @@ -577,4 +678,25 @@ </plugin> </plugins> </build> + + <profiles> + <profile> + <id>postgres</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <skip.postgres>false</skip.postgres> + <skip.oracle>true</skip.oracle> + </properties> + </profile> + + <profile> + <id>oracle</id> + <properties> + <skip.postgres>true</skip.postgres> + <skip.oracle>false</skip.oracle> + </properties> + </profile> + </profiles> </project> diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java index 92f6abc..795d601 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java @@ -95,24 +95,6 @@ public abstract class AbstractEJB3Test extends Arquillian { @Deployment protected static EnterpriseArchive getBaseDeployment() {
- //TODO: Get to work with Oracle or Postgres, currently the standalone.xml is canned and - // using Postgres only. This is likely to be done in pom.xml as opposed to here, so commenting - // out. - // // depending on the db in use, set up the necessary datasource - // String dialect = System.getProperty("hibernate.dialect"); - // if (dialect == null) { - // System.out.println("!!! hibernate.dialect is not set! Assuming you want to test on postgres"); - // dialect = "postgres"; - // } - // - // @SuppressWarnings("unused") - // String dataSourceXml; - // if (dialect.toLowerCase().contains("postgres")) { - // dataSourceXml = "jbossas-postgres-ds.xml"; - // } else { - // dataSourceXml = "jbossas-oracle-ds.xml"; - // } - // deploy the test classes in their own jar, under /lib JavaArchive testClassesJar = ShrinkWrap.create(JavaArchive.class, "test-classes.jar"); testClassesJar = addClasses(testClassesJar, new File("target/test-classes/org"), null); diff --git a/modules/enterprise/server/itests-2/src/test/resources/jbossas-oracle-ds.xml b/modules/enterprise/server/itests-2/src/test/resources/jbossas-oracle-ds.xml deleted file mode 100644 index 8906dca..0000000 --- a/modules/enterprise/server/itests-2/src/test/resources/jbossas-oracle-ds.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<datasources xmlns="http://www.jboss.org/ironjacamar/schema" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/ironjacamar/schema http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd%22%3E - - <xa-datasource jndi-name="java:jboss/datasources/RHQDS" pool-name="RHQDS" enabled="true" use-java-context="true"> - - <xa-datasource-property name="URL">${rhq.test.ds.connection-url}</xa-datasource-property> - <xa-datasource-property name="ConnectionProperties">SetBigStringTryClob=true</xa-datasource-property> - <driver>oracle</driver> - <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> - <xa-pool> - <min-pool-size>5</min-pool-size> - <max-pool-size>50</max-pool-size> - <is-same-rm-override>false</is-same-rm-override> - <no-tx-separate-pools /> - </xa-pool> - <security> - <security-domain>RHQDSSecurityDomain</security-domain> - </security> - <validation> - <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleValidConnectionChecker" /> - <stale-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleStaleConnectionChecker" /> - <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter" /> - </validation> - <timeout> - <blocking-timeout-millis>30000</blocking-timeout-millis> - <idle-timeout-minutes>15</idle-timeout-minutes> - </timeout> - <statement> - <prepared-statement-cache-size>75</prepared-statement-cache-size> - </statement> - </xa-datasource> - -</datasources> \ No newline at end of file diff --git a/modules/enterprise/server/itests-2/src/test/resources/jbossas-postgres-ds.xml b/modules/enterprise/server/itests-2/src/test/resources/jbossas-postgres-ds.xml deleted file mode 100644 index 23db62c..0000000 --- a/modules/enterprise/server/itests-2/src/test/resources/jbossas-postgres-ds.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<datasources - xmlns="http://www.jboss.org/ironjacamar/schema" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" - http://www.jboss.org/ironjacamar/schema - http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd%22%3E - - <xa-datasource - jndi-name="java:jboss/datasources/RHQDS" - pool-name="RHQDS" - enabled="true" - use-java-context="true"> - - <xa-datasource-property name="DatabaseName">${rhq.test.ds.db-name}</xa-datasource-property> - <xa-datasource-property name="PortNumber">${rhq.test.ds.port}</xa-datasource-property> - <xa-datasource-property name="ServerName">${rhq.test.ds.server-name}</xa-datasource-property> - <driver>postgres</driver> - <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> - <xa-pool> - <min-pool-size>5</min-pool-size> - <max-pool-size>50</max-pool-size> - </xa-pool> - <security> - <security-domain>RHQDSSecurityDomain</security-domain> - </security> - <validation> - <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker" /> - <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter" /> - </validation> - <timeout> - <blocking-timeout-millis>30000</blocking-timeout-millis> - <idle-timeout-minutes>15</idle-timeout-minutes> - </timeout> - <statement> - <prepared-statement-cache-size>75</prepared-statement-cache-size> - </statement> - </xa-datasource> - -</datasources> \ No newline at end of file
rhq-commits@lists.fedorahosted.org