You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ar...@apache.org on 2003/01/12 15:33:03 UTC
cvs commit: jakarta-ojb/src/test/org/apache/ojb/broker TestHelper.java
arminw 2003/01/12 06:33:03
Modified: src/test/org/apache/ojb/broker TestHelper.java
Log:
no longer use hard-coded default-constants
for jcdAlias,user,password,databaseName
Revision Changes Path
1.3 +25 -6 jakarta-ojb/src/test/org/apache/ojb/broker/TestHelper.java
Index: TestHelper.java
===================================================================
RCS file: /home/cvs/jakarta-ojb/src/test/org/apache/ojb/broker/TestHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestHelper.java 9 Jan 2003 17:21:14 -0000 1.2
+++ TestHelper.java 12 Jan 2003 14:33:03 -0000 1.3
@@ -8,12 +8,17 @@
*/
public class TestHelper
{
- public static final String DEF_JCD_ALIAS = "default";
- public static final String DEF_DATABASE_NAME = "default#sa";
-
public static final String DEF_REPOSITORY = "repository.xml";
- public static final String DEF_USER = "sa";
- public static final String DEF_PASSWORD = null;
+
+ public static final String DEF_JCD_ALIAS = PersistenceBrokerFactory.getDefaultKey().getAlias();
+ public static final String DEF_USER = PersistenceBrokerFactory.getDefaultKey().getUser();
+ public static final String DEF_PASSWORD = PersistenceBrokerFactory.getDefaultKey().getPassword();
+ public static final String DEF_DATABASE_NAME;
+ static
+ {
+ DEF_DATABASE_NAME = buildDefDatabase();
+ }
+
public static final PBKey DEF_KEY = new PBKey(DEF_JCD_ALIAS, DEF_USER, DEF_PASSWORD);
@@ -22,4 +27,18 @@
public static final PBKey FAR_AWAY_KEY = new PBKey(FAR_AWAY_JCD_ALIAS, "sa", "");
public static final String DATABASE_REPOSITORY = "repository_database.xml";
+
+
+ protected static String buildDefDatabase()
+ {
+ StringBuffer buf = new StringBuffer();
+ PBKey defKey = PersistenceBrokerFactory.getDefaultKey();
+ buf.append(defKey.getAlias());
+ if ((defKey.getUser() != null && !(defKey.getUser().trim().equals(""))))
+ {
+ buf.append("#" + defKey.getUser());
+ }
+ if (defKey.getPassword() != null) buf.append("#" + defKey.getPassword());
+ return buf.toString();
+ }
}