+ * Returns dbUnit's own {@link DbComparisonFailure}/{@link DbAssertionFailedError} + * rather than a JUnit-framework-specific failure type. dbUnit's own types are used + * even when JUnit is confirmed present (see {@link org.dbunit.assertion.DbUnitAssertBase}) + * so that the object returned here never requires a runtime dependency on any + * particular test framework's failure classes. + * * @author gommma (gommma AT users.sourceforge.net) * @author Last changed by: $Author$ * @version $Revision$ $Date$ @@ -33,10 +37,6 @@ public class JUnitFailureFactory implements FailureFactory { @Override public Error createFailure(final String message, final String expected, final String actual) { - // Return the org.opentest4j.AssertionFailedError object - // TODO Junit5 update something changed the message returned does not include - // the actual and exected - // adding it here for now. return new DbComparisonFailure( message, expected, actual); @@ -44,7 +44,6 @@ public Error createFailure(final String message, final String expected, final St @Override public Error createFailure(final String message) { - // Return the org.opentest4j.AssertionFailedError object - return new AssertionFailedError(message); + return new DbAssertionFailedError(message); } } diff --git a/src/site/asciidoc/fiveminutes.adoc b/src/site/asciidoc/fiveminutes.adoc index 08682e493..cc46ab91e 100644 --- a/src/site/asciidoc/fiveminutes.adoc +++ b/src/site/asciidoc/fiveminutes.adoc @@ -4,8 +4,10 @@ In 5 minutes you'll write a database test that prepares data, exercises your cod == Prerequisites -* JDK 8 or newer. -* JUnit 5 (`org.junit.jupiter:junit-jupiter`) on your test classpath. +* JDK 17 or newer to build and run this tutorial's test (JUnit 6 requires it). The + dbUnit library itself still targets Java 8 bytecode, so JDK 8 remains enough if you + only use its core API without JUnit's test-support classes. +* JUnit 5 or 6 (`org.junit.jupiter:junit-jupiter`) on your test classpath. * An in-memory database for the example — this tutorial uses https://www.h2database.com/[H2] so there's nothing to install or run. diff --git a/src/site/asciidoc/testcases.adoc b/src/site/asciidoc/testcases.adoc index ad741198e..5717c5863 100644 --- a/src/site/asciidoc/testcases.adoc +++ b/src/site/asciidoc/testcases.adoc @@ -88,7 +88,7 @@ public class SampleTest extends DBTestCase ---- NOTE: `DatabaseTestCase.setUp()`/`tearDown()` are plain protected methods, -not automatically invoked by JUnit 5 — override them with `@BeforeEach`/ +not automatically invoked by JUnit 5/6 — override them with `@BeforeEach`/ `@AfterEach` and call `super` as shown, matching every `DBTestCase`-subclass page linked above. diff --git a/src/site/asciidoc/testcases/MigratingToIDatabaseTester.adoc b/src/site/asciidoc/testcases/MigratingToIDatabaseTester.adoc index 292d9fb6d..10da490a3 100644 --- a/src/site/asciidoc/testcases/MigratingToIDatabaseTester.adoc +++ b/src/site/asciidoc/testcases/MigratingToIDatabaseTester.adoc @@ -172,6 +172,6 @@ public class SampleTest extends TestCase ---- This is what `IDatabaseTester` composition (above) descends from — the -difference today is only that JUnit 5's `@BeforeEach`/`@AfterEach` +difference today is only that JUnit 5/6's `@BeforeEach`/`@AfterEach` annotations replace JUnit 3/4's `setUp()`/`tearDown()` method-name convention. diff --git a/src/test/java/org/dbunit/AbstractDatabaseIT.java b/src/test/java/org/dbunit/AbstractDatabaseIT.java index 4d976bbff..186025802 100644 --- a/src/test/java/org/dbunit/AbstractDatabaseIT.java +++ b/src/test/java/org/dbunit/AbstractDatabaseIT.java @@ -165,34 +165,6 @@ protected void closeConnection(final IDatabaseConnection connection) // return DatabaseOperation.DELETE_ALL; // } - /** - * This method is used so sub-classes can disable the tests according to - * some characteristics of the environment - * - * @param testName - * name of the test to be checked - * @return flag indicating if the test should be executed or not - */ - protected boolean runTest(final String testName) - { - return true; - } - - protected void runTest() throws Throwable - { - if (runTest(getName())) - { - // super.runTest(); - } else - { - if (logger.isDebugEnabled()) - { - logger.debug("Skipping test " + getClass().getName() + "." - + getName()); - } - } - } - public static boolean environmentHasFeature(final TestFeature feature) { try diff --git a/src/test/java/org/dbunit/AllTestsSuite.java b/src/test/java/org/dbunit/AllTestsSuite.java deleted file mode 100644 index badd4e903..000000000 --- a/src/test/java/org/dbunit/AllTestsSuite.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -package org.dbunit; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @version $Revision$ - */ -@Suite -@SelectClasses({ - // org.dbunit.ant.AllTests.class, - org.dbunit.assertion.AllAssertionTestSuite.class, - org.dbunit.database.DatabaseTestSuite.class, - org.dbunit.database.search.AllTestsSuite.class, - org.dbunit.dataset.AllTestsSuite.class, - org.dbunit.ext.AllTestsSuite.class, - org.dbunit.operation.AllTestsSuite.class, - org.dbunit.util.AllTestsSuite.class, - org.dbunit.util.search.AllTestsSuite.class, - DatabaseUnitExceptionTest.class, DatabaseProfileTest.class, - DatabaseTestCaseIT.class, DBTestCaseIT.class}) -public class AllTestsSuite -{ -} diff --git a/src/test/java/org/dbunit/assertion/AllAssertionTestSuite.java b/src/test/java/org/dbunit/assertion/AllAssertionTestSuite.java deleted file mode 100644 index bba5b7b3a..000000000 --- a/src/test/java/org/dbunit/assertion/AllAssertionTestSuite.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package org.dbunit.assertion; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author gommma (gommma AT users.sourceforge.net) - * @author Last changed by: $Author$ - * @version $Revision$ $Date$ - * @since 2.4.0 - */ -@Suite -@SelectClasses({DefaultFailureHandlerTest.class, DbUnitAssertIT.class, - DiffCollectingFailureHandlerTest.class}) -public class AllAssertionTestSuite -{ -} diff --git a/src/test/java/org/dbunit/assertion/JUnitFailureFactoryTest.java b/src/test/java/org/dbunit/assertion/JUnitFailureFactoryTest.java index 7b6660e20..6bc7c1fad 100644 --- a/src/test/java/org/dbunit/assertion/JUnitFailureFactoryTest.java +++ b/src/test/java/org/dbunit/assertion/JUnitFailureFactoryTest.java @@ -23,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; -import org.opentest4j.AssertionFailedError; /** * Unit tests for {@link JUnitFailureFactory}, which also exercises the @@ -34,13 +33,13 @@ class JUnitFailureFactoryTest private final JUnitFailureFactory factory = new JUnitFailureFactory(); @Test - void testCreateFailure_withMessageOnly_returnsAssertionFailedError() + void testCreateFailure_withMessageOnly_returnsDbAssertionFailedError() { final String message = "simple failure"; final Error error = factory.createFailure(message); - assertThat(error).as("error type.").isInstanceOf(AssertionFailedError.class); + assertThat(error).as("error type.").isInstanceOf(DbAssertionFailedError.class); assertThat(error.getMessage()).as("message.").isEqualTo(message); } diff --git a/src/test/java/org/dbunit/database/DatabaseTestSuite.java b/src/test/java/org/dbunit/database/DatabaseTestSuite.java deleted file mode 100644 index c42eb8377..000000000 --- a/src/test/java/org/dbunit/database/DatabaseTestSuite.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -package org.dbunit.database; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @version $Revision$ - */ -@Suite -@SelectClasses({org.dbunit.database.statement.AllTestsSuite.class, - CachedResultSetTableIT.class, DatabaseConfigTest.class, - DatabaseConnectionIT.class, DatabaseDataSetIT.class, - DatabaseSequenceFilterIT.class, DatabaseTableIteratorTest.class, - DatabaseTableMetaDataIT.class, ForwardOnlyResultSetTableIT.class, - QueryDataSetIT.class, PrimaryKeyFilteredTableWrapperTest.class, - JdbcDatabaseTesterConnectionIT.class, - DefaultDatabaseTesterConnectionIT.class, - ResultSetTableMetaDataIT.class}) -public class DatabaseTestSuite -{ -} diff --git a/src/test/java/org/dbunit/database/search/AllTestsSuite.java b/src/test/java/org/dbunit/database/search/AllTestsSuite.java deleted file mode 100644 index e4b049e5e..000000000 --- a/src/test/java/org/dbunit/database/search/AllTestsSuite.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -package org.dbunit.database.search; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Felipe Leme (dbunit@felipeal.net) - * @version $Revision$ - * @since Aug 28, 2005 - */ -@Suite -@SelectClasses({ForeignKeyRelationshipEdgeTest.class, - ImportAndExportNodesFilterSearchCallbackIT.class, - ImportNodesFilterSearchCallbackIT.class, - ImportAndExportKeysSearchCallbackIT.class, - ImportedKeysFilteredByPKsCyclicTest.class, - ImportedKeysFilteredByPKsSingleTest.class, - ImportedKeysFilteredByPKsTest.class, - ImportedAndExportedKeysFilteredByPKsCyclicTest.class, - ImportedAndExportedKeysFilteredByPKsSingleTest.class, - ImportedAndExportedKeysFilteredByPKsTest.class, - TablesDependencyHelperIT.class}) -public class AllTestsSuite -{ -} diff --git a/src/test/java/org/dbunit/database/statement/AllTestsSuite.java b/src/test/java/org/dbunit/database/statement/AllTestsSuite.java deleted file mode 100644 index a5ca00240..000000000 --- a/src/test/java/org/dbunit/database/statement/AllTestsSuite.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -package org.dbunit.database.statement; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @version $Revision$ - */ -@Suite -@SelectClasses({BatchStatementDecoratorTest.class}) -public class AllTestsSuite -{ - -} diff --git a/src/test/java/org/dbunit/dataset/AbstractTableTest.java b/src/test/java/org/dbunit/dataset/AbstractTableTest.java index ffb467541..f655dd601 100644 --- a/src/test/java/org/dbunit/dataset/AbstractTableTest.java +++ b/src/test/java/org/dbunit/dataset/AbstractTableTest.java @@ -147,17 +147,4 @@ void testGetValueAndNoSuchColumn_withUnknownColumn_throwsNoSuchColumnException() "Should throw a NoSuchColumnException!"); } - - /** - * This method is used so sub-classes can disable the tests according to - * some characteristics of the environment - * - * @param testName - * name of the test to be checked - * @return flag indicating if the test should be executed or not - */ - protected boolean runTest(final String testName) - { - return true; - } } \ No newline at end of file diff --git a/src/test/java/org/dbunit/dataset/AllTestsSuite.java b/src/test/java/org/dbunit/dataset/AllTestsSuite.java deleted file mode 100644 index b4bd184cd..000000000 --- a/src/test/java/org/dbunit/dataset/AllTestsSuite.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -package org.dbunit.dataset; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @version $Revision$ - */ -@Suite -@SelectClasses({org.dbunit.dataset.common.handlers.AllTestsSuite.class, - org.dbunit.dataset.datatype.AllTestsSuite.class, - org.dbunit.dataset.excel.AllTestsSuite.class, - org.dbunit.dataset.filter.AllTestsSuite.class, - org.dbunit.dataset.stream.AllTestsSuite.class, - org.dbunit.dataset.sqlloader.AllTestsSuite.class, - org.dbunit.dataset.xml.AllTestsSuite.class, - org.dbunit.dataset.csv.AllTestsSuite.class, - CaseInsensitiveDataSetTest.class, CaseInsensitiveTableTest.class, - ColumnTest.class, ColumnsTest.class, CompositeDataSetTest.class, - CompositeTableTest.class, DataSetProducerAdapterTest.class, - DataSetUtilsTest.class, DefaultDataSetTest.class, - DefaultReverseTableIteratorTest.class, DefaultTableIteratorTest.class, - DefaultTableMetaDataTest.class, DefaultTableTest.class, - FilteredDataSetTest.class, FilteredTableMetaDataTest.class, - ForwardOnlyDataSetTest.class, ForwardOnlyTableTest.class, - LowerCaseDataSetTest.class, LowerCaseTableMetaDataTest.class, - ReplacementDataSetTest.class, ReplacementTableTest.class, - SortedDataSetTest.class, SortedTableTest.class}) -public class AllTestsSuite -{ - -} diff --git a/src/test/java/org/dbunit/dataset/common/handlers/AllTestsSuite.java b/src/test/java/org/dbunit/dataset/common/handlers/AllTestsSuite.java deleted file mode 100644 index 642a1b621..000000000 --- a/src/test/java/org/dbunit/dataset/common/handlers/AllTestsSuite.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2008, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package org.dbunit.dataset.common.handlers; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author gommma (gommma AT users.sourceforge.net) - * @author Last changed by: $Author$ - * @version $Revision$ $Date$ - * @since 2.4.0 - */ -@Suite -@SelectClasses({EnforceHandlerTest.class, HandlersTest.class, - HandlersTest.class}) -public class AllTestsSuite -{ -} diff --git a/src/test/java/org/dbunit/dataset/csv/AllTestsSuite.java b/src/test/java/org/dbunit/dataset/csv/AllTestsSuite.java deleted file mode 100644 index 9d9dcdc29..000000000 --- a/src/test/java/org/dbunit/dataset/csv/AllTestsSuite.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -package org.dbunit.dataset.csv; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * Created By: fede Date: 10-mar-2004 Time: 10.52.00 - * - * Last Checkin: $Author$ Date: $Date$ Revision: $Revision$ - */ -@Suite -@SelectClasses({CsvParserTest.class, CsvProducerTest.class, - CsvDataSetWriterTest.class, CsvDataSetTest.class, - CsvURLDataSetTest.class, CsvURLProducerTest.class}) -public class AllTestsSuite -{ - -} diff --git a/src/test/java/org/dbunit/dataset/datatype/AllTestsSuite.java b/src/test/java/org/dbunit/dataset/datatype/AllTestsSuite.java deleted file mode 100644 index 64edac130..000000000 --- a/src/test/java/org/dbunit/dataset/datatype/AllTestsSuite.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -package org.dbunit.dataset.datatype; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @version $Revision$ - */ -@Suite -@SelectClasses({BooleanDataTypeTest.class, BigIntegerDataTypeTest.class, - BitDataTypeTest.class, BytesDataTypeTest.class, BlobDataTypeTest.class, - BinaryStreamDataTypeTest.class, DateDataTypeTest.class, - DefaultDataTypeFactoryTest.class, DoubleDataTypeTest.class, - FloatDataTypeTest.class, IntegerDataTypeTest.class, - LongDataTypeTest.class, NumberDataTypeTest.class, - NumberTolerantDataTypeTest.class, StringDataTypeTest.class, - StringIgnoreCaseDataTypeTest.class, TimeDataTypeTest.class, - TimestampDataTypeTest.class, TypeCastExceptionTest.class}) -public class AllTestsSuite -{ -} diff --git a/src/test/java/org/dbunit/dataset/excel/AllTestsSuite.java b/src/test/java/org/dbunit/dataset/excel/AllTestsSuite.java deleted file mode 100644 index 42e57cf05..000000000 --- a/src/test/java/org/dbunit/dataset/excel/AllTestsSuite.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package org.dbunit.dataset.excel; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @author Last changed by: $Author$ - * @version $Revision$ $Date$ - * @since 2.2.0 - */ -@Suite -@SelectClasses({XlsDataSetTest.class, XlsTableTest.class, - XlsTableWriteTest.class, XlsxDataSetTest.class, XlsxTableTest.class,}) -public class AllTestsSuite -{ - -} diff --git a/src/test/java/org/dbunit/dataset/filter/AllTestsSuite.java b/src/test/java/org/dbunit/dataset/filter/AllTestsSuite.java deleted file mode 100644 index 96262b4f7..000000000 --- a/src/test/java/org/dbunit/dataset/filter/AllTestsSuite.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package org.dbunit.dataset.filter; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @author Last changed by: $Author$ - * @version $Revision$ $Date$ - * @since 2.2.0 - */ -@Suite -@SelectClasses({ExcludeTableFilterTest.class, IncludeTableFilterTest.class, - SequenceTableFilterTest.class, SequenceTableIteratorTest.class}) -public class AllTestsSuite -{ - -} diff --git a/src/test/java/org/dbunit/dataset/sqlloader/AllTestsSuite.java b/src/test/java/org/dbunit/dataset/sqlloader/AllTestsSuite.java deleted file mode 100644 index 3a46ba3b4..000000000 --- a/src/test/java/org/dbunit/dataset/sqlloader/AllTestsSuite.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2008, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package org.dbunit.dataset.sqlloader; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author gommma (gommma AT users.sourceforge.net) - * @author Last changed by: $Author$ - * @version $Revision$ $Date$ - * @since 2.4.0 - */ -@Suite -@SelectClasses({SqlLoaderCsvDataSetTest.class}) -public class AllTestsSuite -{ -} diff --git a/src/test/java/org/dbunit/dataset/stream/AllTestsSuite.java b/src/test/java/org/dbunit/dataset/stream/AllTestsSuite.java deleted file mode 100644 index e996e2398..000000000 --- a/src/test/java/org/dbunit/dataset/stream/AllTestsSuite.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -package org.dbunit.dataset.stream; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @version $Revision$ - */ -@Suite -@SelectClasses({BufferedConsumerTest.class, StreamingDataSetTest.class, - StreamingTableTest.class}) -public class AllTestsSuite -{ -} diff --git a/src/test/java/org/dbunit/dataset/xml/AllTestsSuite.java b/src/test/java/org/dbunit/dataset/xml/AllTestsSuite.java deleted file mode 100644 index 22dc381c0..000000000 --- a/src/test/java/org/dbunit/dataset/xml/AllTestsSuite.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2006, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -package org.dbunit.dataset.xml; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @version $Revision$ - */ -@Suite -@SelectClasses({FlatDtdDataSetIT.class, FlatDtdProducerTest.class, - FlatDtdWriterTest.class, FlatXmlDataSetTest.class, - FlatXmlProducerTest.class, FlatXmlTableTest.class, - FlatXmlTableWriteTest.class, FlatXmlWriterTest.class, - XmlDataSetTest.class, XmlDataSetWriterTest.class, XmlProducerTest.class, - XmlTableTest.class, XmlTableWriteTest.class}) -public class AllTestsSuite -{ -} diff --git a/src/test/java/org/dbunit/ext/AllTestsSuite.java b/src/test/java/org/dbunit/ext/AllTestsSuite.java deleted file mode 100644 index 4fc0985c9..000000000 --- a/src/test/java/org/dbunit/ext/AllTestsSuite.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package org.dbunit.ext; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @since Aug 13, 2003 - * @version $Revision$ - */ -@Suite -@SelectClasses({org.dbunit.ext.db2.AllTestsSuite.class, - org.dbunit.ext.mckoi.AllTestsSuite.class, - org.dbunit.ext.mssql.AllTestsSuite.class, - org.dbunit.ext.mysql.AllTestsSuite.class, - org.dbunit.ext.oracle.AllTestsSuite.class, - org.dbunit.ext.hsqldb.AllTestsSuite.class, - org.dbunit.ext.h2.AllTestsSuite.class, - org.dbunit.ext.postgresql.AllTestsSuite.class,}) -public class AllTestsSuite -{ -} diff --git a/src/test/java/org/dbunit/ext/db2/AllTestsSuite.java b/src/test/java/org/dbunit/ext/db2/AllTestsSuite.java deleted file mode 100644 index 4e202f87a..000000000 --- a/src/test/java/org/dbunit/ext/db2/AllTestsSuite.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -package org.dbunit.ext.db2; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @version $Revision$ - */ -@Suite -@SelectClasses({Db2DataTypeFactoryTest.class}) -public class AllTestsSuite -{ -} diff --git a/src/test/java/org/dbunit/ext/h2/AllTestsSuite.java b/src/test/java/org/dbunit/ext/h2/AllTestsSuite.java deleted file mode 100644 index e0af81668..000000000 --- a/src/test/java/org/dbunit/ext/h2/AllTestsSuite.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2008, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package org.dbunit.ext.h2; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Felipe Leme - */ -@Suite -@SelectClasses({H2DataTypeFactoryTest.class}) -public class AllTestsSuite -{ -} diff --git a/src/test/java/org/dbunit/ext/hsqldb/AllTestsSuite.java b/src/test/java/org/dbunit/ext/hsqldb/AllTestsSuite.java deleted file mode 100644 index 7e69e0b1b..000000000 --- a/src/test/java/org/dbunit/ext/hsqldb/AllTestsSuite.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package org.dbunit.ext.hsqldb; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Klas Axell - */ -@Suite -@SelectClasses({HsqldbDataTypeFactoryTest.class}) -public class AllTestsSuite -{ - -} diff --git a/src/test/java/org/dbunit/ext/mckoi/AllTestsSuite.java b/src/test/java/org/dbunit/ext/mckoi/AllTestsSuite.java deleted file mode 100644 index dadab5204..000000000 --- a/src/test/java/org/dbunit/ext/mckoi/AllTestsSuite.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -package org.dbunit.ext.mckoi; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Luigi Talamona (luigitalamona AT users.sourceforge.net) - * @author Last changed by: $Author$ - * @version $Revision$ $Date$ - * @since 2.4.8 - */ -@Suite -@SelectClasses({MckoiDataTypeFactoryTest.class}) -public class AllTestsSuite -{ - -} diff --git a/src/test/java/org/dbunit/ext/mssql/AllTestsSuite.java b/src/test/java/org/dbunit/ext/mssql/AllTestsSuite.java deleted file mode 100644 index 9b9d45afc..000000000 --- a/src/test/java/org/dbunit/ext/mssql/AllTestsSuite.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package org.dbunit.ext.mssql; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @since Apr 11, 2003 - * @version $Revision$ - */ -@Suite -@SelectClasses({InsertIdentityOperationIT.class, MsSqlDataTypeFactoryTest.class, - UniqueIdentifierTypeTest.class}) -public class AllTestsSuite -{ - -} diff --git a/src/test/java/org/dbunit/ext/mssql/InsertIdentityOperationIT.java b/src/test/java/org/dbunit/ext/mssql/InsertIdentityOperationIT.java index 0cbbd7c93..51d420e69 100644 --- a/src/test/java/org/dbunit/ext/mssql/InsertIdentityOperationIT.java +++ b/src/test/java/org/dbunit/ext/mssql/InsertIdentityOperationIT.java @@ -27,7 +27,6 @@ import org.dbunit.AbstractDatabaseIT; import org.dbunit.Assertion; -import org.dbunit.TestFeature; import org.dbunit.database.DatabaseConfig; import org.dbunit.dataset.Column; import org.dbunit.dataset.DataSetUtils; @@ -52,12 +51,6 @@ @EnabledIfSystemProperty(named = "dbunit.profile", matches = "mssql") class InsertIdentityOperationIT extends AbstractDatabaseIT { - @Override - protected boolean runTest(final String testName) - { - return environmentHasFeature(TestFeature.INSERT_IDENTITY); - } - @Test void testExecuteXML_withXmlDataSet_insertsIdentityRows() throws Exception { diff --git a/src/test/java/org/dbunit/ext/mysql/AllTestsSuite.java b/src/test/java/org/dbunit/ext/mysql/AllTestsSuite.java deleted file mode 100644 index e23e85be7..000000000 --- a/src/test/java/org/dbunit/ext/mysql/AllTestsSuite.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package org.dbunit.ext.mysql; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @since Sep 3, 2003 - * @version $Revision$ - */ -@Suite -@SelectClasses({MySqlDataTypeFactoryTest.class}) -public class AllTestsSuite -{ - -} diff --git a/src/test/java/org/dbunit/ext/oracle/AllTestsSuite.java b/src/test/java/org/dbunit/ext/oracle/AllTestsSuite.java deleted file mode 100644 index 7a83447dc..000000000 --- a/src/test/java/org/dbunit/ext/oracle/AllTestsSuite.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package org.dbunit.ext.oracle; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @since Aug 13, 2003 - * @version $Revision$ - */ -@Suite -@SelectClasses({OracleDataTypeFactoryTest.class, - Oracle10DataTypeFactoryTest.class}) -public class AllTestsSuite -{ -} diff --git a/src/test/java/org/dbunit/ext/postgresql/AllTestsSuite.java b/src/test/java/org/dbunit/ext/postgresql/AllTestsSuite.java deleted file mode 100644 index 0bc310b70..000000000 --- a/src/test/java/org/dbunit/ext/postgresql/AllTestsSuite.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2009, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package org.dbunit.ext.postgresql; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @since Aug 13, 2003 - * @version $Revision$ - */ -@Suite -@SelectClasses({PostgresqlDataTypeFactoryTest.class, - SQLHelperDomainPostgreSQLIT.class}) -public class AllTestsSuite -{ -} diff --git a/src/test/java/org/dbunit/operation/AllTestsSuite.java b/src/test/java/org/dbunit/operation/AllTestsSuite.java deleted file mode 100644 index 1956f4ccb..000000000 --- a/src/test/java/org/dbunit/operation/AllTestsSuite.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2002-2004, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -package org.dbunit.operation; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Manuel Laflamme - * @version $Revision$ - * @since Feb 19, 2002 - */ -@Suite -@SelectClasses({AbstractBatchOperationIT.class, - CloseConnectionOperationTest.class, CompositeOperationIT.class, - DeleteAllOperationIT.class, DeleteOperationIT.class, - InsertOperationIT.class, RefreshOperationIT.class, - TransactionOperationIT.class, TruncateTableOperationIT.class, - UpdateOperationIT.class,}) -public class AllTestsSuite -{ - -} diff --git a/src/test/java/org/dbunit/operation/TransactionOperationIT.java b/src/test/java/org/dbunit/operation/TransactionOperationIT.java index fdfbe2695..903071418 100644 --- a/src/test/java/org/dbunit/operation/TransactionOperationIT.java +++ b/src/test/java/org/dbunit/operation/TransactionOperationIT.java @@ -40,6 +40,8 @@ import org.dbunit.dataset.ITable; import org.dbunit.dataset.xml.XmlDataSet; import org.dbunit.testutil.TestUtils; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -60,10 +62,11 @@ class TransactionOperationIT extends AbstractDatabaseIT @Mock private DatabaseOperation mockOperation; - @Override - protected boolean runTest(final String testName) + @BeforeEach + void assumeTransactionsSupported() { - return environmentHasFeature(TestFeature.TRANSACTION); + Assumptions.assumeTrue(environmentHasFeature(TestFeature.TRANSACTION), + "Skip: database profile does not support transactions."); } @Test diff --git a/src/test/java/org/dbunit/operation/TruncateTableOperationIT.java b/src/test/java/org/dbunit/operation/TruncateTableOperationIT.java index 6ed4fcceb..8c11d98d8 100644 --- a/src/test/java/org/dbunit/operation/TruncateTableOperationIT.java +++ b/src/test/java/org/dbunit/operation/TruncateTableOperationIT.java @@ -20,7 +20,6 @@ */ package org.dbunit.operation; -import org.dbunit.TestFeature; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; /** @@ -44,10 +43,4 @@ protected String getExpectedStament(final String tableName) return "truncate table " + tableName; } - @Override - protected boolean runTest(final String testName) - { - return environmentHasFeature(TestFeature.TRUNCATE_TABLE); - } - } diff --git a/src/test/java/org/dbunit/util/AllTestsSuite.java b/src/test/java/org/dbunit/util/AllTestsSuite.java deleted file mode 100644 index 7ec41f2bd..000000000 --- a/src/test/java/org/dbunit/util/AllTestsSuite.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2005, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package org.dbunit.util; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Felipe Leme (dbunit@felipeal.net) - * @version $Revision$ - * @since Nov 5, 2005 - */ -@Suite -@SelectClasses({CollectionsHelperTest.class, QualifiedTableNameTest.class, - SQLHelperTest.class, TableFormatterTest.class}) -public class AllTestsSuite -{ - -} diff --git a/src/test/java/org/dbunit/util/search/AllTestsSuite.java b/src/test/java/org/dbunit/util/search/AllTestsSuite.java deleted file mode 100644 index 9ccb0ffb5..000000000 --- a/src/test/java/org/dbunit/util/search/AllTestsSuite.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2005, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package org.dbunit.util.search; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author Felipe Leme (dbunit@felipeal.net) - * @version $Revision$ - * @since Aug 25, 2005 - */ -@Suite -@SelectClasses({BiDirectionalEdgesDepthFirstSearchTest.class, - DepthFirstSearchTest.class, EdgeTest.class, - ExcludeNodesSearchCallbackTest.class, - IncludeNodesSearchCallbackTest.class}) -public class AllTestsSuite -{ - -} diff --git a/src/test/java/org/dbunit/util/xml/AllTestsSuite.java b/src/test/java/org/dbunit/util/xml/AllTestsSuite.java deleted file mode 100644 index 59b5ff3df..000000000 --- a/src/test/java/org/dbunit/util/xml/AllTestsSuite.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * - * The DbUnit Database Testing Framework - * Copyright (C)2008, DbUnit.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package org.dbunit.util.xml; - -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; - -/** - * @author gommma - * @author Last changed by: $Author$ - * @version $Revision$ $Date$ - * @since 2.3.0 - */ -@Suite -@SelectClasses({XmlWriterTest.class}) -public class AllTestsSuite -{ -}