[dbunit-commit] dbunit/src/test/org/dbunit/dataset/filter AbstractTableFilterTest.java,1.2.2.1,1.2.2.2 ExcludeTableFilterTest.java,1.2,1.2.2.1 IncludeTableFilterTest.java,1.2,1.2.2.1 SequenceTableFilterTest.java,1.3,1.3.2.1

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

Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter
In directory sc8-pr-cvs1:/tmp/cvs-serv17988/dbunit/src/test/org/dbunit/dataset/filter

Modified Files:
      Tag: branch-iterator
	AbstractTableFilterTest.java ExcludeTableFilterTest.java 
	IncludeTableFilterTest.java SequenceTableFilterTest.java 
Log Message:
Refactored FilteredDataSet to work with new iterator paradigm.

Index: AbstractTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/AbstractTableFilterTest.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** AbstractTableFilterTest.java	6 Apr 2003 20:34:43 -0000	1.2.2.1
--- AbstractTableFilterTest.java	9 Apr 2003 02:07:15 -0000	1.2.2.2
***************
*** 86,98 ****
      public abstract void testGetTableNamesAndTableNotInDecoratedDataSet() throws Exception;
  
!     public abstract void testGetTables() throws Exception;
! 
!     public abstract void testGetDuplicateTables() throws Exception;
  
!     public abstract void testGetCaseInsensitiveTables() throws Exception;
  
!     public abstract void testGetReverseTables() throws Exception;
  
!     public abstract void testGetTablesAndTableNotInDecoratedDataSet() throws Exception;
  
  }
--- 86,97 ----
      public abstract void testGetTableNamesAndTableNotInDecoratedDataSet() throws Exception;
  
!     public abstract void testIterator() throws Exception;
  
!     public abstract void testIteratorWithDuplicateTables() throws Exception;
  
!     public abstract void testCaseInsensitiveIterator() throws Exception;
  
!     public abstract void testReverseIterator() throws Exception;
  
+     public abstract void testIteratorAndTableNotInDecoratedDataSet() throws Exception;
  }

Index: ExcludeTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/ExcludeTableFilterTest.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** ExcludeTableFilterTest.java	20 Mar 2003 03:05:12 -0000	1.2
--- ExcludeTableFilterTest.java	9 Apr 2003 02:07:15 -0000	1.2.2.1
***************
*** 26,29 ****
--- 26,30 ----
  import org.dbunit.dataset.LowerCaseDataSet;
  import org.dbunit.dataset.DefaultTable;
+ import org.dbunit.dataset.DataSetUtils;
  
  import java.util.Arrays;
***************
*** 158,162 ****
      }
  
!     public void testGetTables() throws Exception
      {
          String[] expectedNames = getExpectedNames();
--- 159,163 ----
      }
  
!     public void testIterator() throws Exception
      {
          String[] expectedNames = getExpectedNames();
***************
*** 168,172 ****
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = filter.getTables(dataSet);
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
--- 169,174 ----
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = DataSetUtils.getTables(
!                 filter.iterator(dataSet, false));
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 175,179 ****
      }
  
!     public void testGetDuplicateTables() throws Exception
      {
          String[] expectedNames = getExpectedDuplicateNames();
--- 177,181 ----
      }
  
!     public void testIteratorWithDuplicateTables() throws Exception
      {
          String[] expectedNames = getExpectedDuplicateNames();
***************
*** 185,189 ****
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = filter.getTables(dataSet);
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
--- 187,192 ----
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = DataSetUtils.getTables(
!                 filter.iterator(dataSet, false));
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 192,196 ****
      }
  
!     public void testGetCaseInsensitiveTables() throws Exception
      {
          ExcludeTableFilter filter = new ExcludeTableFilter();
--- 195,199 ----
      }
  
!     public void testCaseInsensitiveIterator() throws Exception
      {
          ExcludeTableFilter filter = new ExcludeTableFilter();
***************
*** 202,206 ****
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = filter.getTables(dataSet);
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
--- 205,210 ----
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = DataSetUtils.getTables(
!                 filter.iterator(dataSet, false));
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 209,218 ****
      }
  
