[Spacewalk-devel] [PATCH] com.redhat.rhn.common.db.datasource tests: get database username from configuration file

[Silvio Moioli]

Hi,
        it seems that some test cases in the
com.redhat.rhn.common.db.datasource.test package have hardcoded database
user names, which does not really work with our setup.

I propose the attached patch to simply get the database name from
rhn.conf. I am not really sure I understand why the original test was
coded that way - maybe there is a reason but at the moment I do not see it.

Regards,
-- 
Silvio Moioli
SUSE LINUX Products GmbH
Maxfeldstraße 5, 90409 Nürnberg Germany

>From fe99b2dfbc388409ce251e5f4fa54b3f21388ac8 Mon Sep 17 00:00:00 2001
From: Silvio Moioli <smoi...@suse.de>
Date: Thu, 29 Aug 2013 10:09:44 +0200
Subject: [PATCH] common.db.datasource tests: get database username from
 configuration file

---
 .../com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java   | 4 ++--
 .../src/com/redhat/rhn/common/db/datasource/test/DataListTest.java    | 4 ++--
 .../redhat/rhn/common/db/datasource/test/DataSourceParserTest.java    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
index 1a04cf7..749819e 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
@@ -15,6 +15,7 @@
 package com.redhat.rhn.common.db.datasource.test;
 
 import com.redhat.rhn.common.ObjectCreateWrapperException;
+import com.redhat.rhn.common.conf.Config;
 import com.redhat.rhn.common.conf.ConfigDefaults;
 import com.redhat.rhn.common.db.datasource.CallableMode;
 import com.redhat.rhn.common.db.datasource.DataResult;
@@ -60,12 +61,11 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
         super(name);
         if (ConfigDefaults.get().isOracle()) {
             db_sufix = "_or";
-            db_user = "SPACEUSER";
         }
         else {
             db_sufix = "_pg";
-            db_user = "spaceuser";
         }
+        db_user = Config.get().getString(ConfigDefaults.DB_USER);
     }
 
     private void lookup(String foobar, int id, int size) {
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/DataListTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/DataListTest.java
index 4a135e6..c371b08 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/test/DataListTest.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/DataListTest.java
@@ -19,6 +19,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.redhat.rhn.common.conf.Config;
 import com.redhat.rhn.common.conf.ConfigDefaults;
 import com.redhat.rhn.common.db.datasource.DataList;
 import com.redhat.rhn.common.db.datasource.DataResult;
@@ -37,12 +38,11 @@ public class DataListTest extends RhnBaseTestCase {
     public void setUp() {
         if (ConfigDefaults.get().isOracle()) {
             db_sufix = "_or";
-            db_user = "SPACEUSER";
         }
         else {
             db_sufix = "_pg";
-            db_user = "spaceuser";
         }
+        db_user = Config.get().getString(ConfigDefaults.DB_USER);
 
         hsm = new HookedSelectMode(
                 ModeFactory.getMode("test_queries", "user_tables" + db_sufix));
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java
index 7df0890..c5814ec 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java
@@ -14,6 +14,7 @@
  */
 package com.redhat.rhn.common.db.datasource.test;
 
+import com.redhat.rhn.common.conf.Config;
 import com.redhat.rhn.common.conf.ConfigDefaults;
 import com.redhat.rhn.common.db.datasource.CachedStatement;
 import com.redhat.rhn.common.db.datasource.DataResult;
@@ -46,12 +47,11 @@ public class DataSourceParserTest extends RhnBaseTestCase {
     public DataSourceParserTest() {
         if (ConfigDefaults.get().isOracle()) {
             db_sufix = "_or";
-            db_user = "SPACEUSER";
         }
         else {
             db_sufix = "_pg";
-            db_user = "spaceuser";
         }
+        db_user = Config.get().getString(ConfigDefaults.DB_USER);
     }
 
     public void testGetModes() throws Exception {
-- 
1.8.1.4


_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel