java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java | 24
+++++++---
java/code/src/com/redhat/rhn/common/db/datasource/test/DataListTest.java | 16
+++++-
java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java | 2
3 files changed, 32 insertions(+), 10 deletions(-)
New commits:
commit 9f7e391ca9ac3fc92eca41a82aec874e43edd6e9
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Mon Jun 3 16:51:13 2013 +0200
junit fixes
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 6cc2cae..893a974 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
@@ -53,9 +53,19 @@ import junit.framework.TestSuite;
public class AdvDataSourceTest extends RhnBaseTestCase {
private static Logger log = Logger.getLogger(AdvDataSourceTest.class);
- private Random random = new Random();
+ private final Random random = new Random();
+ private String db_sufix;
+ private String db_user;
public AdvDataSourceTest(String name) {
super(name);
+ if (ConfigDefaults.get().isOracle()) {
+ db_sufix = "_or";
+ db_user = "SPACEUSER";
+ }
+ else {
+ db_sufix = "_pg";
+ db_user = "spaceuser";
+ }
}
private void lookup(String foobar, int id, int size) {
@@ -97,7 +107,7 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
public void testMaxRows() {
if (ConfigDefaults.get().isOracle()) {
- SelectMode m = ModeFactory.getMode("test_queries",
"withClass");
+ SelectMode m = ModeFactory.getMode("test_queries",
"withClass" + db_sufix);
try {
m.setMaxRows(-10);
fail("setMaxRows should NOT allow negative numbers.");
@@ -118,7 +128,7 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
*/
public void testModes() {
if (ConfigDefaults.get().isOracle()) {
- SelectMode m = ModeFactory.getMode("test_queries",
"withClass");
+ SelectMode m = ModeFactory.getMode("test_queries",
"withClass" + db_sufix);
Map params = null;
DataResult dr = m.execute(params);
assertNotNull(dr);
@@ -130,7 +140,7 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
assertTrue(!obj.getClass().getName().equals("java.util.Map"));
//Try over-riding and getting a Map back
- SelectMode m2 = ModeFactory.getMode("test_queries",
"withClass", Map.class);
+ SelectMode m2 = ModeFactory.getMode("test_queries",
"withClass" + db_sufix, Map.class);
dr = m2.execute(params);
assertNotNull(dr);
assertTrue(dr.size() > 1);
@@ -139,7 +149,7 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
assertEquals("java.util.HashMap", obj.getClass().getName());
//Try over-riding with something incompatible
- SelectMode m3 = ModeFactory.getMode("test_queries",
"withClass", Set.class);
+ SelectMode m3 = ModeFactory.getMode("test_queries",
"withClass" + db_sufix, Set.class);
try {
dr = m3.execute(params);
fail();
@@ -149,12 +159,12 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
}
//Make sure our selectMode object was a copy and not the one cached
- SelectMode m2a = ModeFactory.getMode("test_queries",
"withClass");
+ SelectMode m2a = ModeFactory.getMode("test_queries",
"withClass" + db_sufix);
assertFalse(m2a.getClassString().equals("java.util.Set"));
assertFalse(m2a.getClassString().equals("java.util.Map"));
//finally, make sure that by default our DataResult objects contain Maps
- SelectMode m4 = ModeFactory.getMode("test_queries",
"all_tables");
+ SelectMode m4 = ModeFactory.getMode("test_queries",
"all_tables" + db_sufix);
dr = m4.execute(params);
assertNotNull(dr);
assertTrue(dr.size() > 1);
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 c19b275..bd0e610 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.ConfigDefaults;
import com.redhat.rhn.common.db.datasource.DataList;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.db.datasource.ModeFactory;
@@ -30,13 +31,24 @@ public class DataListTest extends RhnBaseTestCase {
private HookedSelectMode hsm;
private Map params;
private Map elabParams;
+ private String db_sufix;
+ private String db_user;
public void setUp() {
+ if (ConfigDefaults.get().isOracle()) {
+ db_sufix = "_or";
+ db_user = "SPACEUSER";
+ }
+ else {
+ db_sufix = "_pg";
+ db_user = "spaceuser";
+ }
+
hsm = new HookedSelectMode(
- ModeFactory.getMode("test_queries", "user_tables"));
+ ModeFactory.getMode("test_queries", "user_tables" +
db_sufix));
params = new HashMap();
elabParams = new HashMap();
- elabParams.put("user_name", "RHN");
+ elabParams.put("user_name", db_user);
}
public void tearDown() {
diff --git
a/java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java
b/java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java
index 9f761bf..a615fbd 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java
@@ -196,7 +196,7 @@ public class TestFactoryWrapperTest extends RhnBaseTestCase {
" created timestamp with local time zone" +
")");
stmt.execute("insert into persist_test (foobar, id) " +
- "values ('Blarg', persist_sequence.nextval");
+ "values ('Blarg', persist_sequence.nextval)");
stmt.execute("insert into persist_test (foobar, id) " +
"values ('duplicate',
persist_sequence.nextval)");
stmt.execute("insert into persist_test (foobar, id) " +