!     public void testGetReverseTables() throws Exception
      {
          // Cannot test!
      }
  
!     public void testGetTablesAndTableNotInDecoratedDataSet() throws Exception
      {
          String[] expectedNames = getExpectedNames();
--- 213,222 ----
      }
  
!     public void testReverseIterator() throws Exception
      {
          // Cannot test!
      }
  
!     public void testIteratorAndTableNotInDecoratedDataSet() throws Exception
      {
          String[] expectedNames = getExpectedNames();
***************
*** 225,229 ****
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = filter.getTables(dataSet);
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
--- 229,234 ----
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = DataSetUtils.getTables(
!                 filter.iterator(dataSet, false));
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 341,345 ****
              if (pattern.equals("*"))
              {
!                 ITable[] actualTables = filter.getTables(dataSet);
                  String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
                  assertEquals("table count - " + pattern,
--- 346,351 ----
              if (pattern.equals("*"))
              {
!                 ITable[] actualTables = DataSetUtils.getTables(
!                         filter.iterator(dataSet, false));
                  String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
                  assertEquals("table count - " + pattern,
***************
*** 348,352 ****
              else
              {
!                 ITable[] actualTables = filter.getTables(dataSet);
                  String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
                  assertEquals("table count - " + pattern,
--- 354,359 ----
              else
              {
!                 ITable[] actualTables = DataSetUtils.getTables(
!                         filter.iterator(dataSet, false));
                  String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
                  assertEquals("table count - " + pattern,
***************
*** 374,378 ****
              filter.excludeTable(pattern);
  
!             ITable[] actualTables = filter.getTables(dataSet);
              String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
              assertEquals("table count - " + pattern,
--- 381,386 ----
              filter.excludeTable(pattern);
  
!             ITable[] actualTables = DataSetUtils.getTables(
!                     filter.iterator(dataSet, false));
              String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
              assertEquals("table count - " + pattern,

Index: IncludeTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/IncludeTableFilterTest.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** IncludeTableFilterTest.java	20 Mar 2003 03:05:12 -0000	1.2
--- IncludeTableFilterTest.java	9 Apr 2003 02:07:15 -0000	1.2.2.1
***************
*** 190,194 ****
      }
  
!     public void testGetTables() throws Exception
      {
          String[] expectedNames = getExpectedNames();
--- 190,194 ----
      }
  
!     public void testIterator() throws Exception
      {
          String[] expectedNames = getExpectedNames();
***************
*** 199,203 ****
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = filter.getTables(dataSet);
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
--- 199,204 ----
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = DataSetUtils.getTables(
!                 filter.iterator(dataSet, false));
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 206,210 ****
      }
  
!     public void testGetDuplicateTables() throws Exception
      {
          String[] expectedNames = getExpectedDuplicateNames();
--- 207,211 ----
      }
  
!     public void testIteratorWithDuplicateTables() throws Exception
      {
          String[] expectedNames = getExpectedDuplicateNames();
***************
*** 215,219 ****
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = filter.getTables(dataSet);
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
--- 216,221 ----
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = DataSetUtils.getTables(
!                 filter.iterator(dataSet, false));
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 222,226 ****
      }
  
!     public void testGetCaseInsensitiveTables() throws Exception
      {
          ITableFilter filter = new IncludeTableFilter(getExpectedNames());
--- 224,228 ----
      }
  
!     public void testCaseInsensitiveIterator() throws Exception
      {
          ITableFilter filter = new IncludeTableFilter(getExpectedNames());
***************
*** 231,235 ****
                  dataSet.getTableNames().length > lowerNames.length);
  
!         ITable[] actualTables = filter.getTables(dataSet);
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", lowerNames.length, actualTables.length);
--- 233,238 ----
                  dataSet.getTableNames().length > lowerNames.length);
  
!         ITable[] actualTables = DataSetUtils.getTables(
!                 filter.iterator(dataSet, false));
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", lowerNames.length, actualTables.length);
***************
*** 238,245 ****
      }
  
!     public void testGetReverseTables() throws Exception
      {
!         String[] expectedNames = getExpectedNames();
!         String[] filterNames = DataSetUtils.reverseStringArray(expectedNames);
          ITableFilter filter = new IncludeTableFilter(filterNames);
  
--- 241,248 ----
      }
  
!     public void testReverseIterator() throws Exception
      {
!         String[] filterNames = getExpectedNames();
!         String[] expectedNames = DataSetUtils.reverseStringArray(filterNames);
          ITableFilter filter = new IncludeTableFilter(filterNames);
  
***************
*** 248,252 ****
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = filter.getTables(dataSet);
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
--- 251,256 ----
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = DataSetUtils.getTables(
!                 filter.iterator(dataSet, true));
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 255,259 ****
      }
  
!     public void testGetTablesAndTableNotInDecoratedDataSet() throws Exception
      {
          String[] expectedNames = getExpectedNames();
--- 259,263 ----
      }
  
!     public void testIteratorAndTableNotInDecoratedDataSet() throws Exception
      {
          String[] expectedNames = getExpectedNames();
***************
*** 268,272 ****
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = filter.getTables(dataSet);
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
--- 272,277 ----
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = DataSetUtils.getTables(
!                 filter.iterator(dataSet, false));
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 387,391 ****
              if (pattern.equals("*"))
              {
!                 ITable[] actualTables = filter.getTables(dataSet);
                  String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
                  assertEquals("table count - " + pattern,
--- 392,397 ----
              if (pattern.equals("*"))
              {
!                 ITable[] actualTables = DataSetUtils.getTables(
!                         filter.iterator(dataSet, false));
                  String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
                  assertEquals("table count - " + pattern,
***************
*** 397,401 ****
              else
              {
!                 ITable[] actualTables = filter.getTables(dataSet);
                  String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
                  assertEquals("table count - " + pattern,
--- 403,408 ----
              else
              {
!                 ITable[] actualTables = DataSetUtils.getTables(
!                         filter.iterator(dataSet, false));
                  String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
                  assertEquals("table count - " + pattern,
***************
*** 422,426 ****
              filter.includeTable(pattern);
  
!             ITable[] actualTables = filter.getTables(dataSet);
              assertEquals("table count - " + pattern, 0, actualTables.length);
          }
--- 429,434 ----
              filter.includeTable(pattern);
  
!             ITable[] actualTables = DataSetUtils.getTables(
!                     filter.iterator(dataSet, false));
              assertEquals("table count - " + pattern, 0, actualTables.length);
          }

Index: SequenceTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/SequenceTableFilterTest.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** SequenceTableFilterTest.java	19 Mar 2003 01:56:18 -0000	1.3
--- SequenceTableFilterTest.java	9 Apr 2003 02:07:15 -0000	1.3.2.1
***************
*** 21,34 ****
  package org.dbunit.dataset.filter;
  
- import org.dbunit.dataset.*;
- import org.dbunit.dataset.xml.XmlDataSet;
  import org.dbunit.database.AmbiguousTableNameException;
  
! import junit.framework.TestCase;
! 
! import java.io.FileReader;
  import java.util.Arrays;
  import java.util.List;
- import java.util.ArrayList;
  
  /**
--- 21,34 ----
  package org.dbunit.dataset.filter;
  
  import org.dbunit.database.AmbiguousTableNameException;
+ import org.dbunit.dataset.DataSetUtils;
+ import org.dbunit.dataset.DefaultDataSet;
+ import org.dbunit.dataset.IDataSet;
+ import org.dbunit.dataset.ITable;
+ import org.dbunit.dataset.LowerCaseDataSet;
  
! import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.List;
  
  /**
***************
*** 170,174 ****
      }
  
!     public void testGetTables() throws Exception
      {
          String[] expectedNames = getExpectedNames();
--- 170,174 ----
      }
  
!     public void testIterator() throws Exception
      {
          String[] expectedNames = getExpectedNames();
***************
*** 179,183 ****
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = filter.getTables(dataSet);
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
--- 179,184 ----
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = DataSetUtils.getTables(
!                 filter.iterator(dataSet, false));
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 186,190 ****
      }
  
!     public void testGetDuplicateTables() throws Exception
      {
          String[] expectedNames = getExpectedDuplicateNames();
--- 187,191 ----
      }
  
!     public void testIteratorWithDuplicateTables() throws Exception
      {
          String[] expectedNames = getExpectedDuplicateNames();
***************
*** 197,201 ****
          try
          {
!             filter.getTables(dataSet);
              fail("Should not be here!");
          }
--- 198,202 ----
          try
          {
!             DataSetUtils.getTables(filter.iterator(dataSet, false));
              fail("Should not be here!");
          }
***************
*** 205,209 ****
      }
  
!     public void testGetCaseInsensitiveTables() throws Exception
      {
          ITableFilter filter = new SequenceTableFilter(getExpectedNames());
--- 206,210 ----
      }
  
!     public void testCaseInsensitiveIterator() throws Exception
      {
          ITableFilter filter = new SequenceTableFilter(getExpectedNames());
***************
*** 214,218 ****
                  dataSet.getTableNames().length > lowerNames.length);
  
!         ITable[] actualTables = filter.getTables(dataSet);
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", lowerNames.length, actualTables.length);
--- 215,220 ----
                  dataSet.getTableNames().length > lowerNames.length);
  
!         ITable[] actualTables = DataSetUtils.getTables(
!                 filter.iterator(dataSet, false));
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", lowerNames.length, actualTables.length);
***************
*** 221,228 ****
      }
  
!     public void testGetReverseTables() throws Exception
      {
!         String[] expectedNames = DataSetUtils.reverseStringArray(getExpectedNames());
!         ITableFilter filter = new SequenceTableFilter(expectedNames);
  
          IDataSet dataSet = createDataSet();
--- 223,231 ----
      }
  
!     public void testReverseIterator() throws Exception
      {
!         String[] filterNames = getExpectedNames();
!         String[] expectedNames = DataSetUtils.reverseStringArray(filterNames);
!         ITableFilter filter = new SequenceTableFilter(filterNames);
  
          IDataSet dataSet = createDataSet();
***************
*** 230,234 ****
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = filter.getTables(dataSet);
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
--- 233,238 ----
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = DataSetUtils.getTables(
!                 filter.iterator(dataSet, true));
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 237,241 ****
      }
  
!     public void testGetTablesAndTableNotInDecoratedDataSet() throws Exception
      {
          String[] expectedNames = getExpectedNames();
--- 241,245 ----
      }
  
!     public void testIteratorAndTableNotInDecoratedDataSet() throws Exception
      {
          String[] expectedNames = getExpectedNames();
***************
*** 250,254 ****
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = filter.getTables(dataSet);
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
--- 254,278 ----
                  dataSet.getTableNames().length > expectedNames.length);
  
!         ITable[] actualTables = DataSetUtils.getTables(
!                 filter.iterator(dataSet, false));
!         String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
!         assertEquals("table count", expectedNames.length, actualTables.length);
!         assertEquals("table names",
!                 Arrays.asList(expectedNames), Arrays.asList(actualNames));
!     }
! 
!     ////////////////////////////////////////////////////////////////////////////
! 
!     public void testIteratorWithDifferentSequence() throws Exception
!     {
!         String[] expectedNames = DataSetUtils.reverseStringArray(getExpectedNames());
!         ITableFilter filter = new SequenceTableFilter(expectedNames);
! 
!         IDataSet dataSet = createDataSet();
!         assertTrue("dataset names count",
!                 dataSet.getTableNames().length > expectedNames.length);
! 
!         ITable[] actualTables = DataSetUtils.getTables(
!                 filter.iterator(dataSet, false));
          String[] actualNames = new DefaultDataSet(actualTables).getTableNames();
          assertEquals("table count", expectedNames.length, actualTables.length);
***************
*** 256,258 ****
--- 280,283 ----
                  Arrays.asList(expectedNames), Arrays.asList(actualNames));
      }
+ 
  }