Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[1119] trunk/openutils-testing/src
|
From: <fg...@us...> - 2009-03-29 09:46:44
|
Revision: 1119
http://openutils.svn.sourceforge.net/openutils/?rev=1119&view=rev
Author: fgiust
Date: 2009-03-29 09:46:38 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
flatxml support not fully working
Modified Paths:
--------------
trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java
trunk/openutils-testing/src/site/changes/changes.xml
Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java 2009-03-28 18:41:36 UTC (rev 1118)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java 2009-03-29 09:46:38 UTC (rev 1119)
@@ -210,7 +210,20 @@
if (is != null)
{
log.debug("loading dataset {}", url.getFile());
- dataSet = url.getFile().endsWith(".xls") ? new XlsDataSet(is) : new XmlDataSet(is);
+
+ if (datasetType == DatasetType.EXCEL || (url.getFile().endsWith(".xls")))
+ {
+ dataSet = new XlsDataSet(is);
+ }
+ else if (datasetType == DatasetType.FLATXML)
+ {
+ dataSet = new FlatXmlDataSet(is);
+ }
+ else if (datasetType == DatasetType.XML)
+ {
+ dataSet = new XmlDataSet(is);
+ }
+
is.close();
}
return dataSet;
Modified: trunk/openutils-testing/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-testing/src/site/changes/changes.xml 2009-03-28 18:41:36 UTC (rev 1118)
+++ trunk/openutils-testing/src/site/changes/changes.xml 2009-03-29 09:46:38 UTC (rev 1119)
@@ -8,7 +8,10 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
- <release version="2.2" date="2009-03-28" description="2.1.2">
+ <release version="2.2.1" date="2009-03-29" description="">
+ <action type="fix" dev="fgiust">Annotation "dataseType" added in 2.2.1 was respected for flatxml import.</action>
+ </release>
+ <release version="2.2" date="2009-03-28" description="">
<action type="add" dev="fgiust">Added support for flat xml format.</action>
<action type="update" dev="fgiust">Updated slf4j dependencies.</action>
<action type="update" dev="fgiust">Updated dbunit version to 2.4.4</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
