[dbunit-commit] dbunit/src/test/org/dbunit/dataset/filter AbstractTableFilterTest.java,1.5,1.6 ExcludeTableFilterTest.java,1.5,1.6 IncludeTableFilterTest.java,1.5,1.6 SequenceTableFilterTest.java,1.6,1.7

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3906/src/test/org/dbunit/dataset/filter

Modified Files:
	AbstractTableFilterTest.java ExcludeTableFilterTest.java 
	IncludeTableFilterTest.java SequenceTableFilterTest.java 
Log Message:
* Added IColumnFilter interface. Currently only used as a configurable strategy to detect MS SQL Server identity columns. Will eventually be used with FilteredDataSet decorator to include/exclude table columns.
* Renamed ITableFilter.isValidName() method to accept()to be consistent with the new IColumnFilter interface. 
* Added DefaultTableFilter class, which combine Include/ExcludeTableFilter classes.

Index: AbstractTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/AbstractTableFilterTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractTableFilterTest.java	15 Mar 2004 16:44:21 -0000	1.5
--- AbstractTableFilterTest.java	18 Apr 2004 02:48:19 -0000	1.6
***************
*** 66,70 ****
      }
  
!     public abstract void testIsValidName() throws Exception;
  
      public abstract void testIsCaseInsensitiveValidName() throws Exception;
--- 66,70 ----
      }
  
!     public abstract void testAccept() throws Exception;
  
      public abstract void testIsCaseInsensitiveValidName() throws Exception;

Index: ExcludeTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/ExcludeTableFilterTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ExcludeTableFilterTest.java	15 Mar 2004 16:44:21 -0000	1.5
--- ExcludeTableFilterTest.java	18 Apr 2004 02:48:19 -0000	1.6
***************
*** 43,47 ****
      }
  
!     public void testIsValidName() throws Exception
      {
          String[] validNames = getExpectedNames();
--- 43,47 ----
      }
  
!     public void testAccept() throws Exception
      {
          String[] validNames = getExpectedNames();
***************
*** 52,56 ****
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.isValidName(validName));
          }
      }
--- 52,56 ----
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.accept(validName));
          }
      }
***************
*** 65,69 ****
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.isValidName(validName));
          }
      }
--- 65,69 ----
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.accept(validName));
          }
      }
***************
*** 80,84 ****
          {
              String invalidName = invalidNames[i];
!             assertEquals(invalidName, false, filter.isValidName(invalidName));
          }
      }
--- 80,84 ----
          {
              String invalidName = invalidNames[i];
!             assertEquals(invalidName, false, filter.accept(invalidName));
          }
      }
***************
*** 244,248 ****
              ExcludeTableFilter filter = new ExcludeTableFilter();
              filter.excludeTable(pattern);
!             assertEquals(pattern, true, filter.isValidName(validName));
          }
      }
--- 244,248 ----
              ExcludeTableFilter filter = new ExcludeTableFilter();
              filter.excludeTable(pattern);
!             assertEquals(pattern, true, filter.accept(validName));
          }
      }
***************
*** 258,262 ****
              ExcludeTableFilter filter = new ExcludeTableFilter();
              filter.excludeTable(pattern);
!             assertEquals(pattern, false, filter.isValidName(validName));
          }
      }
--- 258,262 ----
              ExcludeTableFilter filter = new ExcludeTableFilter();
              filter.excludeTable(pattern);
!             assertEquals(pattern, false, filter.accept(validName));
          }
      }

Index: IncludeTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/IncludeTableFilterTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IncludeTableFilterTest.java	15 Mar 2004 16:44:21 -0000	1.5
--- IncludeTableFilterTest.java	18 Apr 2004 02:48:19 -0000	1.6
***************
*** 64,68 ****
      }
  
!     public void testIsValidName() throws Exception
      {
          String[] validNames = getExpectedNames();
--- 64,68 ----
      }
  
!     public void testAccept() throws Exception
      {
          String[] validNames = getExpectedNames();
***************
*** 72,76 ****
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.isValidName(validName));
          }
      }
--- 72,76 ----
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.accept(validName));
          }
      }
***************
*** 84,88 ****
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.isValidName(validName));
          }
      }
--- 84,88 ----
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.accept(validName));
          }
      }
***************
*** 100,104 ****
          {
              String invalidName = invalidNames[i];
!             assertEquals(invalidName, false, filter.isValidName(invalidName));
          }
      }
--- 100,104 ----
          {
              String invalidName = invalidNames[i];
!             assertEquals(invalidName, false, filter.accept(invalidName));
          }
      }
***************
*** 287,291 ****
              IncludeTableFilter filter = new IncludeTableFilter();
              filter.includeTable(pattern);
!             assertEquals(pattern, true, filter.isValidName(validName));
          }
      }
--- 287,291 ----
              IncludeTableFilter filter = new IncludeTableFilter();
              filter.includeTable(pattern);
!             assertEquals(pattern, true, filter.accept(validName));
          }
      }
***************
*** 301,305 ****
              IncludeTableFilter filter = new IncludeTableFilter();
              filter.includeTable(pattern);
!             assertEquals(pattern, false, filter.isValidName(validName));
          }
      }
--- 301,305 ----
              IncludeTableFilter filter = new IncludeTableFilter();
              filter.includeTable(pattern);
!             assertEquals(pattern, false, filter.accept(validName));
          }
      }

Index: SequenceTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/SequenceTableFilterTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SequenceTableFilterTest.java	15 Mar 2004 16:44:21 -0000	1.6
--- SequenceTableFilterTest.java	18 Apr 2004 02:48:19 -0000	1.7
***************
*** 41,45 ****
      }
  
!     public void testIsValidName() throws Exception
      {
          String[] validNames = getExpectedNames();
--- 41,45 ----
      }
  
!     public void testAccept() throws Exception
      {
          String[] validNames = getExpectedNames();
***************
*** 49,53 ****
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.isValidName(validName));
          }
      }
--- 49,53 ----
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.accept(validName));
          }
      }
***************
*** 61,65 ****
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.isValidName(validName));
          }
      }
--- 61,65 ----
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.accept(validName));
          }
      }
***************
*** 77,81 ****
          {
              String invalidName = invalidNames[i];
!             assertEquals(invalidName, false, filter.isValidName(invalidName));
          }
      }
--- 77,81 ----
          {
              String invalidName = invalidNames[i];
!             assertEquals(invalidName, false, filter.accept(invalidName));
          }
      }