|
From: <mla...@us...> - 2003-04-06 20:34:45
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter
In directory sc8-pr-cvs1:/tmp/cvs-serv19783/dbunit/src/test/org/dbunit/dataset/filter
Modified Files:
Tag: branch-iterator
AbstractTableFilterTest.java
Log Message:
Refactored test class that require same set of table names.
Index: AbstractTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/AbstractTableFilterTest.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** AbstractTableFilterTest.java 19 Mar 2003 01:56:18 -0000 1.2
--- AbstractTableFilterTest.java 6 Apr 2003 20:34:43 -0000 1.2.2.1
***************
*** 21,32 ****
package org.dbunit.dataset.filter;
! import org.dbunit.dataset.IDataSet;
import org.dbunit.dataset.CompositeDataSet;
import org.dbunit.dataset.DefaultDataSet;
import org.dbunit.dataset.DefaultTable;
import org.dbunit.dataset.xml.XmlDataSet;
- import junit.framework.TestCase;
-
import java.io.FileReader;
--- 21,31 ----
package org.dbunit.dataset.filter;
! import org.dbunit.dataset.AbstractTest;
import org.dbunit.dataset.CompositeDataSet;
import org.dbunit.dataset.DefaultDataSet;
import org.dbunit.dataset.DefaultTable;
+ import org.dbunit.dataset.IDataSet;
import org.dbunit.dataset.xml.XmlDataSet;
import java.io.FileReader;
***************
*** 36,87 ****
* @version $Revision$
*/
! public abstract class AbstractTableFilterTest extends TestCase
{
- private static final String[] TABLE_NAMES = {
- "TEST_TABLE",
- "SECOND_TABLE",
- "EMPTY_TABLE",
- "PK_TABLE",
- "ONLY_PK_TABLE",
- "EMPTY_MULTITYPE_TABLE",
- };
-
- private static final String[] DUPLICATE_TABLE_NAMES = {
- "DUPLICATE_TABLE",
- "EMPTY_TABLE",
- "DUPLICATE_TABLE",
- };
-
- private static final String EXTRA_TABLE_NAME = "EXTRA_TABLE";
public AbstractTableFilterTest(String s)
{
super(s);
- }
-
- protected String[] getExpectedNames() throws Exception
- {
- return (String[])TABLE_NAMES.clone();
- }
-
- protected String[] getExpectedLowerNames() throws Exception
- {
- String[] names = (String[])TABLE_NAMES.clone();
- for (int i = 0; i < names.length; i++)
- {
- names[i] = names[i].toLowerCase();
- }
-
- return names;
- }
-
- protected String[] getExpectedDuplicateNames()
- {
- return (String[])DUPLICATE_TABLE_NAMES.clone();
- }
-
- public String getExtraTableName()
- {
- return EXTRA_TABLE_NAME;
}
--- 35,45 ----
* @version $Revision$
*/
! public abstract class AbstractTableFilterTest
! extends AbstractTest
{
public AbstractTableFilterTest(String s)
{
super(s);
}
|