Menu
▾
▴
dbunit-commit
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
(7) |
Aug
(37) |
Sep
|
Oct
|
Nov
(1) |
Dec
(22) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(8) |
Feb
(68) |
Mar
(72) |
Apr
(149) |
May
(32) |
Jun
(46) |
Jul
(26) |
Aug
(59) |
Sep
(25) |
Oct
(18) |
Nov
(4) |
Dec
(3) |
| 2004 |
Jan
(90) |
Feb
(19) |
Mar
(38) |
Apr
(41) |
May
(44) |
Jun
(2) |
Jul
(10) |
Aug
|
Sep
(14) |
Oct
|
Nov
(1) |
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(15) |
Jun
(1) |
Jul
|
Aug
(9) |
Sep
|
Oct
(17) |
Nov
|
Dec
|
| 2006 |
Jan
(1) |
Feb
(16) |
Mar
|
Apr
(1) |
May
(48) |
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(29) |
| 2007 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
(23) |
Mar
(31) |
Apr
|
May
(26) |
Jun
(6) |
Jul
(1) |
Aug
|
Sep
(7) |
Oct
(1) |
Nov
(8) |
Dec
(8) |
| 2009 |
Jan
(5) |
Feb
(9) |
Mar
(1) |
Apr
|
May
(23) |
Jun
(3) |
Jul
|
Aug
(1) |
Sep
(9) |
Oct
(28) |
Nov
(18) |
Dec
(8) |
| 2010 |
Jan
(19) |
Feb
(24) |
Mar
(3) |
Apr
|
May
(5) |
Jun
(4) |
Jul
|
Aug
(1) |
Sep
(11) |
Oct
|
Nov
(2) |
Dec
(1) |
| 2011 |
Jan
|
Feb
(7) |
Mar
|
Apr
(6) |
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(32) |
Oct
(6) |
Nov
|
Dec
|
|
From: <jef...@us...> - 2011-02-22 03:05:28
|
Revision: 1213
http://dbunit.svn.sourceforge.net/dbunit/?rev=1213&view=rev
Author: jeffjensen
Date: 2011-02-22 03:05:22 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
Improve example with a catch block proven to help with test failure troubleshooting.
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
Modified: trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2011-02-22 02:35:20 UTC (rev 1212)
+++ trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2011-02-22 03:05:22 UTC (rev 1213)
@@ -94,8 +94,11 @@
* final VerifyTableDefinition[] tables = {}; // define tables to verify
*
* tc.preTest(tables, prepDataFiles, expectedDataFiles);
- *
+ *
* // execute test
+ * } catch (Exception e) {
+ * log.error("Test error", e);
+ * throw e;
* } finally {
* tc.postTest();
* }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2011-02-22 02:35:26
|
Revision: 1212
http://dbunit.svn.sourceforge.net/dbunit/?rev=1212&view=rev
Author: jeffjensen
Date: 2011-02-22 02:35:20 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
Update changes description for release.
Modified Paths:
--------------
trunk/dbunit/src/changes/changes.xml
Modified: trunk/dbunit/src/changes/changes.xml
===================================================================
--- trunk/dbunit/src/changes/changes.xml 2011-02-22 02:28:20 UTC (rev 1211)
+++ trunk/dbunit/src/changes/changes.xml 2011-02-22 02:35:20 UTC (rev 1212)
@@ -10,7 +10,7 @@
</properties>
<body>
- <release version="next" date="in SCM" description="Additional toString()s, ">
+ <release version="next" date="in SCM" description="Additional toString()s, schema usage, logging, timestamp.">
<action dev="jeffjensen" type="add" due-to="jeffjensen">Add toString() methods to AbstractResultSetTable, ForwardOnlyResultSetTable, ScrollableResultSetTable.</action>
<action dev="jeffjensen" type="update" due-to="jeffjensen">For DefaultPrepAndExpectedTestCase, catch, log, and rethrow all log messages to help with troubleshooting. Tweak log messages. Improve doc example.</action>
<action dev="jeffjensen" type="fix" due-to="jeffjensen">Add schema name, if specified, to table name in query in AbstractDatabaseConnection.createTable().</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2011-02-22 02:28:26
|
Revision: 1211
http://dbunit.svn.sourceforge.net/dbunit/?rev=1211&view=rev
Author: jeffjensen
Date: 2011-02-22 02:28:20 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
Update changes.xml with my missing items.
Modified Paths:
--------------
trunk/dbunit/src/changes/changes.xml
Modified: trunk/dbunit/src/changes/changes.xml
===================================================================
--- trunk/dbunit/src/changes/changes.xml 2011-02-17 21:57:38 UTC (rev 1210)
+++ trunk/dbunit/src/changes/changes.xml 2011-02-22 02:28:20 UTC (rev 1211)
@@ -12,6 +12,8 @@
<body>
<release version="next" date="in SCM" description="Additional toString()s, ">
<action dev="jeffjensen" type="add" due-to="jeffjensen">Add toString() methods to AbstractResultSetTable, ForwardOnlyResultSetTable, ScrollableResultSetTable.</action>
+ <action dev="jeffjensen" type="update" due-to="jeffjensen">For DefaultPrepAndExpectedTestCase, catch, log, and rethrow all log messages to help with troubleshooting. Tweak log messages. Improve doc example.</action>
+ <action dev="jeffjensen" type="fix" due-to="jeffjensen">Add schema name, if specified, to table name in query in AbstractDatabaseConnection.createTable().</action>
<action dev="rlogiacco" type="fix" issue="3071408" due-to="chrisphe">New Handling of Timestamp in 2.4.8 has error with subseconds</action>
</release>
<release version="2.4.8" date="Sep 2, 2010" description="Bug fixes, timezone support, Oracle support improvements, new DataFileLoader, new PrepAndExpectedTestCase">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rlo...@us...> - 2011-02-17 21:57:45
|
Revision: 1210
http://dbunit.svn.sourceforge.net/dbunit/?rev=1210&view=rev
Author: rlogiacco
Date: 2011-02-17 21:57:38 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
[3071408] changed parsing mechanism for timestamps
Submitted by: Chris Pheby
Modified Paths:
--------------
trunk/dbunit/src/changes/changes.xml
trunk/dbunit/src/main/java/org/dbunit/dataset/datatype/TimestampDataType.java
trunk/dbunit/src/test/java/org/dbunit/dataset/datatype/TimestampDataTypeTest.java
Modified: trunk/dbunit/src/changes/changes.xml
===================================================================
--- trunk/dbunit/src/changes/changes.xml 2010-12-01 05:33:02 UTC (rev 1209)
+++ trunk/dbunit/src/changes/changes.xml 2011-02-17 21:57:38 UTC (rev 1210)
@@ -12,6 +12,7 @@
<body>
<release version="next" date="in SCM" description="Additional toString()s, ">
<action dev="jeffjensen" type="add" due-to="jeffjensen">Add toString() methods to AbstractResultSetTable, ForwardOnlyResultSetTable, ScrollableResultSetTable.</action>
+ <action dev="rlogiacco" type="fix" issue="3071408" due-to="chrisphe">New Handling of Timestamp in 2.4.8 has error with subseconds</action>
</release>
<release version="2.4.8" date="Sep 2, 2010" description="Bug fixes, timezone support, Oracle support improvements, new DataFileLoader, new PrepAndExpectedTestCase">
<action dev="gommma" type="add" issue="3027485" due-to="Yishai">MSSQL JDBC Driver 3.0 doesn't work well</action>
Modified: trunk/dbunit/src/main/java/org/dbunit/dataset/datatype/TimestampDataType.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/dataset/datatype/TimestampDataType.java 2010-12-01 05:33:02 UTC (rev 1209)
+++ trunk/dbunit/src/main/java/org/dbunit/dataset/datatype/TimestampDataType.java 2011-02-17 21:57:38 UTC (rev 1210)
@@ -21,15 +21,14 @@
package org.dbunit.dataset.datatype;
+import java.math.BigInteger;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.sql.Types;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.dbunit.dataset.ITable;
import org.slf4j.Logger;
@@ -43,8 +42,10 @@
*/
public class TimestampDataType extends AbstractDataType
{
-
- /**
+ private static final BigInteger ONE_BILLION = new BigInteger ("1000000000");
+ private static final Pattern TIMEZONE_REGEX = Pattern.compile("(.*)(?:\\W([+-][0-2][0-9][0-5][0-9]))");
+
+ /**
* Logger for this class
*/
private static final Logger logger = LoggerFactory.getLogger(TimestampDataType.class);
@@ -85,33 +86,60 @@
if (value instanceof String)
{
- String stringValue = (String)value;
+ String stringValue = value.toString();
+ String zoneValue = null;
+
+ Matcher tzMatcher = TIMEZONE_REGEX.matcher(stringValue);
+ if (tzMatcher.matches() && tzMatcher.group(2) != null)
+ {
+ stringValue = tzMatcher.group(1);
+ zoneValue = tzMatcher.group(2);
+ }
- String[] patterns = {
- "yyyy-MM-dd HH:mm:ss.SSS Z",
- "yyyy-MM-dd HH:mm:ss.SSS",
- "yyyy-MM-dd HH:mm:ss Z",
- "yyyy-MM-dd HH:mm:ss",
- "yyyy-MM-dd HH:mm Z",
- "yyyy-MM-dd HH:mm",
- "yyyy-MM-dd Z",
- "yyyy-MM-dd"
- };
-
- for (int i = 0; i < patterns.length; ++i) {
- String p = patterns[i];
+ Timestamp ts = null;
+ if (stringValue.length() == 10)
+ {
+ try
+ {
+ long time = java.sql.Date.valueOf(stringValue).getTime();
+ ts = new java.sql.Timestamp(time);
+ }
+ catch (IllegalArgumentException e)
+ {
+ // Was not a java.sql.Date, let Timestamp handle this value
+ }
+ }
+ if (ts == null)
+ {
try
{
- DateFormat df = new SimpleDateFormat(p);
- Date date = df.parse(stringValue);
- return new java.sql.Timestamp(date.getTime());
+ ts = java.sql.Timestamp.valueOf(stringValue);
}
- catch (ParseException e)
+ catch (IllegalArgumentException e)
{
- if (i < patterns.length) continue;
- throw new TypeCastException(value, this, e);
+ throw new TypeCastException(value, this, e);
}
}
+
+ // Apply zone if any
+ if (zoneValue != null)
+ {
+ BigInteger time = BigInteger.valueOf(ts.getTime() / 1000 * 1000).multiply(ONE_BILLION).add(BigInteger.valueOf(ts.getNanos()));
+ int hours = Integer.parseInt(zoneValue.substring(1, 3));
+ int minutes = Integer.parseInt(zoneValue.substring(3, 5));
+ BigInteger offsetAsSeconds = BigInteger.valueOf((hours * 3600) + (minutes * 60));
+ BigInteger offsetAsNanos = offsetAsSeconds.multiply(BigInteger.valueOf(1000)).multiply(ONE_BILLION);
+ if (zoneValue.charAt(0) == '+') {
+ time = time.subtract(offsetAsNanos);
+ } else {
+ time = time.add(offsetAsNanos);
+ }
+ BigInteger[] components = time.divideAndRemainder(ONE_BILLION);
+ ts = new Timestamp(components[0].longValue());
+ ts.setNanos(components[1].intValue());
+ }
+
+ return ts;
}
throw new TypeCastException(value, this);
Modified: trunk/dbunit/src/test/java/org/dbunit/dataset/datatype/TimestampDataTypeTest.java
===================================================================
--- trunk/dbunit/src/test/java/org/dbunit/dataset/datatype/TimestampDataTypeTest.java 2010-12-01 05:33:02 UTC (rev 1209)
+++ trunk/dbunit/src/test/java/org/dbunit/dataset/datatype/TimestampDataTypeTest.java 2011-02-17 21:57:38 UTC (rev 1210)
@@ -111,7 +111,9 @@
new Timestamp(1234).toString(),
new Date(1234).toString(),
new java.util.Date(1234),
+ "1995-01-07 01:22:41.9 -0500",
"1995-01-07 01:22:41.923 -0500",
+ "1995-01-07 01:22:41.9",
"1995-01-07 01:22:41.923",
"1995-01-07 01:22:41 -0500",
"1995-01-07 01:22:41",
@@ -126,7 +128,9 @@
new Timestamp(1234),
new Timestamp(Date.valueOf((new Date(1234).toString())).getTime()),
new Timestamp(1234),
+ makeTimestamp(1995, 0, 7, 1, 22, 41, 900, "America/New_York"),
makeTimestamp(1995, 0, 7, 1, 22, 41, 923, "America/New_York"),
+ makeTimestamp(1995, 0, 7, 1, 22, 41, 900),
makeTimestamp(1995, 0, 7, 1, 22, 41, 923),
makeTimestamp(1995, 0, 7, 1, 22, 41, "America/New_York"),
makeTimestamp(1995, 0, 7, 1, 22, 41),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2010-12-01 05:33:08
|
Revision: 1209
http://dbunit.svn.sourceforge.net/dbunit/?rev=1209&view=rev
Author: jeffjensen
Date: 2010-12-01 05:33:02 +0000 (Wed, 01 Dec 2010)
Log Message:
-----------
Add schema name, if specified, to table name in query in AbstractDatabaseConnection.createTable().
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/database/AbstractDatabaseConnection.java
Modified: trunk/dbunit/src/main/java/org/dbunit/database/AbstractDatabaseConnection.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/database/AbstractDatabaseConnection.java 2010-11-26 04:09:54 UTC (rev 1208)
+++ trunk/dbunit/src/main/java/org/dbunit/database/AbstractDatabaseConnection.java 2010-12-01 05:33:02 UTC (rev 1209)
@@ -113,7 +113,11 @@
throw new NullPointerException("The parameter 'tableName' must not be null");
}
- String sql = "select * from " + tableName; // TODO Think about QualifiedTableNames here - needed or not?
+ // qualify with schema if configured
+ QualifiedTableName qualifiedTableName =
+ new QualifiedTableName(tableName, this.getSchema());
+ String qualifiedName = qualifiedTableName.getQualifiedName();
+ String sql = "select * from " + qualifiedName;
return this.createQueryTable(tableName, sql);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2010-11-26 04:10:01
|
Revision: 1208
http://dbunit.svn.sourceforge.net/dbunit/?rev=1208&view=rev
Author: jeffjensen
Date: 2010-11-26 04:09:54 +0000 (Fri, 26 Nov 2010)
Log Message:
-----------
Improve example to show best to call postTest() in finally{}.
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
Modified: trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2010-11-26 03:11:53 UTC (rev 1207)
+++ trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2010-11-26 04:09:54 UTC (rev 1208)
@@ -88,15 +88,17 @@
*
* @Test
* public void testExample() throws Exception {
- * String[] prepDataFiles = {}; // define prep files
- * String[] expectedDataFiles = {}; // define expected files
- * VerifyTableDefinition[] tables = {}; // define tables to verify
+ * try {
+ * final String[] prepDataFiles = {}; // define prep files
+ * final String[] expectedDataFiles = {}; // define expected files
+ * final VerifyTableDefinition[] tables = {}; // define tables to verify
+ *
+ * tc.preTest(tables, prepDataFiles, expectedDataFiles);
*
- * tc.preTest(tables, prepDataFiles, expectedDataFiles);
- *
- * // execute test
- *
- * tc.postTest();
+ * // execute test
+ * } finally {
+ * tc.postTest();
+ * }
* }
* </pre>
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2010-11-26 03:11:59
|
Revision: 1207
http://dbunit.svn.sourceforge.net/dbunit/?rev=1207&view=rev
Author: jeffjensen
Date: 2010-11-26 03:11:53 +0000 (Fri, 26 Nov 2010)
Log Message:
-----------
Catch, log, and rethrow all log messages to help with troubleshooting. Tweak log messages.
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
Modified: trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2010-09-06 02:56:28 UTC (rev 1206)
+++ trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2010-11-26 03:11:53 UTC (rev 1207)
@@ -327,7 +327,7 @@
LOG.info("verifyData: about to verify {} tables={}", new Integer(
count), tableDefs);
if (count == 0) {
- LOG.warn("No tables to verify;"
+ LOG.warn("verifyData: No tables to verify;"
+ " no VerifyTableDefinitions specified");
}
@@ -337,27 +337,29 @@
String[] includeColumns = td.getColumnInclusionFilters();
String tableName = td.getTableName();
- LOG.info("Verifying table '{}'", tableName);
+ LOG.info("verifyData: Verifying table '{}'", tableName);
- LOG.debug(" Loading its rows from expected dataset");
+ LOG.debug("verifyData: Loading its rows from expected dataset");
ITable expectedTable = null;
try {
expectedTable = expectedDs.getTable(tableName);
- } catch (DataSetException e) {
+ } catch (Exception e)
+ {
final String msg =
- "Problem obtaining table '" + tableName
+ "verifyData: Problem obtaining table '" + tableName
+ "' from expected dataset";
LOG.error(msg, e);
throw new DataSetException(msg, e);
}
- LOG.debug(" Loading its rows from actual table");
+ LOG.debug("verifyData: Loading its rows from actual table");
ITable actualTable = null;
try {
actualTable = connection.createTable(tableName);
- } catch (DataSetException e) {
+ } catch (Exception e)
+ {
final String msg =
- "Problem obtaining table '" + tableName
+ "verifyData: Problem obtaining table '" + tableName
+ "' from actual dataset";
LOG.error(msg, e);
throw new DataSetException(msg, e);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2010-09-06 02:56:34
|
Revision: 1206
http://dbunit.svn.sourceforge.net/dbunit/?rev=1206&view=rev
Author: jeffjensen
Date: 2010-09-06 02:56:28 +0000 (Mon, 06 Sep 2010)
Log Message:
-----------
Correct info.
Modified Paths:
--------------
trunk/dbunit/src/changes/changes.xml
Modified: trunk/dbunit/src/changes/changes.xml
===================================================================
--- trunk/dbunit/src/changes/changes.xml 2010-09-06 02:55:17 UTC (rev 1205)
+++ trunk/dbunit/src/changes/changes.xml 2010-09-06 02:56:28 UTC (rev 1206)
@@ -10,7 +10,10 @@
</properties>
<body>
- <release version="2.4.8" date="TBD" description="TBD">
+ <release version="next" date="in SCM" description="Additional toString()s, ">
+ <action dev="jeffjensen" type="add" due-to="jeffjensen">Add toString() methods to AbstractResultSetTable, ForwardOnlyResultSetTable, ScrollableResultSetTable.</action>
+ </release>
+ <release version="2.4.8" date="Sep 2, 2010" description="Bug fixes, timezone support, Oracle support improvements, new DataFileLoader, new PrepAndExpectedTestCase">
<action dev="gommma" type="add" issue="3027485" due-to="Yishai">MSSQL JDBC Driver 3.0 doesn't work well</action>
<action dev="gommma" type="fix" issue="3022281" due-to="wujeksrujek">NPE when setting properties</action>
<action dev="gommma" type="fix" issue="2993712" due-to="glesatsf">Wrong value for property "datatypeFactory"</action>
@@ -19,9 +22,8 @@
<action dev="jbhurst" type="add" issue="2875253" due-to="caseylucas">Additional refinements for Oracle SDO_GEOMETRY datatype</action>
<action dev="jbhurst" type="add" issue="2921131" due-to="vlamp">Add timezone support for timestamp data type</action>
<action dev="jbhurst" type="add" issue="2919427" due-to="dbamberghi (Daniele Bamberghi)">OracleDataTypeFactory recognises "SYS.XMLTYPE"</action>
- <action dev="jeffjensen" type="add" issue="2938029" due-to="jeffjensen">Add "file loader" utility for various data file types</action>
+ <action dev="jeffjensen" type="add" issue="2938029" due-to="jeffjensen">Add "file loader" utility (DataFileLoader) for various data file types</action>
<action dev="jeffjensen" type="add" due-to="jeffjensen">Add new TestCase that supports prepare and expected datasets: "DefaultPrepAndExpectedTestCase"</action>
- <action dev="jeffjensen" type="add" due-to="jeffjensen">Add reflective toString() method to AbstractTable so all subclasses have detailed output in log statements.</action>
</release>
<release version="2.4.7" date="Nov 09, 2009" description="Bugfixes and some non breaking refactoring">
<action dev="gommma" type="fix" issue="2685615" due-to="lumpynose">dtd for XmlDataSet</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2010-09-06 02:55:24
|
Revision: 1205
http://dbunit.svn.sourceforge.net/dbunit/?rev=1205&view=rev
Author: jeffjensen
Date: 2010-09-06 02:55:17 +0000 (Mon, 06 Sep 2010)
Log Message:
-----------
Add a few more toStrings().
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/database/AbstractResultSetTable.java
trunk/dbunit/src/main/java/org/dbunit/database/ForwardOnlyResultSetTable.java
trunk/dbunit/src/main/java/org/dbunit/database/ScrollableResultSetTable.java
Modified: trunk/dbunit/src/main/java/org/dbunit/database/AbstractResultSetTable.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/database/AbstractResultSetTable.java 2010-09-01 22:37:39 UTC (rev 1204)
+++ trunk/dbunit/src/main/java/org/dbunit/database/AbstractResultSetTable.java 2010-09-06 02:55:17 UTC (rev 1205)
@@ -168,4 +168,20 @@
throw new DataSetException(e);
}
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder(2000);
+
+ sb.append(getClass().getName()).append("[");
+ sb.append("_metaData=[").append(_metaData).append("], ");
+ sb.append("_resultSet=[").append(_resultSet).append("], ");
+ sb.append("_statement=[").append(_statement).append("]");
+ sb.append("]");
+
+ return sb.toString();
+ }
}
Modified: trunk/dbunit/src/main/java/org/dbunit/database/ForwardOnlyResultSetTable.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/database/ForwardOnlyResultSetTable.java 2010-09-01 22:37:39 UTC (rev 1204)
+++ trunk/dbunit/src/main/java/org/dbunit/database/ForwardOnlyResultSetTable.java 2010-09-06 02:55:17 UTC (rev 1205)
@@ -45,7 +45,7 @@
private static final Logger logger = LoggerFactory.getLogger(ForwardOnlyResultSetTable.class);
private int _lastRow = -1;
- private boolean _eot = false; // End of table flag
+ private boolean _eot = false; // End of table flag
public ForwardOnlyResultSetTable(ITableMetaData metaData,
ResultSet resultSet) throws SQLException, DataSetException
@@ -65,7 +65,7 @@
super(tableName, selectStatement, connection);
}
- ////////////////////////////////////////////////////////////////////////////
+ // //////////////////////////////////////////////////////////////////////////
// ITable interface
public int getRowCount()
@@ -108,4 +108,21 @@
throw new DataSetException(e);
}
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder(2000);
+
+ sb.append(super.toString());
+ sb.append(", ");
+ sb.append(getClass().getName()).append("[");
+ sb.append("_eot=[").append(_eot).append("], ");
+ sb.append("_lastRow=[").append(_lastRow).append("]");
+ sb.append("]");
+
+ return sb.toString();
+ }
}
Modified: trunk/dbunit/src/main/java/org/dbunit/database/ScrollableResultSetTable.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/database/ScrollableResultSetTable.java 2010-09-01 22:37:39 UTC (rev 1204)
+++ trunk/dbunit/src/main/java/org/dbunit/database/ScrollableResultSetTable.java 2010-09-06 02:55:17 UTC (rev 1205)
@@ -140,4 +140,20 @@
throw new DataSetException(e);
}
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder(2000);
+
+ sb.append(super.toString());
+ sb.append(", ");
+ sb.append(getClass().getName()).append("[");
+ sb.append("_rowCount=[").append(_rowCount).append("]");
+ sb.append("]");
+
+ return sb.toString();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rlo...@us...> - 2010-09-01 22:37:45
|
Revision: 1204
http://dbunit.svn.sourceforge.net/dbunit/?rev=1204&view=rev
Author: rlogiacco
Date: 2010-09-01 22:37:39 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
fixed project title
Modified Paths:
--------------
trunk/dbunit/pom.xml
Modified: trunk/dbunit/pom.xml
===================================================================
--- trunk/dbunit/pom.xml 2010-09-01 21:52:26 UTC (rev 1203)
+++ trunk/dbunit/pom.xml 2010-09-01 22:37:39 UTC (rev 1204)
@@ -6,11 +6,11 @@
<artifactId>dbunit</artifactId>
<version>2.4.9-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>DbUnit Framework</name>
+ <name>dbUnit Extension</name>
<url>http://dbunit.sourceforge.net</url>
<inceptionYear>2002</inceptionYear>
<description>
- DbUnit is a JUnit extension (also usable from Ant) targeted for database-driven projects that, among other things, puts your database into a known state between test runs. This is an excellent way to avoid the myriad of problems that can occur when one test case corrupts the database and causes subsequent tests to fail or exacerbate the damage.
+ dbUnit is a JUnit extension (also usable from Ant and Maven) targeted for database-driven projects that, among other things, puts your database into a known state between test runs. This is an excellent way to avoid the myriad of problems that can occur when one test case corrupts the database and causes subsequent tests to fail or exacerbate the damage.
</description>
<licenses>
<license>
@@ -24,12 +24,8 @@
<checkstyle.excludes>org/dbunit/util/concurrent/*.java</checkstyle.excludes>
<logbackVersion>0.9.15</logbackVersion>
<slf4jVersion>1.5.6</slf4jVersion>
- <project.build.sourceEncoding>
- UTF-8
- </project.build.sourceEncoding>
- <project.reporting.outputEncoding>
- UTF-8
- </project.reporting.outputEncoding>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<scm>
@@ -60,19 +56,19 @@
<mailingLists>
<mailingList>
- <name>DbUnit User List</name>
+ <name>dbUnit User List</name>
<subscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-user</subscribe>
<unsubscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-user</unsubscribe>
<archive>http://sourceforge.net/mailarchive/forum.php?forum_name=dbunit-user</archive>
</mailingList>
<mailingList>
- <name>DbUnit Developer List</name>
+ <name>dbUnit Developer List</name>
<subscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-developer</subscribe>
<unsubscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-developer</unsubscribe>
<archive>http://sourceforge.net/mailarchive/forum.php?forum_name=dbunit-developer</archive>
</mailingList>
<mailingList>
- <name>DbUnit SVN Commit List</name>
+ <name>dbUnit SVN Commit List</name>
<subscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-commit</subscribe>
<unsubscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-commit</unsubscribe>
<archive>http://sourceforge.net/mailarchive/forum.php?forum_name=dbunit-commit</archive>
@@ -152,7 +148,6 @@
<organization>Oz Communication</organization>
<roles>
<role>Project Founder (inactive)</role>
- <!-- <role>Java Developer</role> -->
</roles>
</developer>
<developer>
@@ -160,7 +155,6 @@
<id>bdrum</id>
<roles>
<role>Java Developer (inactive)</role>
- <!-- <role>Original Ant Task Contributor</role> -->
</roles>
</developer>
<developer>
@@ -170,7 +164,6 @@
<organization>Master House S.r.l</organization>
<roles>
<role>Java Developer (inactive)</role>
- <!-- <role>DB2 Contributor</role> -->
</roles>
</developer>
<developer>
@@ -178,7 +171,6 @@
<id>zieggy</id>
<roles>
<role>Java Developer (inactive)</role>
- <!-- <role>Original Ant Task Contributor</role> -->
</roles>
</developer>
</developers>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rlo...@us...> - 2010-09-01 21:52:32
|
Revision: 1203
http://dbunit.svn.sourceforge.net/dbunit/?rev=1203&view=rev
Author: rlogiacco
Date: 2010-09-01 21:52:26 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
fixing release tagging errors
Modified Paths:
--------------
tags/dbunit-2.4.8/pom.xml
tags/dbunit-2.4.8/src/site/xdoc/index.xml
Modified: tags/dbunit-2.4.8/pom.xml
===================================================================
--- tags/dbunit-2.4.8/pom.xml 2010-09-01 13:49:16 UTC (rev 1202)
+++ tags/dbunit-2.4.8/pom.xml 2010-09-01 21:52:26 UTC (rev 1203)
@@ -4,7 +4,7 @@
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
- <version>2.4.8-SNAPSHOT</version>
+ <version>2.4.8</version>
<packaging>jar</packaging>
<name>DbUnit Framework</name>
<url>http://dbunit.sourceforge.net</url>
@@ -33,9 +33,9 @@
</properties>
<scm>
- <connection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/trunk/dbunit</connection>
- <developerConnection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/trunk/dbunit</developerConnection>
- <url>http://dbunit.svn.sourceforge.net/svnroot/dbunit/trunk/dbunit</url>
+ <connection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/tags/dbunit-2.4.8</connection>
+ <developerConnection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/tags/dbunit-2.4.8</developerConnection>
+ <url>http://dbunit.svn.sourceforge.net/svnroot/dbunit/tags/dbunit-2.4.8</url>
</scm>
<issueManagement>
<system>SourceForge</system>
Modified: tags/dbunit-2.4.8/src/site/xdoc/index.xml
===================================================================
--- tags/dbunit-2.4.8/src/site/xdoc/index.xml 2010-09-01 13:49:16 UTC (rev 1202)
+++ tags/dbunit-2.4.8/src/site/xdoc/index.xml 2010-09-01 21:52:26 UTC (rev 1203)
@@ -26,6 +26,10 @@
<section name="News">
<table border="1">
<tr>
+ <td>2010-09-01</td>
+ <td>DbUnit project team is proud to deliver the new 2.4.8 release: please have a look at the <a href="changes-report.html#a2.4.8">changes</a> report for the release contents.</td>
+ </tr>
+ <tr>
<td>2009-11-09</td>
<td>DbUnit project team is proud to deliver the new 2.4.7 release: please have a look at the <a href="changes-report.html#a2.4.7">changes</a> report for the release contents.</td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rlo...@us...> - 2010-09-01 13:49:22
|
Revision: 1202
http://dbunit.svn.sourceforge.net/dbunit/?rev=1202&view=rev
Author: rlogiacco
Date: 2010-09-01 13:49:16 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
added 2.4.8 release to news
Modified Paths:
--------------
trunk/dbunit/src/site/xdoc/index.xml
Modified: trunk/dbunit/src/site/xdoc/index.xml
===================================================================
--- trunk/dbunit/src/site/xdoc/index.xml 2010-09-01 12:59:27 UTC (rev 1201)
+++ trunk/dbunit/src/site/xdoc/index.xml 2010-09-01 13:49:16 UTC (rev 1202)
@@ -26,6 +26,10 @@
<section name="News">
<table border="1">
<tr>
+ <td>2010-08-31</td>
+ <td>DbUnit project team is proud to deliver the new 2.4.8 release: please have a look at the <a href="changes-report.html#a2.4.8">changes</a> report for the release contents.</td>
+ </tr>
+ <tr>
<td>2009-11-09</td>
<td>DbUnit project team is proud to deliver the new 2.4.7 release: please have a look at the <a href="changes-report.html#a2.4.7">changes</a> report for the release contents.</td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rlo...@us...> - 2010-09-01 12:59:33
|
Revision: 1201
http://dbunit.svn.sourceforge.net/dbunit/?rev=1201&view=rev
Author: rlogiacco
Date: 2010-09-01 12:59:27 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Added Paths:
-----------
branches/dbunit-3.x/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rlo...@us...> - 2010-09-01 12:56:08
|
Revision: 1200
http://dbunit.svn.sourceforge.net/dbunit/?rev=1200&view=rev
Author: rlogiacco
Date: 2010-09-01 12:56:00 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/dbunit/pom.xml
Modified: trunk/dbunit/pom.xml
===================================================================
--- trunk/dbunit/pom.xml 2010-09-01 12:55:41 UTC (rev 1199)
+++ trunk/dbunit/pom.xml 2010-09-01 12:56:00 UTC (rev 1200)
@@ -1,1006 +1,1006 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.4.8-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>DbUnit Framework</name>
- <url>http://dbunit.sourceforge.net</url>
- <inceptionYear>2002</inceptionYear>
- <description>
- DbUnit is a JUnit extension (also usable from Ant) targeted for database-driven projects that, among other things, puts your database into a known state between test runs. This is an excellent way to avoid the myriad of problems that can occur when one test case corrupts the database and causes subsequent tests to fail or exacerbate the damage.
- </description>
- <licenses>
- <license>
- <name>GNU Lesser General Public License, Version 2.1</name>
- <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <properties>
- <compileSource>1.4</compileSource>
- <checkstyle.excludes>org/dbunit/util/concurrent/*.java</checkstyle.excludes>
- <logbackVersion>0.9.15</logbackVersion>
- <slf4jVersion>1.5.6</slf4jVersion>
- <project.build.sourceEncoding>
- UTF-8
- </project.build.sourceEncoding>
- <project.reporting.outputEncoding>
- UTF-8
- </project.reporting.outputEncoding>
- </properties>
-
- <scm>
- <connection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/trunk/dbunit</connection>
- <developerConnection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/trunk/dbunit</developerConnection>
- <url>http://dbunit.svn.sourceforge.net/svnroot/dbunit/trunk/dbunit</url>
- </scm>
- <issueManagement>
- <system>SourceForge</system>
- <url>http://sourceforge.net/tracker/?group_id=47439</url>
- </issueManagement>
- <ciManagement>
- <system>parabuild</system>
- <url><![CDATA[http://parabuild.viewtier.com:8080/parabuild/index.htm?view=detailed&buildid=30]]></url>
- <notifiers>
- <notifier>
- <type>mail</type>
- <sendOnError>true</sendOnError>
- <sendOnFailure>false</sendOnFailure>
- <sendOnSuccess>false</sendOnSuccess>
- <sendOnWarning>false</sendOnWarning>
- <configuration>
- <address>go...@us...</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
-
- <mailingLists>
- <mailingList>
- <name>DbUnit User List</name>
- <subscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-user</subscribe>
- <unsubscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-user</unsubscribe>
- <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=dbunit-user</archive>
- </mailingList>
- <mailingList>
- <name>DbUnit Developer List</name>
- <subscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-developer</subscribe>
- <unsubscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-developer</unsubscribe>
- <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=dbunit-developer</archive>
- </mailingList>
- <mailingList>
- <name>DbUnit SVN Commit List</name>
- <subscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-commit</subscribe>
- <unsubscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-commit</unsubscribe>
- <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=dbunit-commit</archive>
- </mailingList>
- </mailingLists>
-
- <!--
- - Who are the developers for the project, in order of recent activity.
- -->
- <developers>
- <!--
- - Note: email of first developer is used by the announcements-email plugin
- -->
- <developer>
- <name>Matthias Gommeringer</name>
- <id>gommma</id>
- <email>go...@us...</email>
- <roles>
- <role>Java Developer (very active)</role>
- </roles>
- </developer>
- <developer>
- <name>John Hurst</name>
- <id>jbhurst</id>
- <email>jb...@us...</email>
- <roles>
- <role>Java Developer (very active)</role>
- </roles>
- </developer>
- <developer>
- <name>Jeff Jensen</name>
- <id>jeffjensen</id>
- <email>jef...@us...</email>
- <roles>
- <role>Java Developer (active)</role>
- </roles>
- </developer>
- <developer>
- <name>Roberto Lo Giacco</name>
- <id>rlogiacco</id>
- <email>rlo...@us...</email>
- <organization>SmartLab</organization>
- <roles>
- <role>Java Developer (active)</role>
- </roles>
- </developer>
- <developer>
- <name>Felipe Leme</name>
- <id>felipeal</id>
- <email>db...@fe...</email>
- <organization>GoldenGate Software</organization>
- <timezone>-8</timezone>
- <roles>
- <role>Java Developer (mostly inactive :-)</role>
- </roles>
- </developer>
- <developer>
- <name>David Eric Pugh</name>
- <id>dep4b</id>
- <email>ep...@op...</email>
- <organization>OpenSource Connections</organization>
- <roles>
- <role>Java Developer (inactive)</role>
- </roles>
- </developer>
- <developer>
- <name>Sebastien Le Callonnec</name>
- <id>slecallonnec</id>
- <email>sle...@us...</email>
- <roles>
- <role>Java Developer (inactive)</role>
- </roles>
- </developer>
- <developer>
- <name>Manuel Laflamme</name>
- <id>mlaflamm</id>
- <organization>Oz Communication</organization>
- <roles>
- <role>Project Founder (inactive)</role>
- <!-- <role>Java Developer</role> -->
- </roles>
- </developer>
- <developer>
- <name>Benjamin Cox</name>
- <id>bdrum</id>
- <roles>
- <role>Java Developer (inactive)</role>
- <!-- <role>Original Ant Task Contributor</role> -->
- </roles>
- </developer>
- <developer>
- <name>Federico Spinazzi</name>
- <id>fspinazzi</id>
- <email>f.s...@ma...</email>
- <organization>Master House S.r.l</organization>
- <roles>
- <role>Java Developer (inactive)</role>
- <!-- <role>DB2 Contributor</role> -->
- </roles>
- </developer>
- <developer>
- <name>Timothy J. Ruppert</name>
- <id>zieggy</id>
- <roles>
- <role>Java Developer (inactive)</role>
- <!-- <role>Original Ant Task Contributor</role> -->
- </roles>
- </developer>
- </developers>
-
- <contributors>
- <contributor>
- <name>Klas Axel</name>
- <roles>
- <role>HsqldbDataTypeFactory</role>
- </roles>
- </contributor>
- <contributor>
- <name>Erik Price</name>
- <roles>
- <role>DatabaseSequenceOperation</role>
- </roles>
- </contributor>
- <contributor>
- <name>Jeremy Stein</name>
- <roles>
- <role>InsertIndentityOperation</role>
- </roles>
- </contributor>
- <contributor>
- <name>Keven Kizer</name>
- <roles>
- <role>Early guinea pig</role>
- </roles>
- </contributor>
- <contributor>
- <name>Mike Bresnahan</name>
- <roles>
- <role>DbUnit evangelist</role>
- </roles>
- </contributor>
- <contributor>
- <name>Andres Almiray</name>
- <email>aal...@us...</email>
- <roles>
- <role>IDatabaseTester creator</role>
- </roles>
- </contributor>
- </contributors>
-
-
- <dependencies>
-
- <!--
- TODO: check which dependencies could marked as optional. For
- instance, ant is optional because it's only necessary for the
- dbunit Ant tasks.
- -->
-
- <!-- TODO: add exclusion for dependencies that include xerces/xalan -->
-
- <!-- LOGGING -->
- <!-- NOTE: must list slf4j first to override other logger frameworks -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4jVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4jVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logbackVersion}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.5.4</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>3.2-FINAL</version>
- <exclusions>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-testutil</artifactId>
- <version>1.7.0</version>
- <optional>true</optional>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit-addons</groupId>
- <artifactId>junit-addons</artifactId>
- <version>1.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-core</artifactId>
- <version>0.07</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>mockmaker</groupId>
- <artifactId>mmmockobjects</artifactId>
- <version>1.12.0</version>
- <scope>test</scope>
- </dependency>
- <!-- TODO: check why follow dependency is necessary -->
- <dependency>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-jdk1.3</artifactId>
- <version>0.07</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.1.113</version>
- <!-- Note that the 1.1.113 version is the last one officially built with JDK 1.4 -->
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>gsbase</groupId>
- <artifactId>gsbase</artifactId>
- <version>2.0.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/Abstract*.java</exclude>
- </excludes>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <systemProperties>
- <property>
- <name>dbunit.profile</name>
- <value>${dbunit.profile}</value>
- </property>
- <property>
- <name>dbunit.profile.driverClass</name>
- <value>${dbunit.profile.driverClass}</value>
- </property>
- <property>
- <name>dbunit.profile.url</name>
- <value>${dbunit.profile.url}</value>
- </property>
- <property>
- <name>dbunit.profile.schema</name>
- <value>${dbunit.profile.schema}</value>
- </property>
- <property>
- <name>dbunit.profile.user</name>
- <value>${dbunit.profile.user}</value>
- </property>
- <property>
- <name>dbunit.profile.password</name>
- <value>${dbunit.profile.password}</value>
- </property>
- <property>
- <name>dbunit.profile.unsupportedFeatures</name>
- <value>${dbunit.profile.unsupportedFeatures}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>failsafe-maven-plugin</artifactId>
- <version>2.4.3-alpha-1</version>
- <configuration>
- <encoding>UTF-8</encoding>
- <systemProperties>
- <property>
- <name>dbunit.profile</name>
- <value>${dbunit.profile}</value>
- </property>
- <property>
- <name>dbunit.profile.driverClass</name>
- <value>${dbunit.profile.driverClass}</value>
- </property>
- <property>
- <name>dbunit.profile.url</name>
- <value>${dbunit.profile.url}</value>
- </property>
- <property>
- <name>dbunit.profile.schema</name>
- <value>${dbunit.profile.schema}</value>
- </property>
- <property>
- <name>dbunit.profile.user</name>
- <value>${dbunit.profile.user}</value>
- </property>
- <property>
- <name>dbunit.profile.password</name>
- <value>${dbunit.profile.password}</value>
- </property>
- <property>
- <name>dbunit.profile.unsupportedFeatures</name>
- <value>${dbunit.profile.unsupportedFeatures}</value>
- </property>
- </systemProperties>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${compileSource}</source>
- <target>${compileSource}</target>
- <compilerVersion>${compileSource}</compilerVersion>
- <!--
- TODO somehow we must ensure that the used rt.jar is really a
- 1.4 and not higher, also for continuous integration
- -->
- <!--<executable>${JAVA_1_4_HOME}/bin/javac</executable>-->
- <debug>true</debug>
- <fork>true</fork>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
- <configuration>
- <goals>javadoc:javadoc site changes:announcement-generate assembly:assembly javadoc:jar source:jar deploy</goals>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <includes>
- <include>/LICENSE.txt</include>
- <include>**</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>sql-maven-plugin</artifactId>
- <version>1.3</version>
- <configuration>
- <driver>${dbunit.profile.driverClass}</driver>
- <url>${dbunit.profile.url}</url>
- <username>${dbunit.profile.user}</username>
- <password>${dbunit.profile.password}</password>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.1</version>
- </dependency>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>10.2.0.4.0</version>
- </dependency>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.4-701.jdbc3</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.4.1.3</version>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.1.118</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>sql-ddl</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <srcFiles>
- <srcFile>src/test/resources/sql/${dbunit.profile.ddl}</srcFile>
- </srcFiles>
- <onError>continue</onError>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <reportSets>
- <reportSet>
- <id>tests</id>
- <reports>
- <report>report-only</report>
- </reports>
- <configuration>
- <outputName>surefire-report</outputName>
- <reportsDirectories>
- <reportsDirectory>target/surefire-reports</reportsDirectory>
- </reportsDirectories>
- </configuration>
- </reportSet>
- <reportSet>
- <id>integration-tests</id>
- <reports>
- <report>report-only</report>
- </reports>
- <configuration>
- <outputName>failsafe-report</outputName>
- <reportsDirectories>
- <reportsDirectory>target/failsafe-reports</reportsDirectory>
- </reportsDirectories>
- </configuration>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <!--
- <plugin> <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId> </plugin>
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
- <argLine>-Xmx512m -Xms128m</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <linkXref>true</linkXref>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>${compileSource}</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <quiet>true</quiet>
- <stylesheet>maven</stylesheet>
- <tags>
- <tag>
- <name>TODO</name>
- <placement>a</placement>
- <head>To do:</head>
- </tag>
- </tags>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <smtpHost>localhost</smtpHost>
- <smtpPort implementation="java.lang.Integer">25</smtpPort>
- <introduction>If you are reading this, the maintainer forgot to describe what's the purpose of this release!!!</introduction>
- <toAddresses>
- <toAddress implementation="java.lang.String">dbu...@li...</toAddress>
- <toAddress implementation="java.lang.String">dbu...@li...</toAddress>
- </toAddresses>
- <urlDownload>http://sourceforge.net/project/showfiles.php?group_id=47439</urlDownload>
- <issueLinkTemplate><![CDATA[http://sourceforge.net/support/tracker.php?aid=%ISSUE%]]></issueLinkTemplate>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- <report>license</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
- <distributionManagement>
- <snapshotRepository>
- <id>sourceforge</id>
- <name>SourceForge Snapshots Repo</name>
- <url>scp://shell.sourceforge.net/home/groups/d/db/dbunit/htdocs/repo/snapshots</url>
- </snapshotRepository>
- <repository>
- <id>sourceforge</id>
- <name>SourceForge Releases Repo</name>
- <url>scp://shell.sourceforge.net/home/groups/d/db/dbunit/htdocs/repo/official</url>
- </repository>
- <site>
- <id>sourceforge</id>
- <url>scp://shell.sourceforge.net/home/groups/d/db/dbunit/htdocs</url>
- </site>
- </distributionManagement>
-
- <profiles>
- <profile>
- <id>official</id>
- <!-- JH_TODO: it would be better to "chain" these from the default profile. But it appears this isn't possible with Maven. -->
- <properties>
- <dbunit.profile>hsqldb</dbunit.profile>
- <dbunit.profile.driverClass>org.hsqldb.jdbcDriver</dbunit.profile.driverClass>
- <dbunit.profile.url>jdbc:hsqldb:mem:.</dbunit.profile.url>
- <dbunit.profile.schema>PUBLIC</dbunit.profile.schema>
- <dbunit.profile.user>sa</dbunit.profile.user>
- <dbunit.profile.password></dbunit.profile.password>
- <dbunit.profile.unsupportedFeatures>BLOB,CLOB,SCROLLABLE_RESULTSET,INSERT_IDENTITY,TRUNCATE_TABLE,SDO_GEOMETRY</dbunit.profile.unsupportedFeatures>
- <dbunit.profile.ddl>empty.sql</dbunit.profile.ddl> <!-- DDL in HypersonicEnvironment -->
- </properties>
- <dependencies>
- <dependency>
- <groupId>javax.sql</groupId>
- <artifactId>jdbc-stdext</artifactId>
- <version>2.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>10.2.0.4.0</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${compileSource}</source>
- <target>${compileSource}</target>
- <compilerVersion>${compileSource}</compilerVersion>
- <executable>${JAVA_1_4_HOME}/bin/javac</executable>
- <debug>true</debug>
- <fork>true</fork>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changelog-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- <profile>
- <id>oracle-default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>10.2.0.4.0</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hsqldb</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <dbunit.profile>hsqldb</dbunit.profile>
- <dbunit.profile.driverClass>org.hsqldb.jdbcDriver</dbunit.profile.driverClass>
- <dbunit.profile.url>jdbc:hsqldb:mem:.</dbunit.profile.url>
- <dbunit.profile.schema>PUBLIC</dbunit.profile.schema>
- <dbunit.profile.user>sa</dbunit.profile.user>
- <dbunit.profile.password></dbunit.profile.password>
- <dbunit.profile.unsupportedFeatures>BLOB,CLOB,SCROLLABLE_RESULTSET,INSERT_IDENTITY,TRUNCATE_TABLE,SDO_GEOMETRY</dbunit.profile.unsupportedFeatures>
- <dbunit.profile.ddl>empty.sql</dbunit.profile.ddl> <!-- DDL in HypersonicEnvironment -->
- </properties>
- </profile>
- <!-- "original" OracleDataTypeFactory (NOT 10g) with Oracle 10 JDBC driver for Java 1.4 -->
- <profile>
- <id>oracle-ojdbc14</id>
- <properties>
- <dbunit.profile>oracle</dbunit.profile>
- <dbunit.profile.driverClass>oracle.jdbc.OracleDriver</dbunit.profile.driverClass>
- <dbunit.profile.url>jdbc:oracle:thin:@localhost:1521:ORCL</dbunit.profile.url>
- <dbunit.profile.schema>DBUNIT</dbunit.profile.schema>
- <dbunit.profile.user>dbunit</dbunit.profile.user>
- <dbunit.profile.password>dbunit</dbunit.profile.password>
- <dbunit.profile.unsupportedFeatures>INSERT_IDENTITY,SCROLLABLE_RESULTSET</dbunit.profile.unsupportedFeatures>
- <dbunit.profile.ddl>oracle.sql</dbunit.profile.ddl>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>10.2.0.4.0</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </profile>
- <!-- "original" OracleDataTypeFactory (NOT 10g) with Oracle 11 JDBC driver for Java 6 -->
- <profile>
- <id>oracle-ojdbc6</id>
- <properties>
- <dbunit.profile>oracle</dbunit.profile>
- <dbunit.profile.driverClass>oracle.jdbc.OracleDriver</dbunit.profile.driverClass>
- <dbunit.profile.url>jdbc:oracle:thin:@localhost:1521:ORCL</dbunit.profile.url>
- <dbunit.profile.schema>DBUNIT</dbunit.profile.schema>
- <dbunit.profile.user>dbunit</dbunit.profile.user>
- <dbunit.profile.password>dbunit</dbunit.profile.password>
- <dbunit.profile.unsupportedFeatures>INSERT_IDENTITY,SCROLLABLE_RESULTSET</dbunit.profile.unsupportedFeatures>
- <dbunit.profile.ddl>oracle.sql</dbunit.profile.ddl>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>11.1.0.7.0</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </profile>
- <!-- "newer" Oracle10DataTypeFactory with Oracle 10 JDBC driver for Java 1.4 -->
- <profile>
- <id>oracle10-ojdbc14</id>
- <properties>
- <dbunit.profile>oracle10</dbunit.profile>
- <dbunit.profile.driverClass>oracle.jdbc.OracleDriver</dbunit.profile.driverClass>
- <dbunit.profile.url>jdbc:oracle:thin:@localhost:1521:ORCL</dbunit.profile.url>
- <dbunit.profile.schema>DBUNIT</dbunit.profile.schema>
- <dbunit.profile.user>dbunit</dbunit.profile.user>
- <dbunit.profile.password>dbunit</dbunit.profile.password>
- <dbunit.profile.unsupportedFeatures>INSERT_IDENTITY,SCROLLABLE_RESULTSET</dbunit.profile.unsupportedFeatures>
- <dbunit.profile.ddl>oracle.sql</dbunit.profile.ddl>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>10.2.0.4.0</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </profile>
- <!-- "newer" Oracle10DataTypeFactory with Oracle 11 JDBC driver for Java 6 -->
- <profile>
- <id>oracle10-ojdbc6</id>
- <properties>
- <dbunit.profile>oracle10</dbunit.profile>
- <dbunit.profile.driverClass>oracle.jdbc.OracleDriver</dbunit.profile.driverClass>
- <dbunit.profile.url>jdbc:oracle:thin:@localhost:1521:ORCL</dbunit.profile.url>
- <dbunit.profile.schema>DBUNIT</dbunit.profile.schema>
- <dbunit.profile.user>dbunit</dbunit.profile.user>
- <dbunit.profile.password>dbunit</dbunit.profile.password>
- <dbunit.profile.unsupportedFeatures>INSERT_IDENTITY,SCROLLABLE_RESULTSET</dbunit.profile.unsupportedFeatures>
- <dbunit.profile.ddl>oracle.sql</dbunit.profile.ddl>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>11.1.0.7.0</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>postgresql</id>
- <properties>
- <dbunit.profile>postgresql</dbunit.profile>
- <dbunit.profile.driverClass>org.postgresql.Driver</dbunit.profile.driverClass>
- <dbunit.profile.url>jdbc:postgresql://localhost/dbunit</dbunit.profile.url>
- <dbunit.profile.schema>public</dbunit.profile.schema>
- <dbunit.profile.user>dbunit</dbunit.profile.user>
- <dbunit.profile.password>dbunit</dbunit.profile.password>
- <dbunit.profile.unsupportedFeatures>INSERT_IDENTITY,CLOB,BLOB,SCROLLABLE_RESULTSET,SDO_GEOMETRY</dbunit.profile.unsupportedFeatures>
- <dbunit.profile.ddl>postgresql.sql</dbunit.profile.ddl>
- </properties>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.4-701.jdbc3</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>mysql</id>
- <properties>
- <dbunit.profile>mysql</dbunit.profile>
- <dbunit.profile.driverClass>com.mysql.jdbc.Driver</dbunit.profile.driverClass>
- <dbunit.profile.url>jdbc:mysql://localhost:3306/dbunit</dbunit.profile.url>
- <dbunit.profile.schema />
- <dbunit.profile.user>dbunit</dbunit.profile.user>
- <dbunit.profile.password>dbunit</dbunit.profile.password>
- <dbunit.profile.unsupportedFeatures>BLOB,CLOB,SCROLLABLE_RESULTSET,INSERT_IDENTITY,SDO_GEOMETRY</dbunit.profile.unsupportedFeatures>
- <dbunit.profile.ddl>mysql.sql</dbunit.profile.ddl>
- </properties>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.6</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>mssql</id>
- <properties>
- <dbunit.profile>mssql</dbunit.profile>
- <dbunit.profile.driverClass>com.microsoft.jdbc.sqlserver.SQLServerDriver</dbunit.profile.driverClass>
- <dbunit.profile.url>jdbc:microsoft:sqlserver://localhost\\dbunit:1433;DatabaseName=dbunit;SelectMethod=cursor</dbunit.profile.url>
- <dbunit.profile.schema>dbo</dbunit.profile.schema>
- <dbunit.profile.user>dbunit</dbunit.profile.user>
- <dbunit.profile.password>dbunit</dbunit.profile.password>
- <dbunit.profile.unsupportedFeatures>BLOB,CLOB,SCROLLABLE_RESULTSET,SDO_GEOMETRY</dbunit.profile.unsupportedFeatures>
- <dbunit.profile.ddl>mssql.sql</dbunit.profile.ddl>
- </properties>
- <!-- JH_TODO: mssql dependencies -->
- </profile>
- <profile>
- <id>db2</id>
- <properties>
- <dbunit.profile>db2</dbunit.profile>
- <dbunit.profile.driverClass>TODO</dbunit.profile.driverClass>
- <dbunit.profile.url>TODO</dbunit.profile.url>
- <dbunit.profile.schema>TODO</dbunit.profile.schema>
- <dbunit.profile.user>TODO</dbunit.profile.user>
- <dbunit.profile.password>TODO</dbunit.profile.password>
- <dbunit.profile.unsupportedFeatures>TODO</dbunit.profile.unsupportedFeatures>
- <dbunit.profile.ddl>db2xml.sql</dbunit.profile.ddl>
- </properties>
- <!-- JH_TODO: db2 dependencies -->
- </profile>
- <profile>
- <id>derby</id>
- <properties>
- <dbunit.profile>derby</dbunit.profile>
- <dbunit.profile.driverClass>org.apache.derby.jdbc.EmbeddedDriver</dbunit.profile.driverClass>
- <dbunit.profile.url>jdbc:derby:target/derby_db;create=true</dbunit.profile.url>
- <dbunit.profile.schema>APP</dbunit.profile.schema>
- <dbunit.profile.user>APP</dbunit.profile.user>
- <dbunit.profile.password>APP</dbunit.profile.password>
- <dbunit.profile.unsupportedFeatures>VARBINARY,BLOB,CLOB,TRANSACTION,SCROLLABLE_RESULTSET,INSERT_IDENTITY,TRUNCATE_TABLE,SDO_GEOMETRY</dbunit.profile.unsupportedFeatures>
- <dbunit.profile.ddl>empty.sql</dbunit.profile.ddl> <!-- DDL in DerbyEnvironment -->
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.4.1.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>h2</id>
- <properties>
- <dbunit.profile>h2</dbunit.profile>
- <dbunit.profile.driverClass>org.h2.Driver</dbunit.profile.driverClass>
- <dbunit.profile.url>jdbc:h2:target/h2/test</dbunit.profile.url>
- <dbunit.profile.schema>PUBLIC</dbunit.profile.schema>
- <dbunit.profile.user>sa</dbunit.profile.user>
- <dbunit.profile.password />
- <dbunit.profile.unsupportedFeatures>BLOB,CLOB,SCROLLABLE_RESULTSET,INSERT_IDENTITY,TRUNCATE_TABLE,SDO_GEOMETRY</dbunit.profile.unsupportedFeatures>
- <dbunit.profile.ddl>empty.sql</dbunit.profile.ddl> <!-- DDL in H2Environment -->
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.1.118</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>release-sign-artifacts</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.4.9-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>DbUnit Framework</name>
+ <url>http://dbunit.sourceforge.net</url>
+ <inceptionYear>2002</inceptionYear>
+ <description>
+ DbUnit is a JUnit extension (also usable from Ant) targeted for database-driven projects that, among other things, puts your database into a known state between test runs. This is an excellent way to avoid the myriad of problems that can occur when one test case corrupts the database and causes subsequent tests to fail or exacerbate the damage.
+ </description>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License, Version 2.1</name>
+ <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <properties>
+ <compileSource>1.4</compileSource>
+ <checkstyle.excludes>org/dbunit/util/concurrent/*.java</checkstyle.excludes>
+ <logbackVersion>0.9.15</logbackVersion>
+ <slf4jVersion>1.5.6</slf4jVersion>
+ <project.build.sourceEncoding>
+ UTF-8
+ </project.build.sourceEncoding>
+ <project.reporting.outputEncoding>
+ UTF-8
+ </project.reporting.outputEncoding>
+ </properties>
+
+ <scm>
+ <connection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/trunk/dbunit</connection>
+ <developerConnection>scm:svn:https://dbunit.svn.sourceforge.net/svnroot/dbunit/trunk/dbunit</developerConnection>
+ <url>http://dbunit.svn.sourceforge.net/svnroot/dbunit/trunk/dbunit</url>
+ </scm>
+ <issueManagement>
+ <system>SourceForge</system>
+ <url>http://sourceforge.net/tracker/?group_id=47439</url>
+ </issueManagement>
+ <ciManagement>
+ <system>parabuild</system>
+ <url><![CDATA[http://parabuild.viewtier.com:8080/parabuild/index.htm?view=detailed&buildid=30]]></url>
+ <notifiers>
+ <notifier>
+ <type>mail</type>
+ <sendOnError>true</sendOnError>
+ <sendOnFailure>false</sendOnFailure>
+ <sendOnSuccess>false</sendOnSuccess>
+ <sendOnWarning>false</sendOnWarning>
+ <configuration>
+ <address>go...@us...</address>
+ </configuration>
+ </notifier>
+ </notifiers>
+ </ciManagement>
+
+ <mailingLists>
+ <mailingList>
+ <name>DbUnit User List</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-user</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-user</unsubscribe>
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=dbunit-user</archive>
+ </mailingList>
+ <mailingList>
+ <name>DbUnit Developer List</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-developer</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-developer</unsubscribe>
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=dbunit-developer</archive>
+ </mailingList>
+ <mailingList>
+ <name>DbUnit SVN Commit List</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-commit</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/dbunit-commit</unsubscribe>
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=dbunit-commit</archive>
+ </mailingList>
+ </mailingLists>
+
+ <!--
+ - Who are the developers for the project, in order of recent activity.
+ -->
+ <developers>
+ <!--
+ - Note: email of first developer is used by the announcements-email plugin
+ -->
+ <developer>
+ <name>Matthias Gommeringer</name>
+ <id>gommma</id>
+ <email>go...@us...</email>
+ <roles>
+ <role>Java Developer (very active)</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>John Hurst</name>
+ <id>jbhurst</id>
+ <email>jb...@us...</email>
+ <roles>
+ <role>Java Developer (very active)</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Jeff Jensen</name>
+ <id>jeffjensen</id>
+ <email>jef...@us...</email>
+ <roles>
+ <role>Java Developer (active)</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Roberto Lo Giacco</name>
+ <id>rlogiacco</id>
+ <email>rlo...@us...</email>
+ <organization>SmartLab</organization>
+ <roles>
+ <role>Java Developer (active)</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Felipe Leme</name>
+ <id>felipeal</id>
+ <email>db...@fe...</email>
+ <organization>GoldenGate Software</organization>
+ <timezone>-8</timezone>
+ <roles>
+ <role>Java Developer (mostly inactive :-)</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>David Eric Pugh</name>
+ <id>dep4b</id>
+ <email>ep...@op...</email>
+ <organization>OpenSource Connections</organization>
+ <roles>
+ <role>Java Developer (inactive)</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Sebastien Le Callonnec</name>
+ <id>slecallonnec</id>
+ <email>sle...@us...</email>
+ <roles>
+ <role>Java Developer (inactive)</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Manuel Laflamme</name>
+ <id>mlaflamm</id>
+ <organization>Oz Communication</organization>
+ <roles>
+ <role>Project Founder (inactive)</role>
+ <!-- <role>Java Developer</role> -->
+ </roles>
+ </developer>
+ <developer>
+ <name>Benjamin Cox</name>
+ <id>bdrum</id>
+ <roles>
+ <role>Java Developer (inactive)</role>
+ <!-- <role>Original Ant Task Contributor</role> -->
+ </roles>
+ </developer>
+ <developer>
+ <name>Federico Spinazzi</name>
+ <id>fspinazzi</id>
+ <email>f.s...@ma...</email>
+ <organization>Master House S.r.l</organization>
+ <roles>
+ <role>Java Developer (inactive)</role>
+ <!-- <role>DB2 Contributor</role> -->
+ </roles>
+ </developer>
+ <developer>
+ <name>Timothy J. Ruppert</name>
+ <id>zieggy</id>
+ <roles>
+ <role>Java Developer (inactive)</role>
+ <!-- <role>Original Ant Task Contributor</role> -->
+ </roles>
+ </developer>
+ </developers>
+
+ <contributors>
+ <contributor>
+ <name>Klas Axel</name>
+ <roles>
+ <role>HsqldbDataTypeFactory</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Erik Price</name>
+ <roles>
+ <role>DatabaseSequenceOperation</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Jeremy Stein</name>
+ <roles>
+ <role>InsertIndentityOperation</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Keven Kizer</name>
+ <roles>
+ <role>Early guinea pig</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Mike Bresnahan</name>
+ <roles>
+ <role>DbUnit evangelist</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Andres Almiray</name>
+ <email>aal...@us...</email>
+ <roles>
+ <role>IDatabaseTester creator</role>
+ </roles>
+ </contributor>
+ </contributors>
+
+
+ <dependencies>
+
+ <!--
+ TODO: check which dependencies could marked as optional. For
+ instance, ant is optional because it's only necessary for the
+ dbunit Ant tasks.
+ -->
+
+ <!-- TODO: add exclusion for dependencies that include xerces/xalan -->
+
+ <!-- LOGGING -->
+ <!-- NOTE: must list slf4j first to override other logger frameworks -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4jVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4jVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logbackVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.5.4</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.2-FINAL</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-testutil</artifactId>
+ <version>1.7.0</version>
+ <optional>true</optional>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit-addons</groupId>
+ <artifactId>junit-addons</artifactId>
+ <version>1.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-core</artifactId>
+ <version>0.07</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>mockmaker</groupId>
+ <artifactId>mmmockobjects</artifactId>
+ <version>1.12.0</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- TODO: check why follow dependency is necessary -->
+ <dependency>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-jdk1.3</artifactId>
+ <version>0.07</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.1.113</version>
+ <!-- Note that the 1.1.113 version is the last one officially built with JDK 1.4 -->
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>gsbase</groupId>
+ <artifactId>gsbase</artifactId>
+ <version>2.0.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <systemProperties>
+ <property>
+ <name>dbunit.profile</name>
+ <value>${dbunit.profile}</value>
+ </property>
+ <property>
+ <name>dbunit.profile.driverClass</name>
+ <value>${dbunit.profile.driverClass}</value>
+ </property>
+ <property>
+ <name>dbunit.profile.url</name>
+ <value>${dbunit.profile.url}</value>
+ </property>
+ <property>
+ <name>dbunit.profile.schema</name>
+ <value>${dbunit.profile.schema}</value>
+ </property>
+ <property>
+ <name>dbunit.profile.user</name>
+ <value>${dbunit.profile.user}</value>
+ </property>
+ <property>
+ <name>dbunit.profile.password</name>
+ <value>${dbunit.profile.password}</value>
+ </property>
+ <property>
+ <name>dbunit.profile.unsupportedFeatures</name>
+ <value>${dbunit.profile.unsupportedFeatures}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>failsafe-maven-plugin</artifactId>
+ <version>2.4.3-alpha-1</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <systemProperties>
+ <property>
+ <name>dbunit.profile</name>
+ <value>${dbunit.profile}</value>
+ </property>
+ <property>
+ <name>dbunit.profile.driverClass</name>
+ <value>${dbunit.profile.driverClass}</value>
+ </property>
+ <property>
+ <name>dbunit.profile.url</name>
+ <value>${dbunit.profile.url}</value>
+ </property>
+ <property>
+ <name>dbunit.profile.schema</name>
+ <value>${dbunit.profile.schema}</value>
+ </property>
+ <property>
+ <name>dbunit.profile.user</name>
+ <value>${dbunit.profile.user}</value>
+ </property>
+ <property>
+ <name>dbunit.profile.password</name>
+ <value>${dbunit.profile.password}</value>
+ </property>
+ <property>
+ <name>dbunit.profile.unsupportedFeatures</name>
+ <value>${dbunit.profile.unsupportedFeatures}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${compileSource}</source>
+ <target>${compileSource}</target>
+ <compilerVersion>${compileSource}</compilerVersion>
+ <!--
+ TODO somehow we must ensure that the used rt.jar is really a
+ 1.4 and not higher, also for continuous integration
+ -->
+ <!--<executable>${JAVA_1_4_HOME}/bin/javac</executable>-->
+ <debug>true</debug>
+ <fork>true</fork>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-9</version>
+ <configuration>
+ <goals>javadoc:javadoc site changes:announcement-generate assembly:assembly javadoc:jar source:jar deploy</goals>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>/LICENSE.txt</include>
+ <include>**</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <version>1.3</version>
+ <configuration>
+ <driver>${dbunit.profile.driverClass}</driver>
+ <url>${dbunit.profile.url}</url>
+ <username>${dbunit.profile.user}</username>
+ <password>${dbunit.profile.password}</password>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <version>10.2.0.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.4-701.jdbc3</version>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.4.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.1.118</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>sql-ddl</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <srcFiles>
+ <srcFile>src/test/resources/sql/${dbunit.profile.ddl}</srcFile>
+ </srcFiles>
+ <onError>continue</onError>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <id>tests</id>
+ <reports>
+ <report>report-only</report>
+ </reports>
+ <configuration>
+ <outputName>surefire-report</outputName>
+ <reportsDirectories>
+ <reportsDirectory>target/surefire-reports</reportsDirectory>
+ </reportsDirectories>
+ </configuration>
+ </reportSet>
+ <reportSet>
+ <id>integration-tests</id>
+ <reports>
+ <report>report-only</report>
+ </reports>
+ <configuration>
+ <outputName>failsafe-report</outputName>
+ <reportsDirectories>
+ <reportsDirectory>target/failsafe-reports</reportsDirectory>
+ </reportsDirectories>
+ </configuration>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <!--
+ <plugin> <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId> </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <argLine>-Xmx512m -Xms128m</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <linkXref>true</linkXref>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>${compileSource}</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ <stylesheet>maven</stylesheet>
+ <tags>
+ <tag>
+ <name>TODO</name>
+ <placement>a</placement>
+ <head>To do:</head>
+ </tag>
+ </tags>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <smtpHost>localhost</smtpHost>
+ <smtpPort implementation="java.lang.Integer">25</smtpPort>
+ <introduction>If you are reading this, the maintainer forgot to describe what's the purpose of this release!!!</introduction>
+ <toAddresses>
+ <toAddress implementation="java.lang.String">dbu...@li...</toAddress>
+ <toAddress implementation="java.lang.String">dbu...@li...</toAddress>
+ </toAddresses>
+ <urlDownload>http://sourceforge.net/project/showfiles.php?group_id=47439</urlDownload>
+ <issueLinkTemplate><![CDATA[http://sourceforge.net/support/tracker.php?aid=%ISSUE%]]></issueLinkTemplate>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ <report>license</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ ...
[truncated message content] |
|
From: <rlo...@us...> - 2010-09-01 12:55:47
|
Revision: 1199
http://dbunit.svn.sourceforge.net/dbunit/?rev=1199&view=rev
Author: rlogiacco
Date: 2010-09-01 12:55:41 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
[maven-scm] copy for tag dbunit-2.4.8
Added Paths:
-----------
tags/dbunit-2.4.8/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rlo...@us...> - 2010-09-01 12:55:00
|
Revision: 1198
http://dbunit.svn.sourceforge.net/dbunit/?rev=1198&view=rev
Author: rlogiacco
Date: 2010-09-01 12:54:54 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
[maven-release-plugin] prepare release dbunit-2.4.8
Modified Paths:
--------------
trunk/dbunit/pom.xml
Modified: trunk/dbunit/pom.xml
===================================================================
--- trunk/dbunit/pom.xml 2010-09-01 12:54:27 UTC (rev 1197)
+++ trunk/dbunit/pom.xml 2010-09-01 12:54:54 UTC (rev 1198)
@@ -599,7 +599,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <configLocation>checkstyle.xml</configLocation>
+ <configLocation>${basedir}/checkstyle.xml</configLocation>
<argLine>-Xmx512m -Xms128m</argLine>
</configuration>
</plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rlo...@us...> - 2010-09-01 12:54:33
|
Revision: 1197
http://dbunit.svn.sourceforge.net/dbunit/?rev=1197&view=rev
Author: rlogiacco
Date: 2010-09-01 12:54:27 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Removed Paths:
-------------
branches/dbunit-3.x/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rlo...@us...> - 2010-09-01 11:17:30
|
Revision: 1196
http://dbunit.svn.sourceforge.net/dbunit/?rev=1196&view=rev
Author: rlogiacco
Date: 2010-09-01 11:17:24 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Added Paths:
-----------
branches/dbunit-3.x/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2010-08-17 22:08:23
|
Revision: 1195
http://dbunit.svn.sourceforge.net/dbunit/?rev=1195&view=rev
Author: jeffjensen
Date: 2010-08-17 22:08:17 +0000 (Tue, 17 Aug 2010)
Log Message:
-----------
Enable skipping verifyData in postTest() when necessary to prevent masking original test failure cause with verify data failures.
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
trunk/dbunit/src/main/java/org/dbunit/PrepAndExpectedTestCase.java
trunk/dbunit/src/test/java/org/dbunit/DefaultPrepAndExpectedTestCaseTest.java
Modified: trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2010-07-10 01:06:11 UTC (rev 1194)
+++ trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2010-08-17 22:08:17 UTC (rev 1195)
@@ -163,9 +163,9 @@
* @since 2.4.8
*/
public class DefaultPrepAndExpectedTestCase extends DBTestCase implements
- PrepAndExpectedTestCase {
+PrepAndExpectedTestCase {
private final Logger LOG =
- LoggerFactory.getLogger(DefaultPrepAndExpectedTestCase.class);
+ LoggerFactory.getLogger(DefaultPrepAndExpectedTestCase.class);
private IDatabaseTester databaseTester;
private DataFileLoader dataFileLoader;
@@ -223,7 +223,7 @@
*/
public void configureTest(VerifyTableDefinition[] tables,
String[] prepDataFiles, String[] expectedDataFiles)
- throws Exception {
+ throws Exception {
LOG.debug("configureTest: saving instance variables");
this.prepDs = makeCompositeDataSet(prepDataFiles);
this.expectedDs = makeCompositeDataSet(expectedDataFiles);
@@ -250,8 +250,17 @@
* {@inheritDoc}
*/
public void postTest() throws Exception {
+ postTest(true);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void postTest(boolean verifyData) throws Exception {
try {
- verifyData();
+ if (verifyData) {
+ verifyData();
+ }
} finally {
// it is deliberate to have cleanup exceptions shadow verify
// failures so user knows db is probably in unknown state (for
@@ -273,7 +282,7 @@
if (databaseTester == null) {
throw new IllegalStateException(
- "databaseTester is null; must configure or set it first");
+ "databaseTester is null; must configure or set it first");
}
databaseTester.setDataSet(dataset);
@@ -291,7 +300,7 @@
LOG.debug("setupData: setting prep dataset and inserting rows");
if (databaseTester == null) {
throw new IllegalStateException(
- "databaseTester is null; must configure or set it first");
+ "databaseTester is null; must configure or set it first");
}
databaseTester.setDataSet(prepDs);
@@ -308,7 +317,7 @@
public void verifyData() throws Exception {
if (databaseTester == null) {
throw new IllegalStateException(
- "databaseTester is null; must configure or set it first");
+ "databaseTester is null; must configure or set it first");
}
IDatabaseConnection connection = databaseTester.getConnection();
@@ -336,8 +345,8 @@
expectedTable = expectedDs.getTable(tableName);
} catch (DataSetException e) {
final String msg =
- "Problem obtaining table '" + tableName
- + "' from expected dataset";
+ "Problem obtaining table '" + tableName
+ + "' from expected dataset";
LOG.error(msg, e);
throw new DataSetException(msg, e);
}
@@ -348,8 +357,8 @@
actualTable = connection.createTable(tableName);
} catch (DataSetException e) {
final String msg =
- "Problem obtaining table '" + tableName
- + "' from actual dataset";
+ "Problem obtaining table '" + tableName
+ + "' from actual dataset";
LOG.error(msg, e);
throw new DataSetException(msg, e);
}
@@ -383,23 +392,23 @@
*/
public void verifyData(ITable expectedTable, ITable actualTable,
String[] excludeColumns, String[] includeColumns)
- throws DatabaseUnitException {
+ throws DatabaseUnitException {
// Filter out the columns from the expected and actual results
LOG.debug("Applying filters to expected table");
ITable expectedFilteredTable =
- applyColumnFilters(expectedTable, excludeColumns,
- includeColumns);
+ applyColumnFilters(expectedTable, excludeColumns,
+ includeColumns);
LOG.debug("Applying filters to actual table");
ITable actualFilteredTable =
- applyColumnFilters(actualTable, excludeColumns, includeColumns);
+ applyColumnFilters(actualTable, excludeColumns, includeColumns);
LOG.debug("Sorting expected table");
SortedTable expectedSortedTable =
- new SortedTable(expectedFilteredTable);
+ new SortedTable(expectedFilteredTable);
LOG.debug("Sorting actual table");
SortedTable actualSortedTable =
- new SortedTable(actualFilteredTable, expectedFilteredTable
- .getTableMetaData());
+ new SortedTable(actualFilteredTable, expectedFilteredTable
+ .getTableMetaData());
LOG.debug("Comparing expected table to actual table");
Assertion.assertEquals(expectedSortedTable, actualSortedTable);
@@ -415,10 +424,10 @@
* On dbUnit errors.
*/
public IDataSet makeCompositeDataSet(String[] dataFiles)
- throws DataSetException {
+ throws DataSetException {
if (dataFileLoader == null) {
throw new IllegalStateException(
- "dataFileLoader is null; must configure or set it first");
+ "dataFileLoader is null; must configure or set it first");
}
int count = dataFiles.length;
@@ -468,8 +477,8 @@
LOG.debug("applyColumnFilters: including columns='{}'",
new Object[] {includeColumns});
filteredTable =
- DefaultColumnFilter.includedColumnsTable(filteredTable,
- includeColumns);
+ DefaultColumnFilter.includedColumnsTable(filteredTable,
+ includeColumns);
}
if (excludeColumns == null || excludeColumns.length == 0) {
@@ -478,8 +487,8 @@
LOG.debug("applyColumnFilters: excluding columns='{}'",
new Object[] {excludeColumns});
filteredTable =
- DefaultColumnFilter.excludedColumnsTable(filteredTable,
- excludeColumns);
+ DefaultColumnFilter.excludedColumnsTable(filteredTable,
+ excludeColumns);
}
return filteredTable;
Modified: trunk/dbunit/src/main/java/org/dbunit/PrepAndExpectedTestCase.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/PrepAndExpectedTestCase.java 2010-07-10 01:06:11 UTC (rev 1194)
+++ trunk/dbunit/src/main/java/org/dbunit/PrepAndExpectedTestCase.java 2010-08-17 22:08:17 UTC (rev 1195)
@@ -68,7 +68,7 @@
String[] expectedDataFiles) throws Exception;
/**
- * Execute post-test steps. Call this method after performing the test
+ * Execute all post-test steps. Call this method after performing the test
* steps.
*
* @throws Exception
@@ -76,6 +76,19 @@
void postTest() throws Exception;
/**
+ * Execute post-test steps. Call this method after performing the test
+ * steps.
+ *
+ * @param verifyData
+ * Specify true to perform verify data steps, false to not.
+ * Useful to specify false when test has failure in progress
+ * (e.g. an exception) and verifying data would fail, masking
+ * original test failure.
+ * @throws Exception
+ */
+ void postTest(boolean verifyData) throws Exception;
+
+ /**
* Cleanup tables specified in prep and expected datasets, using the
* provided databaseTester. See
* {@link org.dbunit.IDatabaseTester#onTearDown()}.
Modified: trunk/dbunit/src/test/java/org/dbunit/DefaultPrepAndExpectedTestCaseTest.java
===================================================================
--- trunk/dbunit/src/test/java/org/dbunit/DefaultPrepAndExpectedTestCaseTest.java 2010-07-10 01:06:11 UTC (rev 1194)
+++ trunk/dbunit/src/test/java/org/dbunit/DefaultPrepAndExpectedTestCaseTest.java 2010-08-17 22:08:17 UTC (rev 1195)
@@ -18,7 +18,7 @@
// JdbcDatabaseTester(driverClass, connectionUrl);
private final DefaultPrepAndExpectedTestCase tc =
- new DefaultPrepAndExpectedTestCase();
+ new DefaultPrepAndExpectedTestCase();
protected void setUp() throws Exception {
super.setUp();
@@ -51,6 +51,10 @@
// TODO implement test
}
+ public void testPostTest_false() {
+ // TODO implement test
+ }
+
public void testSetupData() {
// TODO implement test
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2010-06-06 04:16:12
|
Revision: 1191
http://dbunit.svn.sourceforge.net/dbunit/?rev=1191&view=rev
Author: jeffjensen
Date: 2010-06-06 04:16:05 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Add two debug log statements for troubleshooting help.
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
Modified: trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2010-06-06 00:20:44 UTC (rev 1190)
+++ trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2010-06-06 04:16:05 UTC (rev 1191)
@@ -278,6 +278,7 @@
databaseTester.setDataSet(dataset);
databaseTester.onTearDown();
+ LOG.debug("verifyData: Clean up done");
}
/**
@@ -357,6 +358,7 @@
includeColumns);
}
} finally {
+ LOG.debug("verifyData: Verification done, closing connection");
connection.close();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2010-06-06 00:20:51
|
Revision: 1190
http://dbunit.svn.sourceforge.net/dbunit/?rev=1190&view=rev
Author: jeffjensen
Date: 2010-06-06 00:20:44 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Add toString() to VerifyTableDefinition.java for log messages. Additional logging info to DefaultPrepAndExpectedTestCase.java to help troubleshooting/progress monitoring.
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
trunk/dbunit/src/main/java/org/dbunit/VerifyTableDefinition.java
Modified: trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2010-06-05 22:49:22 UTC (rev 1189)
+++ trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2010-06-06 00:20:44 UTC (rev 1190)
@@ -265,12 +265,17 @@
* {@inheritDoc}
*/
public void cleanupData() throws Exception {
+ IDataSet dataset = new CompositeDataSet(prepDs, expectedDs);
+ String tableNames[] = dataset.getTableNames();
+ int count = tableNames.length;
+ LOG.info("cleanupData: about to clean up {} tables={}", new Integer(
+ count), tableNames);
+
if (databaseTester == null) {
throw new IllegalStateException(
"databaseTester is null; must configure or set it first");
}
- IDataSet dataset = new CompositeDataSet(prepDs, expectedDs);
databaseTester.setDataSet(dataset);
databaseTester.onTearDown();
}
@@ -309,8 +314,8 @@
try {
int count = tableDefs.length;
- LOG.info("verifyData: about to verify {} tables",
- new Integer(count));
+ LOG.info("verifyData: about to verify {} tables={}", new Integer(
+ count), tableDefs);
if (count == 0) {
LOG.warn("No tables to verify;"
+ " no VerifyTableDefinitions specified");
Modified: trunk/dbunit/src/main/java/org/dbunit/VerifyTableDefinition.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/VerifyTableDefinition.java 2010-06-05 22:49:22 UTC (rev 1189)
+++ trunk/dbunit/src/main/java/org/dbunit/VerifyTableDefinition.java 2010-06-06 00:20:44 UTC (rev 1190)
@@ -20,6 +20,8 @@
*/
package org.dbunit;
+import java.util.Arrays;
+
/**
* Defines a database table to verify (assert on data), specifying include and
* exclude column filters.
@@ -88,4 +90,30 @@
public String[] getColumnInclusionFilters() {
return columnInclusionFilters;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString() {
+ String exclusionString = arrayToString(columnExclusionFilters);
+ String inclusionString = arrayToString(columnInclusionFilters);
+
+ StringBuilder sb = new StringBuilder(1000);
+ sb.append("tableName='").append(tableName).append("'");
+ sb.append(", columnExclusionFilters='").append(exclusionString)
+ .append("'");
+ sb.append(", columnInclusionFilters='").append(inclusionString)
+ .append("'");
+ return sb.toString();
+ }
+
+ protected String arrayToString(String[] array) {
+ String string;
+ if (array == null) {
+ string = "";
+ } else {
+ string = Arrays.toString(array);
+ }
+ return string;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2010-06-05 22:49:28
|
Revision: 1189
http://dbunit.svn.sourceforge.net/dbunit/?rev=1189&view=rev
Author: jeffjensen
Date: 2010-06-05 22:49:22 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Minor logging adds to help troubleshooting.
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/database/DatabaseDataSet.java
Modified: trunk/dbunit/src/main/java/org/dbunit/database/DatabaseDataSet.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/database/DatabaseDataSet.java 2010-06-04 16:36:35 UTC (rev 1188)
+++ trunk/dbunit/src/main/java/org/dbunit/database/DatabaseDataSet.java 2010-06-05 22:49:22 UTC (rev 1189)
@@ -61,7 +61,7 @@
private final IDatabaseConnection _connection;
private OrderedTableNameMap _tableMap = null;
-
+
private final ITableFilterSimple _tableFilter;
private final ITableFilterSimple _oracleRecycleBinTableFilter;
@@ -72,10 +72,10 @@
*/
DatabaseDataSet(IDatabaseConnection connection) throws SQLException
{
- this(connection, connection.getConfig().getFeature(DatabaseConfig.FEATURE_CASE_SENSITIVE_TABLE_NAMES));
+ this(connection, connection.getConfig().getFeature(DatabaseConfig.FEATURE_CASE_SENSITIVE_TABLE_NAMES));
}
-
+
/**
* Creates a new database data set
* @param connection The database connection
@@ -96,13 +96,13 @@
* @throws SQLException
* @since 2.4.3
*/
- public DatabaseDataSet(IDatabaseConnection connection, boolean caseSensitiveTableNames, ITableFilterSimple tableFilter)
+ public DatabaseDataSet(IDatabaseConnection connection, boolean caseSensitiveTableNames, ITableFilterSimple tableFilter)
throws SQLException
{
super(caseSensitiveTableNames);
if (connection == null) {
throw new NullPointerException(
- "The parameter 'connection' must not be null");
+ "The parameter 'connection' must not be null");
}
_connection = connection;
_tableFilter = tableFilter;
@@ -112,13 +112,13 @@
static String getSelectStatement(String schema, ITableMetaData metaData, String escapePattern)
- throws DataSetException
+ throws DataSetException
{
- if (logger.isDebugEnabled())
- {
- logger.debug("getSelectStatement(schema={}, metaData={}, escapePattern={}) - start",
- new Object[] { schema, metaData, escapePattern });
- }
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("getSelectStatement(schema={}, metaData={}, escapePattern={}) - start",
+ new Object[] { schema, metaData, escapePattern });
+ }
Column[] columns = metaData.getColumns();
Column[] primaryKeys = metaData.getPrimaryKeys();
@@ -127,7 +127,7 @@
throw new DatabaseUnitRuntimeException("At least one column is required to build a valid select statement. "+
"Cannot load data for " + metaData);
}
-
+
// select
StringBuffer sqlBuffer = new StringBuffer(128);
sqlBuffer.append("select ");
@@ -179,31 +179,34 @@
try
{
- logger.debug("Initializing the data set from the database...");
+ logger.debug("Initializing the data set from the database...");
- Connection jdbcConnection = _connection.getConnection();
+ Connection jdbcConnection = _connection.getConnection();
DatabaseMetaData databaseMetaData = jdbcConnection.getMetaData();
String schema = _connection.getSchema();
-
+
if(SQLHelper.isSybaseDb(jdbcConnection.getMetaData()) && !jdbcConnection.getMetaData().getUserName().equals(schema) ){
logger.warn("For sybase the schema name should be equal to the user name. " +
- "Otherwise the DatabaseMetaData#getTables() method might not return any columns. " +
- "See dbunit tracker #1628896 and http://issues.apache.org/jira/browse/TORQUE-40?page=all");
+ "Otherwise the DatabaseMetaData#getTables() method might not return any columns. " +
+ "See dbunit tracker #1628896 and http://issues.apache.org/jira/browse/TORQUE-40?page=all");
}
-
+
DatabaseConfig config = _connection.getConfig();
String[] tableType = (String[])config.getProperty(DatabaseConfig.PROPERTY_TABLE_TYPE);
IMetadataHandler metadataHandler = (IMetadataHandler) config.getProperty(DatabaseConfig.PROPERTY_METADATA_HANDLER);
ResultSet resultSet = metadataHandler.getTables(databaseMetaData, schema, tableType);
-
+
if(logger.isDebugEnabled())
+ {
logger.debug(SQLHelper.getDatabaseInfo(jdbcConnection.getMetaData()));
-
+ logger.debug("metadata resultset={}", resultSet);
+ }
+
try
{
- OrderedTableNameMap tableMap = super.createTableNameMap();
+ OrderedTableNameMap tableMap = super.createTableNameMap();
while (resultSet.next())
{
String schemaName = metadataHandler.getSchema(resultSet);
@@ -219,8 +222,8 @@
logger.debug("Skipping oracle recycle bin table '{}'", tableName);
continue;
}
-
-
+
+
QualifiedTableName qualifiedTableName = new QualifiedTableName(tableName, schemaName);
tableName = qualifiedTableName.getQualifiedNameIfEnabled(config);
@@ -245,10 +248,12 @@
// AbstractDataSet class
protected ITableIterator createIterator(boolean reversed)
- throws DataSetException
+ throws DataSetException
{
- if(logger.isDebugEnabled())
- logger.debug("createIterator(reversed={}) - start", String.valueOf(reversed));
+ if(logger.isDebugEnabled())
+ {
+ logger.debug("createIterator(reversed={}) - start", String.valueOf(reversed));
+ }
String[] names = getTableNames();
if (reversed)
@@ -278,7 +283,8 @@
// Verify if table exist in the database
if (!_tableMap.containsTable(tableName))
{
- logger.info("Table '{}' not found in tableMap={}", tableName, _tableMap);
+ logger.error("Table '{}' not found in tableMap={}", tableName,
+ _tableMap);
throw new NoSuchTableException(tableName);
}
@@ -288,7 +294,7 @@
{
return metaData;
}
-
+
// Create metadata and cache it
metaData = new DatabaseTableMetaData(tableName, _connection, true, super.isCaseSensitiveTableNames());
// Put the metadata object into the cache map
@@ -318,29 +324,31 @@
}
}
-
+
private static class OracleRecycleBinTableFilter implements ITableFilterSimple
{
private final DatabaseConfig _config;
- public OracleRecycleBinTableFilter(DatabaseConfig config)
+ public OracleRecycleBinTableFilter(DatabaseConfig config)
{
this._config = config;
}
- public boolean accept(String tableName) throws DataSetException
+ public boolean accept(String tableName) throws DataSetException
{
// skip oracle 10g recycle bin system tables if enabled
if(_config.getFeature(DatabaseConfig.FEATURE_SKIP_ORACLE_RECYCLEBIN_TABLES)) {
// Oracle 10g workaround
// don't process system tables (oracle recycle bin tables) which
// are reported to the application due a bug in the oracle JDBC driver
- if (tableName.startsWith("BIN$"))
- return false;
+ if (tableName.startsWith("BIN$"))
+ {
+ return false;
+ }
}
-
+
return true;
}
}
-
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2010-06-04 16:36:41
|
Revision: 1188
http://dbunit.svn.sourceforge.net/dbunit/?rev=1188&view=rev
Author: jeffjensen
Date: 2010-06-04 16:36:35 +0000 (Fri, 04 Jun 2010)
Log Message:
-----------
Add log messages of SQLExceptions on obtaining connections to help troubleshooting.
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/database/DatabaseDataSourceConnection.java
trunk/dbunit/src/main/java/org/dbunit/database/statement/AbstractBatchStatement.java
Modified: trunk/dbunit/src/main/java/org/dbunit/database/DatabaseDataSourceConnection.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/database/DatabaseDataSourceConnection.java 2010-05-17 19:07:15 UTC (rev 1187)
+++ trunk/dbunit/src/main/java/org/dbunit/database/DatabaseDataSourceConnection.java 2010-06-04 16:36:35 UTC (rev 1188)
@@ -114,13 +114,18 @@
if (_connection == null)
{
- if (_user != null)
+ try
{
- _connection = _dataSource.getConnection(_user, _password);
+ if (_user != null) {
+ _connection = _dataSource.getConnection(_user, _password);
+ } else {
+ _connection = _dataSource.getConnection();
+ }
}
- else
+ catch (SQLException e)
{
- _connection = _dataSource.getConnection();
+ logger.error("getConnection(): ", e);
+ throw e;
}
}
return _connection;
Modified: trunk/dbunit/src/main/java/org/dbunit/database/statement/AbstractBatchStatement.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/database/statement/AbstractBatchStatement.java 2010-05-17 19:07:15 UTC (rev 1187)
+++ trunk/dbunit/src/main/java/org/dbunit/database/statement/AbstractBatchStatement.java 2010-06-04 16:36:35 UTC (rev 1188)
@@ -45,7 +45,15 @@
AbstractBatchStatement(Connection connection) throws SQLException
{
- _statement = connection.createStatement();
+ try
+ {
+ _statement = connection.createStatement();
+ }
+ catch (SQLException e)
+ {
+ logger.error("getConnection(): ", e);
+ throw e;
+ }
}
public void close() throws SQLException
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2010-05-17 19:07:21
|
Revision: 1187
http://dbunit.svn.sourceforge.net/dbunit/?rev=1187&view=rev
Author: jeffjensen
Date: 2010-05-17 19:07:15 +0000 (Mon, 17 May 2010)
Log Message:
-----------
Add comment for reference resulting from a good conversation.
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
Modified: trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2010-05-16 15:58:35 UTC (rev 1186)
+++ trunk/dbunit/src/main/java/org/dbunit/DefaultPrepAndExpectedTestCase.java 2010-05-17 19:07:15 UTC (rev 1187)
@@ -253,6 +253,10 @@
try {
verifyData();
} finally {
+ // it is deliberate to have cleanup exceptions shadow verify
+ // failures so user knows db is probably in unknown state (for
+ // those not using an in-memory db or transaction rollback),
+ // otherwise would mask probable cause of subsequent test failures
cleanupData();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2010-05-16 15:58:41
|
Revision: 1186
http://dbunit.svn.sourceforge.net/dbunit/?rev=1186&view=rev
Author: jeffjensen
Date: 2010-05-16 15:58:35 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Use better method.
Modified Paths:
--------------
trunk/dbunit/src/main/java/org/dbunit/database/AbstractDatabaseConnection.java
Modified: trunk/dbunit/src/main/java/org/dbunit/database/AbstractDatabaseConnection.java
===================================================================
--- trunk/dbunit/src/main/java/org/dbunit/database/AbstractDatabaseConnection.java 2010-05-16 15:56:53 UTC (rev 1185)
+++ trunk/dbunit/src/main/java/org/dbunit/database/AbstractDatabaseConnection.java 2010-05-16 15:58:35 UTC (rev 1186)
@@ -51,7 +51,7 @@
private static final Logger logger = LoggerFactory.getLogger(AbstractDatabaseConnection.class);
private IDataSet _dataSet = null;
- private DatabaseConfig _databaseConfig;
+ private final DatabaseConfig _databaseConfig;
public AbstractDatabaseConnection()
{
@@ -73,8 +73,8 @@
return _dataSet;
}
- public IDataSet createDataSet(String[] tableNames)
- throws DataSetException, SQLException
+ public IDataSet createDataSet(String[] tableNames)
+ throws DataSetException, SQLException
{
logger.debug("createDataSet(tableNames={}) - start", tableNames);
@@ -82,13 +82,13 @@
}
public ITable createQueryTable(String resultName, String sql)
- throws DataSetException, SQLException
+ throws DataSetException, SQLException
{
logger.debug("createQueryTable(resultName={}, sql={}) - start", resultName, sql);
IResultSetTableFactory tableFactory = getResultSetTableFactory();
IResultSetTable rsTable = tableFactory.createTable(resultName, sql, this);
- logger.debug("createQueryTable: rowCount={}", new Integer(rsTable
+ logger.debug("createQueryTable: rowCount={}", Integer.valueOf(rsTable
.getRowCount()));
return rsTable;
}
@@ -103,16 +103,16 @@
return rsTable;
}
-
+
public ITable createTable(String tableName) throws DataSetException,
- SQLException
+ SQLException
{
logger.debug("createTable(tableName={}) - start", tableName);
if (tableName == null) {
throw new NullPointerException("The parameter 'tableName' must not be null");
}
-
+
String sql = "select * from " + tableName; // TODO Think about QualifiedTableNames here - needed or not?
return this.createQueryTable(tableName, sql);
}
@@ -146,11 +146,12 @@
try
{
resultSet = statement.executeQuery(sqlBuffer.toString());
- if(resultSet.next())
+ if(resultSet.next()) {
return resultSet.getInt(1);
- else
- throw new DatabaseUnitRuntimeException("Select count did not return any results for table '" +
+ } else {
+ throw new DatabaseUnitRuntimeException("Select count did not return any results for table '" +
tableName + "'. Statement: " + sqlBuffer.toString());
+ }
}
finally
{
@@ -174,14 +175,14 @@
private IResultSetTableFactory getResultSetTableFactory()
{
return (IResultSetTableFactory)_databaseConfig.getProperty(DatabaseConfig.PROPERTY_RESULTSET_TABLE_FACTORY);
-
+
}
-
+
public String toString()
{
- StringBuffer sb = new StringBuffer();
- sb.append("_databaseConfig=").append(_databaseConfig);
- sb.append(", _dataSet=").append(_dataSet);
- return sb.toString();
+ StringBuffer sb = new StringBuffer();
+ sb.append("_databaseConfig=").append(_databaseConfig);
+ sb.append(", _dataSet=").append(_dataSet);
+ return sb.toString();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
