[Openutils-svn] SF.net SVN: openutils: [524] trunk/openutils-testing

[<fg...@us...>]

Revision: 524
          http://openutils.svn.sourceforge.net/openutils/?rev=524&view=rev
Author:   fgiust
Date:     2008-01-09 15:06:51 -0800 (Wed, 09 Jan 2008)

Log Message:
-----------
cleaning up and testing

Modified Paths:
--------------
    trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java
    trunk/openutils-testing-testng/pom.xml
    trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java	2008-01-09 22:33:43 UTC (rev 523)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java	2008-01-09 23:06:51 UTC (rev 524)
@@ -29,7 +29,7 @@
     @Override
     public boolean isValidName(String tableName) throws DataSetException
     {
-        return pattern == null || pattern.matcher(tableName).matches();
+        return pattern == null || !pattern.matcher(tableName).matches();
     }
 
 }

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2008-01-09 22:33:43 UTC (rev 523)
+++ trunk/openutils-testing-testng/pom.xml	2008-01-09 23:06:51 UTC (rev 524)
@@ -11,6 +11,17 @@
   <name>openutils test utils (testng)</name>
   <version>2.0-SNAPSHOT</version>
   <description>openutils test utils</description>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <forkMode>once</forkMode>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <dependencies>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java
===================================================================
--- trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java	2008-01-09 22:33:43 UTC (rev 523)
+++ trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java	2008-01-09 23:06:51 UTC (rev 524)
@@ -41,7 +41,7 @@
     /**
      * Logger.
      */
-    private Logger log = LoggerFactory.getLogger(AbstractDbUnitTestNGSpringContextTests.class);
+    private Logger log = LoggerFactory.getLogger(getClass());
 
     /**
      * Dataset cache.
@@ -79,10 +79,15 @@
         {
             String[] datasets = dbUnitExecution.datasets();
             String dataSourceName = dbUnitExecution.dataSource();
+            String schema = dbUnitExecution.schema();
+            if (StringUtils.isEmpty(schema))
+            {
+                schema = null;
+            }
 
             IDatabaseConnection connection = new DatabaseConnection(
                 getDatasource(dataSourceName).getConnection(),
-                dbUnitExecution.schema());
+                schema);
 
             try
             {
@@ -170,6 +175,8 @@
             log.debug("Generating sorted dataset for initial cleanup");
             IDataSet unsortedDataSet = connection.createDataSet();
 
+            log.debug("Unfiltered truncateDataSet: {}", ArrayUtils.toString(unsortedDataSet.getTableNames()));
+
             ITableFilter filter = new DatabaseSequenceFilter(connection, new FilteredDataSet(
                 tableFilter,
                 unsortedDataSet).getTableNames());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.