MONDRIAN: make test Connect Strings consistent

[git-p4: depot-paths = "//open/mondrian/": change = 4478]
pentaho · Nov 23, 2005 · 763df58 · 763df58
1 parent b915f6e
commit 763df58
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/testsrc/main/mondrian/test/TestContext.java b/testsrc/main/mondrian/test/TestContext.java
@@ -97,7 +97,7 @@ protected TestContext() {
      *     <code>demo/FoodMart.xml</code></li>.
      * </ul>
      */
-    private static String getConnectString() {
+    public static String getConnectString() {
         String connectString = MondrianProperties.instance().TestConnectString.get();
         final Util.PropertyList connectProperties;
         if (connectString == null || connectString.equals("")) {
@@ -110,6 +110,15 @@ private static String getConnectString() {
         if (jdbcURL != null) {
             connectProperties.put("Jdbc", jdbcURL);
         }
+        String jdbcUser = MondrianProperties.instance().TestJdbcUser.get();
+        if (jdbcUser != null) {
+            connectProperties.put("JdbcUser", jdbcUser);
+        }
+        String jdbcPassword = MondrianProperties.instance().TestJdbcPassword.get();
+        if (jdbcPassword != null) {
+            connectProperties.put("JdbcPassword", jdbcPassword);
+        }
+
         // Find the catalog. Use the URL specified in the connect string, if
         // it is specified and is valid. Otherwise, reference FoodMart.xml
         // assuming we are at the root of the source tree.

diff --git a/testsrc/main/mondrian/xmla/XmlaTest.java b/testsrc/main/mondrian/xmla/XmlaTest.java
@@ -51,7 +51,7 @@ public XmlaTest(String s) {
     protected void setUp() throws Exception {
         super.setUp();
         // Deal with embedded & that can be in the JDBC URL
-        String connectString = MondrianProperties.instance().TestConnectString.get();
+        String connectString = TestContext.getConnectString();
         dataSource = "MondrianFoodMart";
         catalogName = DriverManager.getConnection(connectString, null, false).getSchema().getName();