modules/enterprise/gui/installer-war/pom.xml | 9 ++++----- modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java | 5 +++-- 2 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 842ad5f20b752884d19e55d8f87e0e7252f78154 Author: Lukas Krejci lkrejci@redhat.com Date: Wed Jan 25 13:23:25 2012 +0100
Updating the installer test to: 1) Not execute on Oracle 2) Support port specification (in case connection url is missing) 3) Pass the rhq.db.installation.test.db-name to the TestNG test
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index bd1474a..c1dd476 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -145,14 +145,13 @@ <systemPropertyVariables> <rhq.test.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.test.ds.type-mapping> <rhq.test.ds.server-name>${rhq.test.ds.server-name}</rhq.test.ds.server-name> - <rhq.test.ds.db-name>${rhq.test.ds.db-name}</rhq.test.ds.db-name> + <rhq.test.ds.port>${rhq.test.ds.port}</rhq.test.ds.port> + <rhq.db.installation.test.db-name>${rhq.db.installation.test.db-name}</rhq.db.installation.test.db-name> <rhq.test.ds.connection-url>${rhq.test.ds.connection-url}</rhq.test.ds.connection-url> <rhq.db.admin.username>${rhq.db.admin.username}</rhq.db.admin.username> <rhq.db.admin.password>${rhq.db.admin.password}</rhq.db.admin.password> <rhq.test.ds.user-name>${rhq.test.ds.user-name}</rhq.test.ds.user-name> <rhq.test.ds.password>${rhq.test.ds.password}</rhq.test.ds.password> - <rhq.db.installation.test.db-name>${rhq.db.installation.test.db-name}</rhq.db.installation.test.db-name> - <rhq.db.installation.test.connection-url>jdbc:postgresql://${rhq.test.ds.server-name}:5432/${rhq.db.installation.test.db-name}</rhq.db.installation.test.connection-url> </systemPropertyVariables> </configuration> </plugin> @@ -341,8 +340,8 @@ <id>oracle</id> <activation> <property> - <name>rhq.test.db.type</name> - <value>oracle</value> + <name>rhq.test.ds.type-mapping</name> + <value>Oracle10g</value> </property> </activation> <build> diff --git a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java index 3bff054..81c5664 100644 --- a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java +++ b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java @@ -47,8 +47,9 @@ public class DBInstallationTest { private final String USERNAME = System.getProperty("rhq.test.ds.user-name", "rhqadmin"); private final String PASSWORD = System.getProperty("rhq.test.ds.password", "rhqadmin"); private final String SERVER = System.getProperty("rhq.test.ds.server-name", "127.0.0.1"); - private final String DB_URL = System.getProperty("rhq.db.installation.test.connection-url", - "jdbc:postgresql://" + SERVER + ":5432/" + DB_NAME); + private final String PORT = System.getProperty("rhq.test.ds.port", "5432"); + private final String DB_URL = System.getProperty("rhq.test.ds.connection-url", "jdbc:postgresql://" + SERVER + + ":" + PORT + "/" + DB_NAME); private final String ADMIN_USERNAME = System.getProperty("rhq.db.admin.username", "postgres"); private final String ADMIN_PASSWORD = System.getProperty("rhq.db.admin.password", "postgres"); private static final String DB_TYPE_MAPPING = System.getProperty("rhq.test.ds.type-mapping", "PostgreSQL");
rhq-commits@lists.fedorahosted.org