bloritsch 2003/03/25 13:02:53
Modified: datasource/src/test/org/apache/avalon/excalibur/datasource/ids/test
TableIdGeneratorJdbcTestCase.xtest
TableIdGeneratorMultithreadedJdbcTestCase.xtest
datasource/src/test/org/apache/avalon/excalibur/datasource/test
DataSourceJdbcTestCase.java
DataSourceJdbcTestCase.xtest
Log:
some fixes to the testcases
Revision Changes Path
1.2 +5 -5
avalon-excalibur/datasource/src/test/org/apache/avalon/excalibur/datasource/ids/test/TableIdGeneratorJdbcTestCase.xtest
Index: TableIdGeneratorJdbcTestCase.xtest
===================================================================
RCS file:
/home/cvs/avalon-excalibur/datasource/src/test/org/apache/avalon/excalibur/datasource/ids/test/TableIdGeneratorJdbcTestCase.xtest,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TableIdGeneratorJdbcTestCase.xtest 22 Apr 2002 03:04:27 -0000 1.1
+++ TableIdGeneratorJdbcTestCase.xtest 25 Mar 2003 21:02:52 -0000 1.2
@@ -29,7 +29,7 @@
</stream>
<file id="file">
<filename>TEST-org.apache.avalon.excalibur.datasource.ids.test.TableIdGeneratorJdbcTestCase.log</filename>
- <format type="extended">
+ <format type="avalon">
%7.7{priority} %5.5{time} [%8.8{category}] (%{context}):
%{message}\n%{throwable}
</format>
</file>
@@ -79,10 +79,10 @@
<jdbc name="test-db" logger="jdbc">
<pool-controller min="1" max="10"/>
<auto-commit>true</auto-commit>
- <driver>@test.jdbc.driver@</driver>
- <dburl>@test.jdbc.url@</dburl>
- <user>@test.jdbc.user@</user>
- <password>@test.jdbc.password@</password>
+ <driver>org.hsqldb.jdbcDriver</driver>
+ <dburl>jdbc:hsqldb:test</dburl>
+ <user>SA</user>
+ <password></password>
</jdbc>
</datasources>
1.2 +5 -5
avalon-excalibur/datasource/src/test/org/apache/avalon/excalibur/datasource/ids/test/TableIdGeneratorMultithreadedJdbcTestCase.xtest
Index: TableIdGeneratorMultithreadedJdbcTestCase.xtest
===================================================================
RCS file:
/home/cvs/avalon-excalibur/datasource/src/test/org/apache/avalon/excalibur/datasource/ids/test/TableIdGeneratorMultithreadedJdbcTestCase.xtest,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TableIdGeneratorMultithreadedJdbcTestCase.xtest 22 Apr 2002 03:04:27 -0000
1.1
+++ TableIdGeneratorMultithreadedJdbcTestCase.xtest 25 Mar 2003 21:02:52 -0000
1.2
@@ -29,7 +29,7 @@
</stream>
<file id="file">
<filename>TEST-org.apache.avalon.excalibur.datasource.ids.test.TableIdGeneratorMultithreadedJdbcTestCase.log</filename>
- <format type="extended">
+ <format type="avalon">
%7.7{priority} %5.5{time} [%8.8{category}] (%{context}):
%{message}\n%{throwable}
</format>
</file>
@@ -79,10 +79,10 @@
<jdbc name="test-db" logger="jdbc">
<pool-controller min="1" max="10"/>
<auto-commit>true</auto-commit>
- <driver>@test.jdbc.driver@</driver>
- <dburl>@test.jdbc.url@</dburl>
- <user>@test.jdbc.user@</user>
- <password>@test.jdbc.password@</password>
+ <driver>org.hsqldb.jdbcDriver</driver>
+ <dburl>jdbc:hsqldb:test</dburl>
+ <user>SA</user>
+ <password></password>
</jdbc>
</datasources>
1.14 +2 -2
avalon-excalibur/datasource/src/test/org/apache/avalon/excalibur/datasource/test/DataSourceJdbcTestCase.java
Index: DataSourceJdbcTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/datasource/src/test/org/apache/avalon/excalibur/datasource/test/DataSourceJdbcTestCase.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DataSourceJdbcTestCase.java 22 Mar 2003 12:46:27 -0000 1.13
+++ DataSourceJdbcTestCase.java 25 Mar 2003 21:02:53 -0000 1.14
@@ -149,13 +149,13 @@
ds = (DataSourceComponent)manager.lookup( DataSourceComponent.ROLE );
this.connectionCount = 0;
+ this.barrier = new CyclicBarrier( 11 );
for( int i = 0; i < 10; i++ )
{
( new Thread( new ConnectionThread( this, ds ) ) ).start();
}
- this.barrier = new CyclicBarrier( 11 );
try
{
this.barrier.barrier();
@@ -186,7 +186,7 @@
assertTrue( "Normal use test failed", this.isSuccessful );
}
- class ConnectionThread
+ static class ConnectionThread
implements Runnable
{
protected DataSourceComponent datasource;
1.5 +8 -6
avalon-excalibur/datasource/src/test/org/apache/avalon/excalibur/datasource/test/DataSourceJdbcTestCase.xtest
Index: DataSourceJdbcTestCase.xtest
===================================================================
RCS file:
/home/cvs/avalon-excalibur/datasource/src/test/org/apache/avalon/excalibur/datasource/test/DataSourceJdbcTestCase.xtest,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DataSourceJdbcTestCase.xtest 2 Sep 2002 12:49:30 -0000 1.4
+++ DataSourceJdbcTestCase.xtest 25 Mar 2003 21:02:53 -0000 1.5
@@ -27,7 +27,7 @@
</stream>
<file id="file">
<filename>TEST-org.apache.avalon.excalibur.datasource.test.DataSourceJdbcTestCase.log</filename>
- <format type="extended">
+ <format type="avalon">
%7.7{priority} %5.5{time} [%8.8{category}] (%{context}):
%{message}\n%{throwable}
</format>
</file>
@@ -53,11 +53,13 @@
-->
<components>
<datasource logger="test">
- <pool-controller min="5" max="10"/>
- <driver>@test.jdbc.driver@</driver>
- <dburl>@test.jdbc.url@</dburl>
- <user>@test.jdbc.user@</user>
- <password>@test.jdbc.password@</password>
+ <pool-controller min="5" max="10" timeout="1000">
+ <keep-alive disable="true"/>
+ </pool-controller>
+ <driver>org.hsqldb.jdbcDriver</driver>
+ <dburl>jdbc:hsqldb:test</dburl>
+ <user>SA</user>
+ <password/>
</datasource>
</components>
</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
