From: Roman R. <rro...@us...> - 2005-09-29 18:20:40
|
Update of /cvsroot/firebird/client-java/src/test/org/firebirdsql/management In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9965/src/test/org/firebirdsql/management Modified Files: TestFBMaintenanceManager.java Log Message: fixed test to handle embedded and local modes Index: TestFBMaintenanceManager.java =================================================================== RCS file: /cvsroot/firebird/client-java/src/test/org/firebirdsql/management/TestFBMaintenanceManager.java,v retrieving revision 1.11 retrieving revision 1.12 diff -b -U3 -r1.11 -r1.12 --- TestFBMaintenanceManager.java 27 Jun 2005 22:45:40 -0000 1.11 +++ TestFBMaintenanceManager.java 29 Sep 2005 18:20:24 -0000 1.12 @@ -45,16 +45,24 @@ super.setUp(); fbManager = createFBManager(); + + String gdsType = System.getProperty("test.gds_type", "PURE_JAVA"); + + if (!"EMBEDDED".equalsIgnoreCase(gdsType) && !"LOCAL".equalsIgnoreCase(gdsType)) { fbManager.setServer(DB_SERVER_URL); fbManager.setPort(DB_SERVER_PORT); + } fbManager.start(); fbManager.setForceCreate(true); fbManager.createDatabase(getDatabasePath(), DB_USER, DB_PASSWORD); - maintenanceManager = new FBMaintenanceManager(); + maintenanceManager = new FBMaintenanceManager(getGdsType()); + if (!"EMBEDDED".equalsIgnoreCase(gdsType) && !"LOCAL".equalsIgnoreCase(gdsType)) { maintenanceManager.setHost(DB_SERVER_URL); + } + maintenanceManager.setUser(DB_USER); maintenanceManager.setPassword(DB_PASSWORD); maintenanceManager.setDatabase(getDatabasePath()); |