epugh 2004/01/22 03:41:23
Modified: configuration/src/test/org/apache/commons/configuration
TestDatabaseConfiguration.java
configuration project.xml
Log:
Fix tests so that testdb.script not regenerated constantly. fixs cvs wanting to
chck testdb.script in always.
Revision Changes Path
1.3 +8 -2
jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestDatabaseConfiguration.java
Index: TestDatabaseConfiguration.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestDatabaseConfiguration.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestDatabaseConfiguration.java 18 Jan 2004 16:18:56 -0000 1.2
+++ TestDatabaseConfiguration.java 22 Jan 2004 11:41:23 -0000 1.3
@@ -55,6 +55,7 @@
package org.apache.commons.configuration;
import java.io.FileInputStream;
+import java.sql.SQLException;
import java.util.Iterator;
import javax.sql.DataSource;
@@ -82,11 +83,12 @@
// set up the datasource
BasicDataSource datasource = new BasicDataSource();
datasource.setDriverClassName("org.hsqldb.jdbcDriver");
- datasource.setUrl("jdbc:hsqldb:conf/testdb");
+ datasource.setUrl("jdbc:hsqldb:target/test-classes/testdb");
datasource.setUsername("sa");
datasource.setPassword("");
this.datasource = datasource;
+
// prepare the database
IDatabaseConnection connection = new
DatabaseConnection(datasource.getConnection());
@@ -100,6 +102,10 @@
{
connection.close();
}
+ }
+
+ protected void tearDown() throws SQLException{
+ datasource.getConnection().close();
}
public void testAddPropertyDirectSingle()
1.8 +2 -1 jakarta-commons/configuration/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 18 Jan 2004 16:19:04 -0000 1.7
+++ project.xml 22 Jan 2004 11:41:23 -0000 1.8
@@ -255,6 +255,7 @@
<directory>conf</directory>
<includes>
<include>testClasspath.properties</include>
+ <include>testdb.script</include>
</includes>
</resource>
</resources>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
