From a637efd8dcecafe6e468289000d01cf71ed1e7a3 Mon Sep 17 00:00:00 2001 From: Jim Schaff Date: Sun, 17 Dec 2023 16:17:46 -0500 Subject: [PATCH] switch to Junit 5 @Tag() instead of Junit 4 @Category for filtering --- .github/workflows/ci_cd.yml | 4 ++-- README.md | 2 +- .../test/java/cbit/vcell/client/ClientTaskDispatcherTest.java | 3 ++- .../src/test/java/cbit/vcell/util/AmplistorUtilsTest.java | 4 ++-- .../test/java/org/vcell/cli/run/BSTSBasedOmexExecTest.java | 3 ++- .../test/java/org/vcell/cli/run/BSTSBasedTestSuiteFiles.java | 4 ++-- .../test/java/org/vcell/cli/run/BiosimulationsExecTest.java | 3 ++- .../src/test/java/org/vcell/cli/run/BiosimulationsFiles.java | 4 ++-- .../src/test/java/org/vcell/cli/run/ExecuteImplTest.java | 4 ++-- .../src/test/java/org/vcell/cli/run/SpatialArchiveFiles.java | 3 ++- .../src/test/java/org/vcell/cli/run/SpatialExecTest.java | 3 ++- .../src/test/java/org/vcell/cli/run/hdf5/Hdf5WriterTest.java | 4 ++-- .../src/test/java/org/vcell/util/gui/GeneralGuiUtilsTest.java | 4 ++-- .../java/org/vcell/util/gui/GraphicExecutableFinderTest.java | 3 ++- .../src/test/java/org/vcell/util/gui/VCellIconsTest.java | 3 ++- vcell-core/src/main/java/cbit/vcell/math/MathUtilities.java | 2 +- vcell-core/src/test/java/cbit/image/VCImageTest.java | 4 ++-- .../test/java/cbit/vcell/biomodel/MathOverrideApplyTest.java | 3 ++- .../java/cbit/vcell/biomodel/MathOverrideRoundTipTest.java | 3 ++- .../cbit/vcell/biomodel/ModelCountAndConcentrationTest.java | 3 ++- .../test/java/cbit/vcell/biomodel/ModelUnitConverterTest.java | 3 ++- .../cbit/vcell/biomodel/SpringSaLaDGoodReactionsTest.java | 2 ++ .../src/test/java/cbit/vcell/export/N5ExporterTest.java | 3 ++- .../src/test/java/cbit/vcell/mapping/MathGenCompareTest.java | 3 ++- .../src/test/java/cbit/vcell/math/CommentedObjectTest.java | 3 ++- .../src/test/java/cbit/vcell/math/RowColumnResultSetTest.java | 4 ++-- .../src/test/java/cbit/vcell/math/VariableTypeTest.java | 4 ++-- .../client/RemoteProxyVCellConnectionFactoryTest.java | 3 ++- .../vcell/message/server/cmd/CommandServiceSshNativeTest.java | 3 ++- .../vcell/message/server/cmd/CommandServiceSsh_sshjTest.java | 3 ++- .../src/test/java/cbit/vcell/model/MassActionSolverTest.java | 3 ++- .../src/test/java/cbit/vcell/resource/ErrorUtilsTest.java | 3 ++- vcell-core/src/test/java/cbit/vcell/resource/LicenseTest.java | 4 ++-- .../src/test/java/cbit/vcell/resource/NativeLibTest.java | 4 ++-- .../src/test/java/cbit/vcell/resource/PropertyLoaderTest.java | 4 ++-- .../java/cbit/vcell/simdata/DataSetControllerImplTest.java | 3 ++- .../src/test/java/cbit/vcell/simdata/SimulationDataTest.java | 4 ++-- .../src/test/java/cbit/vcell/solver/MathOverridesTest.java | 3 ++- .../java/cbit/vcell/solver/SolverDescriptionRegression.java | 3 ++- .../src/test/java/cbit/vcell/solver/TestMathDescription.java | 4 ++-- .../test/java/cbit/vcell/solvers/ExecutableCommandTest.java | 3 ++- .../src/test/java/cbit/vcell/solvers/mb/H5FileStructure.java | 3 ++- vcell-core/src/test/java/cbit/vcell/solvers/mb/IndexTest.java | 4 ++-- .../java/cbit/vcell/solvers/mb/MovingBoundaryResultTest.java | 4 ++-- .../src/test/java/cbit/vcell/solvers/mb/VH5PathTest.java | 3 ++- .../java/cbit/vcell/tools/PortableCommandWrapperTest.java | 3 ++- .../src/test/java/cbit/vcell/util/CountingLineReaderTest.java | 3 ++- .../src/test/java/cbit/vcell/util/EventRateLimiterTest.java | 3 ++- .../test/java/cbit/vcell/util/SkipCommentLineReaderTest.java | 3 ++- .../src/test/java/org/vcell/core/DependencyInjectionTest.java | 3 ++- vcell-core/src/test/java/org/vcell/core/MatcheableTest.java | 4 ++-- .../vcell/movingboundary/TestMovingBoundarySolverSpec.java | 3 ++- .../org/vcell/optimization/CopasiOptimizationSolverTest.java | 3 ++- .../src/test/java/org/vcell/optimization/CopasiUtilsTest.java | 3 ++- .../vcell/relationship/CachedDataBaseReferenceReaderTest.java | 3 ++- .../src/test/java/org/vcell/sbml/BMDB_SBMLImportTest.java | 3 ++- vcell-core/src/test/java/org/vcell/sbml/BMDB_SBML_Files.java | 3 ++- vcell-core/src/test/java/org/vcell/sbml/SBMLImporterTest.java | 3 ++- .../src/test/java/org/vcell/sbml/SBMLTestSuiteTest.java | 3 ++- .../src/test/java/org/vcell/sbml/SBMLUnitTranslatorTest.java | 2 ++ .../src/test/java/org/vcell/sbml/SEDMLExporterSBMLTest.java | 4 ++-- .../src/test/java/org/vcell/sbml/SEDMLExporterVCMLTest.java | 4 ++-- .../src/test/java/org/vcell/sbml/SbmlTestSuiteFiles.java | 3 ++- .../src/test/java/org/vcell/sbml/StructureSizeSolverTest.java | 3 ++- .../src/test/java/org/vcell/sbml/VcmlTestSuiteFiles.java | 4 ++-- .../test/java/org/vcell/sedml/PublicationMetadataTest.java | 3 ++- .../src/test/java/org/vcell/util/RelationVisitorTest.java | 4 ++-- .../java/org/vcell/util/collections/CircularListTest.java | 3 ++- .../test/java/org/vcell/util/collections/HashListMapTest.java | 3 ++- .../java/org/vcell/util/collections/VCCollectionsTest.java | 4 ++-- .../src/test/java/org/vcell/util/document/UserTest.java | 3 ++- .../src/test/java/org/vcell/util/exe/Executable2Test.java | 4 ++-- vcell-core/src/test/java/org/vcell/vis/vtk/VCellDataTest.java | 3 ++- .../test/java/cbit/vcell/matrix/RationalExpMatrixTest.java | 3 ++- .../test/java/cbit/vcell/parser/ExpressionFlattenTest.java | 3 ++- .../src/test/java/cbit/vcell/parser/ExpressionTest.java | 3 ++- .../cbit/vcell/parser/ExpressionUtilsJSCLFlattenTest.java | 3 ++- .../test/java/cbit/vcell/parser/IntervalNarrowingTest.java | 3 ++- vcell-math/src/test/java/cbit/vcell/parser/MathMLTester.java | 3 ++- .../src/test/java/cbit/vcell/units/VCUnitDefinitionTest.java | 3 ++- .../src/test/java/cbit/vcell/units/parser/UnitSymbolTest.java | 3 ++- vcell-server/src/test/java/cbit/vcell/math/MathVisitor.java | 4 ++-- .../java/cbit/vcell/message/jms/test/BlobMessageTest.java | 4 ++-- .../vcell/message/server/dispatcher/BatchSchedulerTest.java | 3 ++- .../test/java/cbit/vcell/message/server/htc/HtcProxyTest.java | 2 ++ .../test/java/cbit/vcell/message/server/htc/JobIdTest.java | 3 ++- .../test/java/cbit/vcell/modeldb/BioModelMultiVisitor.java | 4 ++-- .../src/test/java/cbit/vcell/modeldb/BioModelTestReader.java | 4 ++-- .../test/java/cbit/vcell/modeldb/HybridBioModelVisitor.java | 3 ++- .../src/test/java/cbit/vcell/mongodb/VCMongoDbDriverTest.java | 3 ++- vcell-server/src/test/java/org/vcell/auth/JWTUtilsTest.java | 3 ++- vcell-util/src/main/java/org/vcell/test/BSTS_IT.java | 4 ---- vcell-util/src/main/java/org/vcell/test/Fast.java | 4 ---- vcell-util/src/main/java/org/vcell/test/MathGen_IT.java | 4 ---- vcell-util/src/main/java/org/vcell/test/SBML_IT.java | 4 ---- vcell-util/src/main/java/org/vcell/test/SEDML_SBML_IT.java | 4 ---- vcell-util/src/main/java/org/vcell/test/SEDML_VCML_IT.java | 4 ---- vcell-util/src/main/java/org/vcell/test/Slow.java | 4 ---- vcell-util/src/main/java/org/vcell/test/Spatial_IT.java | 4 ---- vcell-util/src/test/java/org/vcell/util/ArrayUtilsTest.java | 4 ++-- vcell-util/src/test/java/org/vcell/util/BeanUtilsTest.java | 3 ++- vcell-util/src/test/java/org/vcell/util/CastingUtilsTest.java | 4 ++-- .../src/test/java/org/vcell/util/CompressionUtilsTest.java | 3 ++- .../src/test/java/org/vcell/util/DimensionalIndexTest.java | 4 ++-- vcell-util/src/test/java/org/vcell/util/GenericUtilsTest.java | 4 ++-- .../src/test/java/org/vcell/util/StackTraceUtilsTest.java | 3 ++- .../src/test/java/org/vcell/util/VCellThreadCheckerTest.java | 3 ++- 107 files changed, 196 insertions(+), 160 deletions(-) delete mode 100644 vcell-util/src/main/java/org/vcell/test/BSTS_IT.java delete mode 100644 vcell-util/src/main/java/org/vcell/test/Fast.java delete mode 100644 vcell-util/src/main/java/org/vcell/test/MathGen_IT.java delete mode 100644 vcell-util/src/main/java/org/vcell/test/SBML_IT.java delete mode 100644 vcell-util/src/main/java/org/vcell/test/SEDML_SBML_IT.java delete mode 100644 vcell-util/src/main/java/org/vcell/test/SEDML_VCML_IT.java delete mode 100644 vcell-util/src/main/java/org/vcell/test/Slow.java delete mode 100644 vcell-util/src/main/java/org/vcell/test/Spatial_IT.java diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 71cb111e03..6065a10663 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -148,7 +148,7 @@ jobs: run: | mvn -version java -version - mvn --batch-mode clean install dependency:copy-dependencies -Dgroups="org.vcell.test.${{ matrix.test-group }}" + mvn --batch-mode clean install dependency:copy-dependencies -Dgroups="${{ matrix.test-group }}" # - name: Setup tmate session # uses: mxschmitt/action-tmate@v3 @@ -217,7 +217,7 @@ jobs: run: | mvn -version java -version - mvn --batch-mode clean install dependency:copy-dependencies -Dgroups="org.vcell.test.Fast" + mvn --batch-mode clean install dependency:copy-dependencies -Dgroups="Fast" - name: Build Docker image and push with latest tag run: | diff --git a/README.md b/README.md index 59f1d7b5fe..b6b26b8eb8 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ poetry install #### Test Java and Python ```bash -mvn test -Dgroups=org.vcell.test.Fast +mvn test -Dgroups="Fast" INSTALL_DIR=$(pwd) cd ${INSTALL_DIR}/pythonCopasiOpt/vcell-opt diff --git a/vcell-admin/src/test/java/cbit/vcell/client/ClientTaskDispatcherTest.java b/vcell-admin/src/test/java/cbit/vcell/client/ClientTaskDispatcherTest.java index d7746bd55f..96720697e8 100644 --- a/vcell-admin/src/test/java/cbit/vcell/client/ClientTaskDispatcherTest.java +++ b/vcell-admin/src/test/java/cbit/vcell/client/ClientTaskDispatcherTest.java @@ -3,6 +3,7 @@ import static cbit.vcell.client.task.AsynchClientTask.TASKTYPE_NONSWING_BLOCKING; import static cbit.vcell.client.task.AsynchClientTask.TASKTYPE_SWING_BLOCKING; import static cbit.vcell.client.task.AsynchClientTask.TASKTYPE_SWING_NONBLOCKING; +import org.junit.jupiter.api.Tag; import java.awt.Component; import java.awt.Label; @@ -18,7 +19,7 @@ import org.vcell.test.Fast; @Ignore -@Category(Fast.class) +@Tag("Fast") public class ClientTaskDispatcherTest { private Hashtable ht = new Hashtable<>(); private Component cmpt = new Label() ; diff --git a/vcell-admin/src/test/java/cbit/vcell/util/AmplistorUtilsTest.java b/vcell-admin/src/test/java/cbit/vcell/util/AmplistorUtilsTest.java index 6d5acf5c9a..d6cd4c9312 100644 --- a/vcell-admin/src/test/java/cbit/vcell/util/AmplistorUtilsTest.java +++ b/vcell-admin/src/test/java/cbit/vcell/util/AmplistorUtilsTest.java @@ -2,7 +2,7 @@ import java.io.BufferedInputStream; import java.io.BufferedOutputStream; -import java.io.DataInputStream; +import org.junit.jupiter.api.Tag; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -27,7 +27,7 @@ import cbit.vcell.util.AmplistorUtils.AmplistorCredential; @Ignore -@Category(Fast.class) +@Tag("Fast") public class AmplistorUtilsTest { private static final int NUMFILES = 5; diff --git a/vcell-cli/src/test/java/org/vcell/cli/run/BSTSBasedOmexExecTest.java b/vcell-cli/src/test/java/org/vcell/cli/run/BSTSBasedOmexExecTest.java index 3864b716f1..5116548c05 100644 --- a/vcell-cli/src/test/java/org/vcell/cli/run/BSTSBasedOmexExecTest.java +++ b/vcell-cli/src/test/java/org/vcell/cli/run/BSTSBasedOmexExecTest.java @@ -3,6 +3,7 @@ import cbit.vcell.mongodb.VCMongoMessage; import cbit.vcell.resource.NativeLib; import cbit.vcell.resource.PropertyLoader; +import org.junit.jupiter.api.Tag; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -31,7 +32,7 @@ import org.vcell.test.BSTS_IT; import org.vcell.util.VCellUtilityHub; -@RunWith(Parameterized.class) +@Tag("BSTS_IT") @Category(BSTS_IT.class) public class BSTSBasedOmexExecTest { private final String testCaseFilename; diff --git a/vcell-cli/src/test/java/org/vcell/cli/run/BSTSBasedTestSuiteFiles.java b/vcell-cli/src/test/java/org/vcell/cli/run/BSTSBasedTestSuiteFiles.java index e0609abd24..59fd431567 100644 --- a/vcell-cli/src/test/java/org/vcell/cli/run/BSTSBasedTestSuiteFiles.java +++ b/vcell-cli/src/test/java/org/vcell/cli/run/BSTSBasedTestSuiteFiles.java @@ -1,7 +1,7 @@ package org.vcell.cli.run; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @@ -11,7 +11,7 @@ import java.util.function.Predicate; -@Category(Fast.class) +@Tag("Fast") public class BSTSBasedTestSuiteFiles { private final static String[] allTestFiles = new String[]{ diff --git a/vcell-cli/src/test/java/org/vcell/cli/run/BiosimulationsExecTest.java b/vcell-cli/src/test/java/org/vcell/cli/run/BiosimulationsExecTest.java index 7b52bff835..ad2f48973a 100644 --- a/vcell-cli/src/test/java/org/vcell/cli/run/BiosimulationsExecTest.java +++ b/vcell-cli/src/test/java/org/vcell/cli/run/BiosimulationsExecTest.java @@ -6,7 +6,7 @@ import org.apache.commons.io.FileUtils; import org.junit.Assert; import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -32,6 +32,7 @@ @RunWith(Parameterized.class) @Category(BSTS_IT.class) +@Tag("BSTS_IT") public class BiosimulationsExecTest { private final String testCaseProjectID; diff --git a/vcell-cli/src/test/java/org/vcell/cli/run/BiosimulationsFiles.java b/vcell-cli/src/test/java/org/vcell/cli/run/BiosimulationsFiles.java index 4565e48012..4a8f5f8856 100644 --- a/vcell-cli/src/test/java/org/vcell/cli/run/BiosimulationsFiles.java +++ b/vcell-cli/src/test/java/org/vcell/cli/run/BiosimulationsFiles.java @@ -2,7 +2,7 @@ import org.junit.Assert; import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; import org.vcell.test.Fast; import java.io.InputStream; @@ -10,7 +10,7 @@ import java.util.function.Predicate; -@Category(Fast.class) +@Tag("Fast") public class BiosimulationsFiles { private final static String[] allProjectIDs = new String[]{ diff --git a/vcell-cli/src/test/java/org/vcell/cli/run/ExecuteImplTest.java b/vcell-cli/src/test/java/org/vcell/cli/run/ExecuteImplTest.java index 2b72e750f8..c6d2a8e2b1 100644 --- a/vcell-cli/src/test/java/org/vcell/cli/run/ExecuteImplTest.java +++ b/vcell-cli/src/test/java/org/vcell/cli/run/ExecuteImplTest.java @@ -3,7 +3,7 @@ import cbit.vcell.mongodb.VCMongoMessage; import cbit.vcell.resource.NativeLib; import cbit.vcell.resource.PropertyLoader; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.cli.CLIPythonManager; import org.vcell.cli.CLIRecorder; @@ -18,7 +18,7 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; -@Category(Fast.class) +@Tag("Fast") public class ExecuteImplTest { @Test diff --git a/vcell-cli/src/test/java/org/vcell/cli/run/SpatialArchiveFiles.java b/vcell-cli/src/test/java/org/vcell/cli/run/SpatialArchiveFiles.java index 6933c48108..611c327ae3 100644 --- a/vcell-cli/src/test/java/org/vcell/cli/run/SpatialArchiveFiles.java +++ b/vcell-cli/src/test/java/org/vcell/cli/run/SpatialArchiveFiles.java @@ -1,7 +1,7 @@ package org.vcell.cli.run; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @@ -11,6 +11,7 @@ import java.util.function.Predicate; @Category(Fast.class) +@Tag("Fast") public class SpatialArchiveFiles { private final static String[] allTestFiles = new String[]{ "TinySpatialProject.omex", diff --git a/vcell-cli/src/test/java/org/vcell/cli/run/SpatialExecTest.java b/vcell-cli/src/test/java/org/vcell/cli/run/SpatialExecTest.java index d22b1f59fb..d0ecb7e78d 100644 --- a/vcell-cli/src/test/java/org/vcell/cli/run/SpatialExecTest.java +++ b/vcell-cli/src/test/java/org/vcell/cli/run/SpatialExecTest.java @@ -6,7 +6,7 @@ import org.apache.commons.io.FileUtils; import org.junit.Assert; import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -28,6 +28,7 @@ @RunWith(Parameterized.class) @Category(Spatial_IT.class) +@Tag("Spatial_IT") public class SpatialExecTest { private final String testCaseFilename; diff --git a/vcell-cli/src/test/java/org/vcell/cli/run/hdf5/Hdf5WriterTest.java b/vcell-cli/src/test/java/org/vcell/cli/run/hdf5/Hdf5WriterTest.java index 2884b97b5a..2e5aa178ad 100644 --- a/vcell-cli/src/test/java/org/vcell/cli/run/hdf5/Hdf5WriterTest.java +++ b/vcell-cli/src/test/java/org/vcell/cli/run/hdf5/Hdf5WriterTest.java @@ -4,7 +4,7 @@ import com.google.common.io.Files; import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; import org.jlibsedml.DataSet; -import cbit.vcell.resource.NativeLib; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @@ -18,7 +18,7 @@ import java.util.LinkedHashMap; import java.util.List; -@Category(Fast.class) +@Tag("Fast") public class Hdf5WriterTest { public static Hdf5DataContainer createExampleData() { diff --git a/vcell-client/src/test/java/org/vcell/util/gui/GeneralGuiUtilsTest.java b/vcell-client/src/test/java/org/vcell/util/gui/GeneralGuiUtilsTest.java index 8c36e8fdb6..561986dd55 100644 --- a/vcell-client/src/test/java/org/vcell/util/gui/GeneralGuiUtilsTest.java +++ b/vcell-client/src/test/java/org/vcell/util/gui/GeneralGuiUtilsTest.java @@ -1,7 +1,7 @@ package org.vcell.util.gui; import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @@ -12,7 +12,7 @@ import static org.junit.Assert.*; -@Category(Fast.class) +@Tag("Fast") public class GeneralGuiUtilsTest { private void aTest(BiFunction, Component, Container> method){ diff --git a/vcell-client/src/test/java/org/vcell/util/gui/GraphicExecutableFinderTest.java b/vcell-client/src/test/java/org/vcell/util/gui/GraphicExecutableFinderTest.java index 77a0c9f89d..27fa569984 100644 --- a/vcell-client/src/test/java/org/vcell/util/gui/GraphicExecutableFinderTest.java +++ b/vcell-client/src/test/java/org/vcell/util/gui/GraphicExecutableFinderTest.java @@ -1,12 +1,13 @@ package org.vcell.util.gui; import java.awt.Component; +import org.junit.jupiter.api.Tag; import java.io.File; import java.io.FileNotFoundException; import java.util.prefs.BackingStoreException; import javax.swing.JFrame; - +@Tag("Fast") import org.junit.Ignore; import cbit.vcell.resource.ResourceUtil; diff --git a/vcell-client/src/test/java/org/vcell/util/gui/VCellIconsTest.java b/vcell-client/src/test/java/org/vcell/util/gui/VCellIconsTest.java index e3703b34db..b7e95cc60f 100644 --- a/vcell-client/src/test/java/org/vcell/util/gui/VCellIconsTest.java +++ b/vcell-client/src/test/java/org/vcell/util/gui/VCellIconsTest.java @@ -1,5 +1,6 @@ package org.vcell.util.gui; +import org.junit.jupiter.api.Tag; import java.net.URL; import java.util.Map.Entry; @@ -8,7 +9,7 @@ import org.junit.experimental.categories.Category; import org.vcell.test.Fast; -@Category(Fast.class) +@Tag("Fast") public class VCellIconsTest { @Test diff --git a/vcell-core/src/main/java/cbit/vcell/math/MathUtilities.java b/vcell-core/src/main/java/cbit/vcell/math/MathUtilities.java index 7abcc09ed8..1748c42d11 100644 --- a/vcell-core/src/main/java/cbit/vcell/math/MathUtilities.java +++ b/vcell-core/src/main/java/cbit/vcell/math/MathUtilities.java @@ -17,7 +17,7 @@ import cbit.vcell.solver.SimulationSymbolTable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.vcell.test.Fast; + /** * Insert the type's description here. diff --git a/vcell-core/src/test/java/cbit/image/VCImageTest.java b/vcell-core/src/test/java/cbit/image/VCImageTest.java index 0051f6d413..0097ebf679 100644 --- a/vcell-core/src/test/java/cbit/image/VCImageTest.java +++ b/vcell-core/src/test/java/cbit/image/VCImageTest.java @@ -10,7 +10,7 @@ import cbit.vcell.xml.XmlHelper; import cbit.vcell.xml.XmlParseException; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.sbml.vcell.SBMLExporter; import org.vcell.sbml.vcell.SBMLImporter; @@ -20,7 +20,7 @@ import java.io.StringBufferInputStream; import java.util.Random; -@Category(Fast.class) +@Tag("Fast") public class VCImageTest { @Test diff --git a/vcell-core/src/test/java/cbit/vcell/biomodel/MathOverrideApplyTest.java b/vcell-core/src/test/java/cbit/vcell/biomodel/MathOverrideApplyTest.java index 1a64f2b78c..5b325a85c8 100644 --- a/vcell-core/src/test/java/cbit/vcell/biomodel/MathOverrideApplyTest.java +++ b/vcell-core/src/test/java/cbit/vcell/biomodel/MathOverrideApplyTest.java @@ -9,7 +9,7 @@ import cbit.vcell.xml.XmlParseException; import org.junit.AfterClass; import org.junit.Assert; -import org.junit.BeforeClass; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -25,6 +25,7 @@ @Category(MathGen_IT.class) @RunWith(Parameterized.class) +@Tag("MathGen_IT") public class MathOverrideApplyTest { private String filename_colon_appname; diff --git a/vcell-core/src/test/java/cbit/vcell/biomodel/MathOverrideRoundTipTest.java b/vcell-core/src/test/java/cbit/vcell/biomodel/MathOverrideRoundTipTest.java index 689b18cede..abdcad52d4 100644 --- a/vcell-core/src/test/java/cbit/vcell/biomodel/MathOverrideRoundTipTest.java +++ b/vcell-core/src/test/java/cbit/vcell/biomodel/MathOverrideRoundTipTest.java @@ -12,7 +12,7 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -34,6 +34,7 @@ @Category(Fast.class) @RunWith(Parameterized.class) +@Tag("Fast") public class MathOverrideRoundTipTest { private final String filename; diff --git a/vcell-core/src/test/java/cbit/vcell/biomodel/ModelCountAndConcentrationTest.java b/vcell-core/src/test/java/cbit/vcell/biomodel/ModelCountAndConcentrationTest.java index ac6bc61f76..2511d8d264 100644 --- a/vcell-core/src/test/java/cbit/vcell/biomodel/ModelCountAndConcentrationTest.java +++ b/vcell-core/src/test/java/cbit/vcell/biomodel/ModelCountAndConcentrationTest.java @@ -17,7 +17,7 @@ import cbit.vcell.xml.XmlHelper; import cbit.vcell.xml.XmlParseException; import org.apache.commons.io.IOUtils; -import org.junit.Assert; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @@ -29,6 +29,7 @@ import java.nio.charset.StandardCharsets; @Category(Fast.class) +@Tag("Fast") public class ModelCountAndConcentrationTest { @Test diff --git a/vcell-core/src/test/java/cbit/vcell/biomodel/ModelUnitConverterTest.java b/vcell-core/src/test/java/cbit/vcell/biomodel/ModelUnitConverterTest.java index 5242a08c45..85732549df 100644 --- a/vcell-core/src/test/java/cbit/vcell/biomodel/ModelUnitConverterTest.java +++ b/vcell-core/src/test/java/cbit/vcell/biomodel/ModelUnitConverterTest.java @@ -22,7 +22,7 @@ import cbit.vcell.xml.XmlHelper; import cbit.vcell.xml.XmlParseException; import org.apache.commons.io.IOUtils; -import org.junit.Assert; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @@ -38,6 +38,7 @@ import java.util.Map; @Category(Fast.class) +@Tag("Fast") public class ModelUnitConverterTest { @Test diff --git a/vcell-core/src/test/java/cbit/vcell/biomodel/SpringSaLaDGoodReactionsTest.java b/vcell-core/src/test/java/cbit/vcell/biomodel/SpringSaLaDGoodReactionsTest.java index 8314fa8e34..392484b642 100644 --- a/vcell-core/src/test/java/cbit/vcell/biomodel/SpringSaLaDGoodReactionsTest.java +++ b/vcell-core/src/test/java/cbit/vcell/biomodel/SpringSaLaDGoodReactionsTest.java @@ -22,6 +22,7 @@ import org.apache.commons.io.IOUtils; import org.junit.*; import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; import org.vcell.model.rbm.MolecularComponentPattern; import org.vcell.solver.langevin.LangevinLngvWriter; import org.vcell.solver.langevin.LangevinSolver; @@ -40,6 +41,7 @@ import java.util.*; @Category(Fast.class) +@Tag("Fast") public class SpringSaLaDGoodReactionsTest { private static final String reactionTestString = "'r0' :: 'MT0' : 'Site1' : 'state0' --> 'state1' Rate 50.0 Condition Free"; diff --git a/vcell-core/src/test/java/cbit/vcell/export/N5ExporterTest.java b/vcell-core/src/test/java/cbit/vcell/export/N5ExporterTest.java index abb1637d5d..3958c748d8 100644 --- a/vcell-core/src/test/java/cbit/vcell/export/N5ExporterTest.java +++ b/vcell-core/src/test/java/cbit/vcell/export/N5ExporterTest.java @@ -20,7 +20,7 @@ import cbit.vcell.solver.AnnotatedFunction; import cbit.vcell.solver.VCSimulationDataIdentifier; import org.janelia.saalfeldlab.n5.*; -import org.junit.After; +import org.junit.jupiter.api.*; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -35,6 +35,7 @@ import java.util.Random; @Category(Fast.class) +@Tag("Fast") public class N5ExporterTest { private N5Reader n5Reader; diff --git a/vcell-core/src/test/java/cbit/vcell/mapping/MathGenCompareTest.java b/vcell-core/src/test/java/cbit/vcell/mapping/MathGenCompareTest.java index 897dd9d640..876180f638 100644 --- a/vcell-core/src/test/java/cbit/vcell/mapping/MathGenCompareTest.java +++ b/vcell-core/src/test/java/cbit/vcell/mapping/MathGenCompareTest.java @@ -13,7 +13,7 @@ import org.junit.*; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Tag; import org.vcell.sbml.VcmlTestSuiteFiles; import org.vcell.test.MathGen_IT; import org.vcell.util.document.Version; @@ -26,6 +26,7 @@ @Category(MathGen_IT.class) @RunWith(Parameterized.class) +@Tag("MathGen_IT") public class MathGenCompareTest { private String filename_colon_appname; diff --git a/vcell-core/src/test/java/cbit/vcell/math/CommentedObjectTest.java b/vcell-core/src/test/java/cbit/vcell/math/CommentedObjectTest.java index cfdd8a3ade..c06853054d 100644 --- a/vcell-core/src/test/java/cbit/vcell/math/CommentedObjectTest.java +++ b/vcell-core/src/test/java/cbit/vcell/math/CommentedObjectTest.java @@ -1,11 +1,12 @@ package cbit.vcell.math; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @Category(Fast.class) +@Tag("Fast") public class CommentedObjectTest { @Test diff --git a/vcell-core/src/test/java/cbit/vcell/math/RowColumnResultSetTest.java b/vcell-core/src/test/java/cbit/vcell/math/RowColumnResultSetTest.java index b029c34d97..bd07947150 100644 --- a/vcell-core/src/test/java/cbit/vcell/math/RowColumnResultSetTest.java +++ b/vcell-core/src/test/java/cbit/vcell/math/RowColumnResultSetTest.java @@ -15,9 +15,9 @@ import cbit.vcell.parser.Expression; import org.junit.experimental.categories.Category; -import org.vcell.test.Fast; +import org.junit.jupiter.api.Tag; -@Category(Fast.class) +@Tag("Fast") public class RowColumnResultSetTest { @Test diff --git a/vcell-core/src/test/java/cbit/vcell/math/VariableTypeTest.java b/vcell-core/src/test/java/cbit/vcell/math/VariableTypeTest.java index 5bd4872a54..1a66d87d60 100644 --- a/vcell-core/src/test/java/cbit/vcell/math/VariableTypeTest.java +++ b/vcell-core/src/test/java/cbit/vcell/math/VariableTypeTest.java @@ -1,12 +1,12 @@ package cbit.vcell.math; import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @Ignore -@Category(Fast.class) +@Tag("Fast") public class VariableTypeTest { @Test diff --git a/vcell-core/src/test/java/cbit/vcell/message/server/bootstrap/client/RemoteProxyVCellConnectionFactoryTest.java b/vcell-core/src/test/java/cbit/vcell/message/server/bootstrap/client/RemoteProxyVCellConnectionFactoryTest.java index d73bfd9be3..7544389636 100644 --- a/vcell-core/src/test/java/cbit/vcell/message/server/bootstrap/client/RemoteProxyVCellConnectionFactoryTest.java +++ b/vcell-core/src/test/java/cbit/vcell/message/server/bootstrap/client/RemoteProxyVCellConnectionFactoryTest.java @@ -2,7 +2,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; - +import org.junit.jupiter.api.*; import java.io.IOException; import org.junit.After; @@ -24,6 +24,7 @@ @Ignore @Category(Fast.class) +@Tag("Fast") public class RemoteProxyVCellConnectionFactoryTest { private RemoteProxyVCellConnectionFactory factory = null; diff --git a/vcell-core/src/test/java/cbit/vcell/message/server/cmd/CommandServiceSshNativeTest.java b/vcell-core/src/test/java/cbit/vcell/message/server/cmd/CommandServiceSshNativeTest.java index 714fd2f5ab..b777148eee 100644 --- a/vcell-core/src/test/java/cbit/vcell/message/server/cmd/CommandServiceSshNativeTest.java +++ b/vcell-core/src/test/java/cbit/vcell/message/server/cmd/CommandServiceSshNativeTest.java @@ -1,6 +1,7 @@ package cbit.vcell.message.server.cmd; import static org.junit.Assert.fail; +import org.junit.jupiter.api.*; import java.io.File; import java.io.IOException; @@ -14,7 +15,7 @@ import org.vcell.util.exe.ExecutableException; import cbit.vcell.message.server.cmd.CommandService.CommandOutput; -import cbit.vcell.mongodb.VCMongoMessage; +@Tag("Fast") @Ignore @Category(Fast.class) diff --git a/vcell-core/src/test/java/cbit/vcell/message/server/cmd/CommandServiceSsh_sshjTest.java b/vcell-core/src/test/java/cbit/vcell/message/server/cmd/CommandServiceSsh_sshjTest.java index 1693880cf5..8c45fe9b8a 100644 --- a/vcell-core/src/test/java/cbit/vcell/message/server/cmd/CommandServiceSsh_sshjTest.java +++ b/vcell-core/src/test/java/cbit/vcell/message/server/cmd/CommandServiceSsh_sshjTest.java @@ -1,6 +1,7 @@ package cbit.vcell.message.server.cmd; import static org.junit.Assert.fail; +import org.junit.jupiter.api.*; import java.io.File; import java.io.IOException; @@ -14,7 +15,7 @@ import org.vcell.util.exe.ExecutableException; import cbit.vcell.message.server.cmd.CommandService.CommandOutput; -import cbit.vcell.mongodb.VCMongoMessage; +@Tag("Fast") @Ignore @Category(Fast.class) diff --git a/vcell-core/src/test/java/cbit/vcell/model/MassActionSolverTest.java b/vcell-core/src/test/java/cbit/vcell/model/MassActionSolverTest.java index fc91b63211..15098bf23d 100644 --- a/vcell-core/src/test/java/cbit/vcell/model/MassActionSolverTest.java +++ b/vcell-core/src/test/java/cbit/vcell/model/MassActionSolverTest.java @@ -1,5 +1,6 @@ package cbit.vcell.model; +import org.junit.jupiter.api.Tag; import java.beans.PropertyVetoException; import java.io.BufferedReader; import java.io.IOException; @@ -7,7 +8,7 @@ import java.io.InputStreamReader; import java.util.stream.Collectors; -import org.junit.Test; +@Tag("Fast") import org.junit.experimental.categories.Category; import org.vcell.sbml.VcmlTestSuiteFiles; diff --git a/vcell-core/src/test/java/cbit/vcell/resource/ErrorUtilsTest.java b/vcell-core/src/test/java/cbit/vcell/resource/ErrorUtilsTest.java index 7166a3ac75..97ca516281 100644 --- a/vcell-core/src/test/java/cbit/vcell/resource/ErrorUtilsTest.java +++ b/vcell-core/src/test/java/cbit/vcell/resource/ErrorUtilsTest.java @@ -1,7 +1,7 @@ package cbit.vcell.resource; import com.google.gson.Gson; -import org.junit.Assert; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -12,6 +12,7 @@ @Category(Fast.class) @RunWith(Parameterized.class) +@Tag("Fast") public class ErrorUtilsTest { private ErrorUtils.ErrorReport errorReport; diff --git a/vcell-core/src/test/java/cbit/vcell/resource/LicenseTest.java b/vcell-core/src/test/java/cbit/vcell/resource/LicenseTest.java index 0f8cdfe072..2f773b19bc 100644 --- a/vcell-core/src/test/java/cbit/vcell/resource/LicenseTest.java +++ b/vcell-core/src/test/java/cbit/vcell/resource/LicenseTest.java @@ -1,12 +1,12 @@ package cbit.vcell.resource; import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @Ignore -@Category(Fast.class) +@Tag("Fast") public class LicenseTest { @Test diff --git a/vcell-core/src/test/java/cbit/vcell/resource/NativeLibTest.java b/vcell-core/src/test/java/cbit/vcell/resource/NativeLibTest.java index c5827c939a..db6acaa5d7 100644 --- a/vcell-core/src/test/java/cbit/vcell/resource/NativeLibTest.java +++ b/vcell-core/src/test/java/cbit/vcell/resource/NativeLibTest.java @@ -1,11 +1,11 @@ package cbit.vcell.resource; import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; -@Category(Fast.class) +@Tag("Fast") public class NativeLibTest { @Before public void init( ) { diff --git a/vcell-core/src/test/java/cbit/vcell/resource/PropertyLoaderTest.java b/vcell-core/src/test/java/cbit/vcell/resource/PropertyLoaderTest.java index c8dfa8d0d9..ab833e1df8 100644 --- a/vcell-core/src/test/java/cbit/vcell/resource/PropertyLoaderTest.java +++ b/vcell-core/src/test/java/cbit/vcell/resource/PropertyLoaderTest.java @@ -1,6 +1,6 @@ package cbit.vcell.resource; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Tag; import java.io.File; import java.io.IOException; @@ -9,7 +9,7 @@ import org.junit.experimental.categories.Category; import org.vcell.test.Fast; -@Category(Fast.class) +@Tag("Fast") public class PropertyLoaderTest { diff --git a/vcell-core/src/test/java/cbit/vcell/simdata/DataSetControllerImplTest.java b/vcell-core/src/test/java/cbit/vcell/simdata/DataSetControllerImplTest.java index 4f99b9c484..d2b5177ba0 100644 --- a/vcell-core/src/test/java/cbit/vcell/simdata/DataSetControllerImplTest.java +++ b/vcell-core/src/test/java/cbit/vcell/simdata/DataSetControllerImplTest.java @@ -23,10 +23,11 @@ import cbit.vcell.solver.AnnotatedFunction; import cbit.vcell.solver.VCSimulationDataIdentifier; import cbit.vcell.solver.VCSimulationIdentifier; -import junit.framework.TestCase; +import org.junit.jupiter.api.*; @Category(Fast.class) public class DataSetControllerImplTest extends TestCase { +@Tag("Fast") DataSetControllerImpl dsc = null; VCSimulationDataIdentifier vcDataIdentifier = null; OutputContext outputContext = new OutputContext(new AnnotatedFunction[] {}); diff --git a/vcell-core/src/test/java/cbit/vcell/simdata/SimulationDataTest.java b/vcell-core/src/test/java/cbit/vcell/simdata/SimulationDataTest.java index 0d747a8dd7..75cb350d3a 100644 --- a/vcell-core/src/test/java/cbit/vcell/simdata/SimulationDataTest.java +++ b/vcell-core/src/test/java/cbit/vcell/simdata/SimulationDataTest.java @@ -11,13 +11,13 @@ package cbit.vcell.simdata; import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; import org.vcell.test.Fast; import org.vcell.util.document.KeyValue; import cbit.vcell.util.AmplistorUtils; -@Category(Fast.class) +@Tag("Fast") public class SimulationDataTest { @SuppressWarnings("unused") private static int jIndexes[] = {0,2,4,7,16,32,64}; diff --git a/vcell-core/src/test/java/cbit/vcell/solver/MathOverridesTest.java b/vcell-core/src/test/java/cbit/vcell/solver/MathOverridesTest.java index ae747ef2f8..8174ff04bb 100644 --- a/vcell-core/src/test/java/cbit/vcell/solver/MathOverridesTest.java +++ b/vcell-core/src/test/java/cbit/vcell/solver/MathOverridesTest.java @@ -2,7 +2,7 @@ import cbit.vcell.parser.Expression; import cbit.vcell.parser.ExpressionException; -import org.junit.Assert; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @@ -12,6 +12,7 @@ import java.util.List; @Category(Fast.class) +@Tag("Fast") public class MathOverridesTest { @Test diff --git a/vcell-core/src/test/java/cbit/vcell/solver/SolverDescriptionRegression.java b/vcell-core/src/test/java/cbit/vcell/solver/SolverDescriptionRegression.java index 58674993d8..d864977702 100644 --- a/vcell-core/src/test/java/cbit/vcell/solver/SolverDescriptionRegression.java +++ b/vcell-core/src/test/java/cbit/vcell/solver/SolverDescriptionRegression.java @@ -2,6 +2,7 @@ import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Tag; import java.io.BufferedReader; import java.io.CharArrayReader; @@ -20,7 +21,7 @@ import org.junit.Test; -import cbit.vcell.math.ProblemRequirements; +@Tag("Fast") import cbit.vcell.solver.SolverDescription.SolverFeature; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; diff --git a/vcell-core/src/test/java/cbit/vcell/solver/TestMathDescription.java b/vcell-core/src/test/java/cbit/vcell/solver/TestMathDescription.java index 532236c686..45c536b23c 100644 --- a/vcell-core/src/test/java/cbit/vcell/solver/TestMathDescription.java +++ b/vcell-core/src/test/java/cbit/vcell/solver/TestMathDescription.java @@ -3,10 +3,10 @@ import org.junit.Test; import cbit.vcell.math.ProblemRequirements; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; import org.vcell.test.Fast; -@Category(Fast.class) +@Tag("Fast") public class TestMathDescription implements ProblemRequirements { /* (non-Javadoc) diff --git a/vcell-core/src/test/java/cbit/vcell/solvers/ExecutableCommandTest.java b/vcell-core/src/test/java/cbit/vcell/solvers/ExecutableCommandTest.java index 9397b97cee..5927687ec0 100644 --- a/vcell-core/src/test/java/cbit/vcell/solvers/ExecutableCommandTest.java +++ b/vcell-core/src/test/java/cbit/vcell/solvers/ExecutableCommandTest.java @@ -4,11 +4,12 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @Category(Fast.class) +@Tag("Fast") public class ExecutableCommandTest { private ExecutableCommand.Container ctn; diff --git a/vcell-core/src/test/java/cbit/vcell/solvers/mb/H5FileStructure.java b/vcell-core/src/test/java/cbit/vcell/solvers/mb/H5FileStructure.java index c006d395fb..546e3d26b4 100644 --- a/vcell-core/src/test/java/cbit/vcell/solvers/mb/H5FileStructure.java +++ b/vcell-core/src/test/java/cbit/vcell/solvers/mb/H5FileStructure.java @@ -24,6 +24,7 @@ import ncsa.hdf.object.Group; import ncsa.hdf.object.HObject; import ncsa.hdf.object.h5.H5File; +import org.junit.jupiter.api.Tag; import org.vcell.util.CastingUtils; /** @@ -50,7 +51,7 @@ * @author Peter X. Cao * @version 2.4 */ -@Category(Fast.class) +@Tag("Fast") public class H5FileStructure extends H5Client { private static String fname = FILE; private static long[] dims2D = {20, 10}; diff --git a/vcell-core/src/test/java/cbit/vcell/solvers/mb/IndexTest.java b/vcell-core/src/test/java/cbit/vcell/solvers/mb/IndexTest.java index 8cd1147811..4882992180 100644 --- a/vcell-core/src/test/java/cbit/vcell/solvers/mb/IndexTest.java +++ b/vcell-core/src/test/java/cbit/vcell/solvers/mb/IndexTest.java @@ -1,6 +1,6 @@ package cbit.vcell.solvers.mb; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Tag; import java.util.ArrayList; import java.util.HashMap; @@ -14,7 +14,7 @@ /** * test {@link PointIndexTreeAndList} implementation */ -@Category(Fast.class) +@Tag("Fast") public class IndexTest { private static final double VALUES[] = { 0.3954988527, diff --git a/vcell-core/src/test/java/cbit/vcell/solvers/mb/MovingBoundaryResultTest.java b/vcell-core/src/test/java/cbit/vcell/solvers/mb/MovingBoundaryResultTest.java index 05e1ace370..da0ecad388 100644 --- a/vcell-core/src/test/java/cbit/vcell/solvers/mb/MovingBoundaryResultTest.java +++ b/vcell-core/src/test/java/cbit/vcell/solvers/mb/MovingBoundaryResultTest.java @@ -6,7 +6,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import cbit.vcell.solvers.mb.MovingBoundaryTypes.Element; import cbit.vcell.solvers.mb.MovingBoundaryTypes.MeshInfo; @@ -17,7 +17,7 @@ import org.vcell.test.Fast; @Ignore -@Category(Fast.class) +@Tag("Fast") public class MovingBoundaryResultTest extends H5Client { private static String fname = FILE; MovingBoundaryReader mbr; diff --git a/vcell-core/src/test/java/cbit/vcell/solvers/mb/VH5PathTest.java b/vcell-core/src/test/java/cbit/vcell/solvers/mb/VH5PathTest.java index a76abc77ed..44aa35a087 100644 --- a/vcell-core/src/test/java/cbit/vcell/solvers/mb/VH5PathTest.java +++ b/vcell-core/src/test/java/cbit/vcell/solvers/mb/VH5PathTest.java @@ -24,10 +24,11 @@ import ncsa.hdf.object.FileFormat; import ncsa.hdf.object.Group; import org.junit.experimental.categories.Category; -import org.vcell.test.Fast; +import org.junit.jupiter.api.*; @Ignore @Category(Fast.class) +@Tag("Fast") public class VH5PathTest extends H5Client { private static String fname = FILE; private FileFormat testFile = null; diff --git a/vcell-core/src/test/java/cbit/vcell/tools/PortableCommandWrapperTest.java b/vcell-core/src/test/java/cbit/vcell/tools/PortableCommandWrapperTest.java index 0a34126118..290b0c4e81 100644 --- a/vcell-core/src/test/java/cbit/vcell/tools/PortableCommandWrapperTest.java +++ b/vcell-core/src/test/java/cbit/vcell/tools/PortableCommandWrapperTest.java @@ -1,5 +1,6 @@ package cbit.vcell.tools; +import org.junit.jupiter.api.Tag; import java.io.IOException; import java.util.Collection; @@ -15,7 +16,7 @@ * test {@link PortableCommandWrapper} * @author gweatherby */ -@Category(Fast.class) +@Tag("Fast") public class PortableCommandWrapperTest { private static final String FILE = "z:/t.sub"; diff --git a/vcell-core/src/test/java/cbit/vcell/util/CountingLineReaderTest.java b/vcell-core/src/test/java/cbit/vcell/util/CountingLineReaderTest.java index f147cf6430..d74b162fe4 100644 --- a/vcell-core/src/test/java/cbit/vcell/util/CountingLineReaderTest.java +++ b/vcell-core/src/test/java/cbit/vcell/util/CountingLineReaderTest.java @@ -1,5 +1,6 @@ package cbit.vcell.util; +import org.junit.jupiter.api.Tag; import java.io.IOException; import java.io.StringReader; @@ -10,7 +11,7 @@ import org.vcell.util.CountingLineReader; @Ignore -@Category(Fast.class) +@Tag("Fast") public class CountingLineReaderTest { private final static String BLB = diff --git a/vcell-core/src/test/java/cbit/vcell/util/EventRateLimiterTest.java b/vcell-core/src/test/java/cbit/vcell/util/EventRateLimiterTest.java index d3d26fbb26..9394c0200d 100644 --- a/vcell-core/src/test/java/cbit/vcell/util/EventRateLimiterTest.java +++ b/vcell-core/src/test/java/cbit/vcell/util/EventRateLimiterTest.java @@ -1,6 +1,7 @@ package cbit.vcell.util; import static org.junit.Assert.fail; +import org.junit.jupiter.api.Tag; import org.junit.Ignore; import org.junit.Test; @@ -8,7 +9,7 @@ import org.vcell.test.Fast; @Ignore -@Category(Fast.class) +@Tag("Fast") public class EventRateLimiterTest { @Test diff --git a/vcell-core/src/test/java/cbit/vcell/util/SkipCommentLineReaderTest.java b/vcell-core/src/test/java/cbit/vcell/util/SkipCommentLineReaderTest.java index f792cb42cf..b3dae2ff29 100644 --- a/vcell-core/src/test/java/cbit/vcell/util/SkipCommentLineReaderTest.java +++ b/vcell-core/src/test/java/cbit/vcell/util/SkipCommentLineReaderTest.java @@ -1,5 +1,6 @@ package cbit.vcell.util; +import org.junit.jupiter.api.Tag; import java.io.Reader; import java.io.StringReader; @@ -9,7 +10,7 @@ import org.vcell.test.Fast; import org.vcell.util.SkipCommentLineNumberReader; -@Category(Fast.class) +@Tag("Fast") public class SkipCommentLineReaderTest { private static final String UNCOMMENTED_TEXT = "Mary\nhad\na\nlittle\nlamb\n"; private static final String COMMENTED_TEXT_1 = "Mary\nhad\n#did she?\na\nlittle\nlamb\n"; diff --git a/vcell-core/src/test/java/org/vcell/core/DependencyInjectionTest.java b/vcell-core/src/test/java/org/vcell/core/DependencyInjectionTest.java index a7809dcfa1..2439de09d6 100644 --- a/vcell-core/src/test/java/org/vcell/core/DependencyInjectionTest.java +++ b/vcell-core/src/test/java/org/vcell/core/DependencyInjectionTest.java @@ -6,11 +6,12 @@ import com.google.inject.Inject; import com.google.inject.Injector; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @Category(Fast.class) +@Tag("Fast") public class DependencyInjectionTest { interface TestService { int add(int a, int b); diff --git a/vcell-core/src/test/java/org/vcell/core/MatcheableTest.java b/vcell-core/src/test/java/org/vcell/core/MatcheableTest.java index d05f9b3d7e..b37e55b371 100644 --- a/vcell-core/src/test/java/org/vcell/core/MatcheableTest.java +++ b/vcell-core/src/test/java/org/vcell/core/MatcheableTest.java @@ -1,7 +1,7 @@ package org.vcell.core; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -14,7 +14,7 @@ /** * test {@link Matchable#areEqual(Matchable, Matchable)] */ -@Category(Fast.class) +@Tag("Fast") public class MatcheableTest { @Test diff --git a/vcell-core/src/test/java/org/vcell/movingboundary/TestMovingBoundarySolverSpec.java b/vcell-core/src/test/java/org/vcell/movingboundary/TestMovingBoundarySolverSpec.java index 43bbf42046..bc74d09ff8 100644 --- a/vcell-core/src/test/java/org/vcell/movingboundary/TestMovingBoundarySolverSpec.java +++ b/vcell-core/src/test/java/org/vcell/movingboundary/TestMovingBoundarySolverSpec.java @@ -1,6 +1,6 @@ package org.vcell.movingboundary; -import static junit.framework.Assert.assertTrue; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -9,6 +9,7 @@ import org.vcell.util.DataAccessException; @Category(Fast.class) +@Tag("Fast") public class TestMovingBoundarySolverSpec { @Test diff --git a/vcell-core/src/test/java/org/vcell/optimization/CopasiOptimizationSolverTest.java b/vcell-core/src/test/java/org/vcell/optimization/CopasiOptimizationSolverTest.java index fd96edf21e..bf4e3d7a84 100644 --- a/vcell-core/src/test/java/org/vcell/optimization/CopasiOptimizationSolverTest.java +++ b/vcell-core/src/test/java/org/vcell/optimization/CopasiOptimizationSolverTest.java @@ -14,7 +14,7 @@ import com.google.common.io.Files; import org.apache.commons.io.IOUtils; import org.junit.Assert; -import org.junit.BeforeClass; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.vcell.optimization.jtd.OptProblem; @@ -33,6 +33,7 @@ import java.util.Map; @Category(Fast.class) +@Tag("Fast") public class CopasiOptimizationSolverTest { @BeforeClass diff --git a/vcell-core/src/test/java/org/vcell/optimization/CopasiUtilsTest.java b/vcell-core/src/test/java/org/vcell/optimization/CopasiUtilsTest.java index ca9c2ae662..9ed41a5839 100644 --- a/vcell-core/src/test/java/org/vcell/optimization/CopasiUtilsTest.java +++ b/vcell-core/src/test/java/org/vcell/optimization/CopasiUtilsTest.java @@ -3,7 +3,7 @@ import cbit.vcell.xml.XmlParseException; import com.google.common.io.Files; import org.apache.commons.io.IOUtils; -import org.junit.Assert; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.vcell.optimization.jtd.OptProgressItem; @@ -17,6 +17,7 @@ import java.nio.charset.StandardCharsets; @Category(Fast.class) +@Tag("Fast") public class CopasiUtilsTest { @Test diff --git a/vcell-core/src/test/java/org/vcell/relationship/CachedDataBaseReferenceReaderTest.java b/vcell-core/src/test/java/org/vcell/relationship/CachedDataBaseReferenceReaderTest.java index 3e0c051b21..881cf0c3b2 100644 --- a/vcell-core/src/test/java/org/vcell/relationship/CachedDataBaseReferenceReaderTest.java +++ b/vcell-core/src/test/java/org/vcell/relationship/CachedDataBaseReferenceReaderTest.java @@ -2,12 +2,13 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; +import org.junit.jupiter.api.Tag; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; import java.util.ArrayList; -import org.junit.Ignore; +@Tag("Fast") import org.junit.Test; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; diff --git a/vcell-core/src/test/java/org/vcell/sbml/BMDB_SBMLImportTest.java b/vcell-core/src/test/java/org/vcell/sbml/BMDB_SBMLImportTest.java index 1257e53b66..d44c87167a 100644 --- a/vcell-core/src/test/java/org/vcell/sbml/BMDB_SBMLImportTest.java +++ b/vcell-core/src/test/java/org/vcell/sbml/BMDB_SBMLImportTest.java @@ -10,7 +10,7 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -26,6 +26,7 @@ @Category(SBML_IT.class) @RunWith(Parameterized.class) +@Tag("SBML_IT") public class BMDB_SBMLImportTest { private static class SBMLHighPriorityIssueException extends RuntimeException { diff --git a/vcell-core/src/test/java/org/vcell/sbml/BMDB_SBML_Files.java b/vcell-core/src/test/java/org/vcell/sbml/BMDB_SBML_Files.java index 4b06886daf..e9af7e95e6 100644 --- a/vcell-core/src/test/java/org/vcell/sbml/BMDB_SBML_Files.java +++ b/vcell-core/src/test/java/org/vcell/sbml/BMDB_SBML_Files.java @@ -1,6 +1,6 @@ package org.vcell.sbml; -import org.junit.Assert; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @@ -12,6 +12,7 @@ import java.util.stream.IntStream; @Category(Fast.class) +@Tag("Fast") public class BMDB_SBML_Files { public final static int[] allCuratedModels = IntStream.rangeClosed(1, 1064) diff --git a/vcell-core/src/test/java/org/vcell/sbml/SBMLImporterTest.java b/vcell-core/src/test/java/org/vcell/sbml/SBMLImporterTest.java index 26f452e401..e137293e00 100644 --- a/vcell-core/src/test/java/org/vcell/sbml/SBMLImporterTest.java +++ b/vcell-core/src/test/java/org/vcell/sbml/SBMLImporterTest.java @@ -1,11 +1,12 @@ package org.vcell.sbml; +import org.junit.jupiter.api.Tag; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.util.HashMap; -import javax.xml.stream.XMLStreamException; +@Tag("SBML_IT") import org.junit.Ignore; import org.junit.Test; diff --git a/vcell-core/src/test/java/org/vcell/sbml/SBMLTestSuiteTest.java b/vcell-core/src/test/java/org/vcell/sbml/SBMLTestSuiteTest.java index e079c55766..cb37b2cbb2 100644 --- a/vcell-core/src/test/java/org/vcell/sbml/SBMLTestSuiteTest.java +++ b/vcell-core/src/test/java/org/vcell/sbml/SBMLTestSuiteTest.java @@ -14,7 +14,7 @@ import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Logger; import org.junit.Assert; -import org.junit.BeforeClass; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -36,6 +36,7 @@ @Category(SBML_IT.class) @RunWith(Parameterized.class) +@Tag("SBML_IT") public class SBMLTestSuiteTest { private Integer testCase; diff --git a/vcell-core/src/test/java/org/vcell/sbml/SBMLUnitTranslatorTest.java b/vcell-core/src/test/java/org/vcell/sbml/SBMLUnitTranslatorTest.java index 6acf5c108b..4fa2a4a4e7 100644 --- a/vcell-core/src/test/java/org/vcell/sbml/SBMLUnitTranslatorTest.java +++ b/vcell-core/src/test/java/org/vcell/sbml/SBMLUnitTranslatorTest.java @@ -21,9 +21,11 @@ import cbit.vcell.units.VCUnitDefinition; import cbit.vcell.units.VCUnitSystem; import org.vcell.test.Fast; +import org.junit.jupiter.api.Tag; import ucar.units_vcell.RationalNumber; @Category(Fast.class) +@Tag("Fast") public class SBMLUnitTranslatorTest { public static File[] getBiomodelsCuratedSBMLFiles(){ diff --git a/vcell-core/src/test/java/org/vcell/sbml/SEDMLExporterSBMLTest.java b/vcell-core/src/test/java/org/vcell/sbml/SEDMLExporterSBMLTest.java index 9b8fef2488..3f5a642609 100644 --- a/vcell-core/src/test/java/org/vcell/sbml/SEDMLExporterSBMLTest.java +++ b/vcell-core/src/test/java/org/vcell/sbml/SEDMLExporterSBMLTest.java @@ -1,6 +1,6 @@ package org.vcell.sbml; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -12,7 +12,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -@RunWith(Parameterized.class) +@Tag("SEDML_SBML_IT") @Category({SEDML_SBML_IT.class}) public class SEDMLExporterSBMLTest extends SEDMLExporterCommon { diff --git a/vcell-core/src/test/java/org/vcell/sbml/SEDMLExporterVCMLTest.java b/vcell-core/src/test/java/org/vcell/sbml/SEDMLExporterVCMLTest.java index 0fb35d3cae..425c73de09 100644 --- a/vcell-core/src/test/java/org/vcell/sbml/SEDMLExporterVCMLTest.java +++ b/vcell-core/src/test/java/org/vcell/sbml/SEDMLExporterVCMLTest.java @@ -1,6 +1,6 @@ package org.vcell.sbml; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -12,7 +12,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -@RunWith(Parameterized.class) +@Tag("SEDML_VCML_IT") @Category({SEDML_VCML_IT.class}) public class SEDMLExporterVCMLTest extends SEDMLExporterCommon { diff --git a/vcell-core/src/test/java/org/vcell/sbml/SbmlTestSuiteFiles.java b/vcell-core/src/test/java/org/vcell/sbml/SbmlTestSuiteFiles.java index af1d0d0730..610865a36f 100644 --- a/vcell-core/src/test/java/org/vcell/sbml/SbmlTestSuiteFiles.java +++ b/vcell-core/src/test/java/org/vcell/sbml/SbmlTestSuiteFiles.java @@ -1,7 +1,7 @@ package org.vcell.sbml; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @@ -15,6 +15,7 @@ @Category(Fast.class) +@Tag("Fast") public class SbmlTestSuiteFiles { private final static int[] allTestCases = IntStream.rangeClosed(1, 1821).toArray(); diff --git a/vcell-core/src/test/java/org/vcell/sbml/StructureSizeSolverTest.java b/vcell-core/src/test/java/org/vcell/sbml/StructureSizeSolverTest.java index d5775be89c..d2e6a9510f 100644 --- a/vcell-core/src/test/java/org/vcell/sbml/StructureSizeSolverTest.java +++ b/vcell-core/src/test/java/org/vcell/sbml/StructureSizeSolverTest.java @@ -15,7 +15,7 @@ import cbit.vcell.xml.XmlHelper; import cbit.vcell.xml.XmlParseException; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.sbml.vcell.StructureSizeSolver; import org.vcell.test.Fast; @@ -24,6 +24,7 @@ import java.util.stream.Collectors; @Category(Fast.class) +@Tag("Fast") public class StructureSizeSolverTest { @Test diff --git a/vcell-core/src/test/java/org/vcell/sbml/VcmlTestSuiteFiles.java b/vcell-core/src/test/java/org/vcell/sbml/VcmlTestSuiteFiles.java index 6682a790d7..c7cee44083 100644 --- a/vcell-core/src/test/java/org/vcell/sbml/VcmlTestSuiteFiles.java +++ b/vcell-core/src/test/java/org/vcell/sbml/VcmlTestSuiteFiles.java @@ -1,7 +1,7 @@ package org.vcell.sbml; import cbit.vcell.parser.Expression; -import org.junit.Assert; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @@ -13,7 +13,7 @@ import java.util.function.Predicate; -@Category(Fast.class) +@Tag("Fast") public class VcmlTestSuiteFiles { private final static String[] allTestFiles = new String[]{ diff --git a/vcell-core/src/test/java/org/vcell/sedml/PublicationMetadataTest.java b/vcell-core/src/test/java/org/vcell/sedml/PublicationMetadataTest.java index f936760176..c601b459ab 100644 --- a/vcell-core/src/test/java/org/vcell/sedml/PublicationMetadataTest.java +++ b/vcell-core/src/test/java/org/vcell/sedml/PublicationMetadataTest.java @@ -1,6 +1,6 @@ package org.vcell.sedml; -import org.junit.Assert; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @@ -14,6 +14,7 @@ import java.util.HashMap; @Category(Fast.class) +@Tag("Fast") public class PublicationMetadataTest { private final static String exampleRIS = diff --git a/vcell-core/src/test/java/org/vcell/util/RelationVisitorTest.java b/vcell-core/src/test/java/org/vcell/util/RelationVisitorTest.java index 2e660299f8..30f746e981 100644 --- a/vcell-core/src/test/java/org/vcell/util/RelationVisitorTest.java +++ b/vcell-core/src/test/java/org/vcell/util/RelationVisitorTest.java @@ -6,11 +6,11 @@ import cbit.vcell.model.ModelTest; import cbit.vcell.parser.Expression; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; -@Category(Fast.class) +@Tag("Fast") public class RelationVisitorTest { @Test diff --git a/vcell-core/src/test/java/org/vcell/util/collections/CircularListTest.java b/vcell-core/src/test/java/org/vcell/util/collections/CircularListTest.java index 923feb3d10..620ca91f0f 100644 --- a/vcell-core/src/test/java/org/vcell/util/collections/CircularListTest.java +++ b/vcell-core/src/test/java/org/vcell/util/collections/CircularListTest.java @@ -1,13 +1,14 @@ package org.vcell.util.collections; import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Tag; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; -@Category(Fast.class) +@Tag("Fast") public class CircularListTest { diff --git a/vcell-core/src/test/java/org/vcell/util/collections/HashListMapTest.java b/vcell-core/src/test/java/org/vcell/util/collections/HashListMapTest.java index 2fe09a446e..d5ff73eef6 100644 --- a/vcell-core/src/test/java/org/vcell/util/collections/HashListMapTest.java +++ b/vcell-core/src/test/java/org/vcell/util/collections/HashListMapTest.java @@ -1,6 +1,7 @@ package org.vcell.util.collections; import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Tag; import java.util.List; @@ -10,7 +11,7 @@ import org.vcell.test.Fast; -@Category(Fast.class) +@Tag("Fast") public class HashListMapTest { private HashListMap testList; diff --git a/vcell-core/src/test/java/org/vcell/util/collections/VCCollectionsTest.java b/vcell-core/src/test/java/org/vcell/util/collections/VCCollectionsTest.java index 72be3dc347..9bc6fa53b2 100644 --- a/vcell-core/src/test/java/org/vcell/util/collections/VCCollectionsTest.java +++ b/vcell-core/src/test/java/org/vcell/util/collections/VCCollectionsTest.java @@ -1,7 +1,7 @@ package org.vcell.util.collections; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Tag; import java.util.ArrayList; import java.util.Collections; @@ -14,7 +14,7 @@ import org.vcell.test.Fast; import org.vcell.util.collections.VCCollections.Delta; -@Category(Fast.class) +@Tag("Fast") public class VCCollectionsTest { private List a = new ArrayList<>(); private List b = new ArrayList<>(); diff --git a/vcell-core/src/test/java/org/vcell/util/document/UserTest.java b/vcell-core/src/test/java/org/vcell/util/document/UserTest.java index 704afb1291..fbcd59b926 100644 --- a/vcell-core/src/test/java/org/vcell/util/document/UserTest.java +++ b/vcell-core/src/test/java/org/vcell/util/document/UserTest.java @@ -1,5 +1,6 @@ package org.vcell.util.document; +import org.junit.jupiter.api.Tag; import java.math.BigDecimal; import org.junit.Assert; @@ -7,7 +8,7 @@ import org.junit.experimental.categories.Category; import org.vcell.test.Fast; -@Category(Fast.class) +@Tag("Fast") public class UserTest { @Test diff --git a/vcell-core/src/test/java/org/vcell/util/exe/Executable2Test.java b/vcell-core/src/test/java/org/vcell/util/exe/Executable2Test.java index 860e5c4f8d..440bc034e3 100644 --- a/vcell-core/src/test/java/org/vcell/util/exe/Executable2Test.java +++ b/vcell-core/src/test/java/org/vcell/util/exe/Executable2Test.java @@ -1,14 +1,14 @@ package org.vcell.util.exe; import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; import java.io.File; @Ignore -@Category(Fast.class) +@Tag("Fast") public class Executable2Test { @Test diff --git a/vcell-core/src/test/java/org/vcell/vis/vtk/VCellDataTest.java b/vcell-core/src/test/java/org/vcell/vis/vtk/VCellDataTest.java index c4c3724c15..51eaf28c62 100644 --- a/vcell-core/src/test/java/org/vcell/vis/vtk/VCellDataTest.java +++ b/vcell-core/src/test/java/org/vcell/vis/vtk/VCellDataTest.java @@ -11,7 +11,7 @@ import cbit.vcell.resource.PropertyLoader; import org.junit.After; import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; import org.vcell.util.document.KeyValue; @@ -23,6 +23,7 @@ import org.vcell.vis.vismesh.thrift.*; @Category(Fast.class) +@Tag("Fast") public class VCellDataTest { private String previousPythonDir = null; diff --git a/vcell-math/src/test/java/cbit/vcell/matrix/RationalExpMatrixTest.java b/vcell-math/src/test/java/cbit/vcell/matrix/RationalExpMatrixTest.java index 0c14087810..712fa060e5 100644 --- a/vcell-math/src/test/java/cbit/vcell/matrix/RationalExpMatrixTest.java +++ b/vcell-math/src/test/java/cbit/vcell/matrix/RationalExpMatrixTest.java @@ -3,7 +3,7 @@ import cbit.vcell.parser.Expression; import cbit.vcell.parser.ExpressionException; import cbit.vcell.parser.ExpressionUtils; -import org.junit.Assert; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -15,6 +15,7 @@ @Category(Fast.class) @RunWith(Parameterized.class) +@Tag("Fast") public class RationalExpMatrixTest { static class TestCase { final Expression[] equations; diff --git a/vcell-math/src/test/java/cbit/vcell/parser/ExpressionFlattenTest.java b/vcell-math/src/test/java/cbit/vcell/parser/ExpressionFlattenTest.java index d9bebf9230..4262053ee0 100644 --- a/vcell-math/src/test/java/cbit/vcell/parser/ExpressionFlattenTest.java +++ b/vcell-math/src/test/java/cbit/vcell/parser/ExpressionFlattenTest.java @@ -1,7 +1,7 @@ package cbit.vcell.parser; import cbit.vcell.units.VCUnitDefinition; -import org.junit.Assert; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -13,6 +13,7 @@ @Category(Fast.class) @RunWith(Parameterized.class) +@Tag("Fast") public class ExpressionFlattenTest { private final Expression origExpression; diff --git a/vcell-math/src/test/java/cbit/vcell/parser/ExpressionTest.java b/vcell-math/src/test/java/cbit/vcell/parser/ExpressionTest.java index 1d32646593..121ffb8b9f 100644 --- a/vcell-math/src/test/java/cbit/vcell/parser/ExpressionTest.java +++ b/vcell-math/src/test/java/cbit/vcell/parser/ExpressionTest.java @@ -9,10 +9,11 @@ import net.sourceforge.interval.ia_math.RealInterval; import org.junit.Assert; import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; import org.vcell.test.Fast; @Category(Fast.class) +@Tag("Fast") public class ExpressionTest { public static void main(java.lang.String[] args) { int num = 5000; diff --git a/vcell-math/src/test/java/cbit/vcell/parser/ExpressionUtilsJSCLFlattenTest.java b/vcell-math/src/test/java/cbit/vcell/parser/ExpressionUtilsJSCLFlattenTest.java index 95b5d2dc43..9ae91d16c4 100644 --- a/vcell-math/src/test/java/cbit/vcell/parser/ExpressionUtilsJSCLFlattenTest.java +++ b/vcell-math/src/test/java/cbit/vcell/parser/ExpressionUtilsJSCLFlattenTest.java @@ -1,6 +1,6 @@ package cbit.vcell.parser; -import org.junit.Assert; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -12,6 +12,7 @@ @Category(Fast.class) @RunWith(Parameterized.class) +@Tag("Fast") public class ExpressionUtilsJSCLFlattenTest { private Expression expectedFlattenedExpression; diff --git a/vcell-math/src/test/java/cbit/vcell/parser/IntervalNarrowingTest.java b/vcell-math/src/test/java/cbit/vcell/parser/IntervalNarrowingTest.java index 8e48775b0b..e5810f5049 100644 --- a/vcell-math/src/test/java/cbit/vcell/parser/IntervalNarrowingTest.java +++ b/vcell-math/src/test/java/cbit/vcell/parser/IntervalNarrowingTest.java @@ -1,5 +1,6 @@ package cbit.vcell.parser; +import org.junit.jupiter.api.Tag; import java.util.ArrayList; import java.util.Collection; import java.util.Random; @@ -12,7 +13,7 @@ import org.junit.runners.Parameterized; import net.sourceforge.interval.ia_math.IAException; -import net.sourceforge.interval.ia_math.RealInterval; +@Tag("Fast") import org.vcell.test.Fast; @Ignore diff --git a/vcell-math/src/test/java/cbit/vcell/parser/MathMLTester.java b/vcell-math/src/test/java/cbit/vcell/parser/MathMLTester.java index c3a9ed79ab..f63032f253 100644 --- a/vcell-math/src/test/java/cbit/vcell/parser/MathMLTester.java +++ b/vcell-math/src/test/java/cbit/vcell/parser/MathMLTester.java @@ -13,7 +13,7 @@ import jscl.text.ParseException; import org.jmathml.ASTNode; import org.jmathml.MathMLReader; -import org.junit.Assert; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -25,6 +25,7 @@ @Category(Fast.class) @RunWith(Parameterized.class) +@Tag("Fast") public class MathMLTester { private Expression expression; diff --git a/vcell-math/src/test/java/cbit/vcell/units/VCUnitDefinitionTest.java b/vcell-math/src/test/java/cbit/vcell/units/VCUnitDefinitionTest.java index 4a5ed0d5a3..4fedddc17b 100644 --- a/vcell-math/src/test/java/cbit/vcell/units/VCUnitDefinitionTest.java +++ b/vcell-math/src/test/java/cbit/vcell/units/VCUnitDefinitionTest.java @@ -1,5 +1,6 @@ package cbit.vcell.units; +import org.junit.jupiter.api.Tag; import java.util.Iterator; import cbit.vcell.units.parser.UnitSymbol; @@ -8,7 +9,7 @@ import org.junit.experimental.categories.Category; import org.vcell.test.Fast; -@Category(Fast.class) +@Tag("Fast") public class VCUnitDefinitionTest { @SuppressWarnings("serial") diff --git a/vcell-math/src/test/java/cbit/vcell/units/parser/UnitSymbolTest.java b/vcell-math/src/test/java/cbit/vcell/units/parser/UnitSymbolTest.java index 7154154a42..87e509e8cc 100644 --- a/vcell-math/src/test/java/cbit/vcell/units/parser/UnitSymbolTest.java +++ b/vcell-math/src/test/java/cbit/vcell/units/parser/UnitSymbolTest.java @@ -1,11 +1,12 @@ package cbit.vcell.units.parser; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @Category(Fast.class) +@Tag("Fast") public class UnitSymbolTest { @Test diff --git a/vcell-server/src/test/java/cbit/vcell/math/MathVisitor.java b/vcell-server/src/test/java/cbit/vcell/math/MathVisitor.java index f71e527c73..2442a3e23b 100644 --- a/vcell-server/src/test/java/cbit/vcell/math/MathVisitor.java +++ b/vcell-server/src/test/java/cbit/vcell/math/MathVisitor.java @@ -8,7 +8,7 @@ import cbit.vcell.modeldb.BatchTester; import cbit.vcell.modeldb.VCDatabaseScanner; import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.junit.runner.Description; import org.junit.runner.JUnitCore; @@ -24,7 +24,7 @@ import java.io.PrintStream; import java.io.PrintWriter; -@Category(Fast.class) +@Tag("Fast") public class MathVisitor implements BadMathVisitor { final PrintWriter loadErrorWriter; final PrintWriter parseErrorWriter; diff --git a/vcell-server/src/test/java/cbit/vcell/message/jms/test/BlobMessageTest.java b/vcell-server/src/test/java/cbit/vcell/message/jms/test/BlobMessageTest.java index 7bd3d7bc9a..409a84b355 100644 --- a/vcell-server/src/test/java/cbit/vcell/message/jms/test/BlobMessageTest.java +++ b/vcell-server/src/test/java/cbit/vcell/message/jms/test/BlobMessageTest.java @@ -21,10 +21,10 @@ import cbit.vcell.mongodb.VCMongoDbDriver; import cbit.vcell.resource.PropertyLoader; import org.junit.experimental.categories.Category; -import org.vcell.test.Fast; +import org.junit.jupiter.api.*; @Ignore -@Category(Fast.class) +@Tag("Fast") public class BlobMessageTest { private static final int NUM_PRODUCERS = 2; diff --git a/vcell-server/src/test/java/cbit/vcell/message/server/dispatcher/BatchSchedulerTest.java b/vcell-server/src/test/java/cbit/vcell/message/server/dispatcher/BatchSchedulerTest.java index 08f52b47f9..430071e289 100644 --- a/vcell-server/src/test/java/cbit/vcell/message/server/dispatcher/BatchSchedulerTest.java +++ b/vcell-server/src/test/java/cbit/vcell/message/server/dispatcher/BatchSchedulerTest.java @@ -10,7 +10,7 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; import org.vcell.util.document.KeyValue; @@ -23,6 +23,7 @@ import cbit.vcell.server.SimulationJobStatus.SchedulerStatus; @Category(Fast.class) +@Tag("Fast") public class BatchSchedulerTest { VCellServerID relSite = VCellServerID.getServerID("REL"); diff --git a/vcell-server/src/test/java/cbit/vcell/message/server/htc/HtcProxyTest.java b/vcell-server/src/test/java/cbit/vcell/message/server/htc/HtcProxyTest.java index 6c6432c1ad..cd54b43463 100644 --- a/vcell-server/src/test/java/cbit/vcell/message/server/htc/HtcProxyTest.java +++ b/vcell-server/src/test/java/cbit/vcell/message/server/htc/HtcProxyTest.java @@ -11,8 +11,10 @@ import cbit.vcell.resource.PropertyLoader; import cbit.vcell.server.HtcJobID; import cbit.vcell.server.HtcJobID.BatchSystemType; +import org.junit.jupiter.api.Tag; @Category(Fast.class) +@Tag("Fast") public class HtcProxyTest { @Test diff --git a/vcell-server/src/test/java/cbit/vcell/message/server/htc/JobIdTest.java b/vcell-server/src/test/java/cbit/vcell/message/server/htc/JobIdTest.java index 76ac8ccb3e..8da79430bb 100644 --- a/vcell-server/src/test/java/cbit/vcell/message/server/htc/JobIdTest.java +++ b/vcell-server/src/test/java/cbit/vcell/message/server/htc/JobIdTest.java @@ -13,12 +13,13 @@ import cbit.vcell.server.HtcJobID.BatchSystemType; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; +import org.junit.jupiter.api.Tag; /** * Test {@link HtcJobID#compareEqual(org.vcell.util.Matchable)}, * {@link HtcJobID#equals(Object)} and {@link HtcJobID#hashCode()} */ -@Category(Fast.class) +@Tag("Fast") public class JobIdTest { Random r = new Random( ); diff --git a/vcell-server/src/test/java/cbit/vcell/modeldb/BioModelMultiVisitor.java b/vcell-server/src/test/java/cbit/vcell/modeldb/BioModelMultiVisitor.java index d2ddeef4d9..964431cdd4 100644 --- a/vcell-server/src/test/java/cbit/vcell/modeldb/BioModelMultiVisitor.java +++ b/vcell-server/src/test/java/cbit/vcell/modeldb/BioModelMultiVisitor.java @@ -4,7 +4,7 @@ import cbit.vcell.geometry.Geometry; import cbit.vcell.geometry.GeometryInfo; import cbit.vcell.mathmodel.MathModel; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; import org.vcell.util.document.BioModelInfo; @@ -17,7 +17,7 @@ import java.util.Hashtable; import java.util.Iterator; -@Category(Fast.class) +@Tag("Fast") public class BioModelMultiVisitor implements VCDatabaseVisitor { /** * user key to use for tests diff --git a/vcell-server/src/test/java/cbit/vcell/modeldb/BioModelTestReader.java b/vcell-server/src/test/java/cbit/vcell/modeldb/BioModelTestReader.java index f8d9702ed6..13ca7a9723 100644 --- a/vcell-server/src/test/java/cbit/vcell/modeldb/BioModelTestReader.java +++ b/vcell-server/src/test/java/cbit/vcell/modeldb/BioModelTestReader.java @@ -4,7 +4,7 @@ import cbit.vcell.geometry.Geometry; import cbit.vcell.geometry.GeometryInfo; import cbit.vcell.mathmodel.MathModel; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; import org.vcell.util.document.BioModelInfo; @@ -17,7 +17,7 @@ import java.util.Hashtable; import java.util.Iterator; -@Category(Fast.class) +@Tag("Fast") public class BioModelTestReader implements VCDatabaseVisitor { /** * user key to use for tests diff --git a/vcell-server/src/test/java/cbit/vcell/modeldb/HybridBioModelVisitor.java b/vcell-server/src/test/java/cbit/vcell/modeldb/HybridBioModelVisitor.java index 1db3a0643e..e04c016f49 100644 --- a/vcell-server/src/test/java/cbit/vcell/modeldb/HybridBioModelVisitor.java +++ b/vcell-server/src/test/java/cbit/vcell/modeldb/HybridBioModelVisitor.java @@ -1,12 +1,13 @@ package cbit.vcell.modeldb; +import org.junit.jupiter.api.Tag; import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.junit.Test; +@Tag("Fast") import org.junit.experimental.categories.Category; import org.vcell.test.Fast; import org.vcell.util.document.User; diff --git a/vcell-server/src/test/java/cbit/vcell/mongodb/VCMongoDbDriverTest.java b/vcell-server/src/test/java/cbit/vcell/mongodb/VCMongoDbDriverTest.java index bd0cfcf1b4..8e2db6571b 100644 --- a/vcell-server/src/test/java/cbit/vcell/mongodb/VCMongoDbDriverTest.java +++ b/vcell-server/src/test/java/cbit/vcell/mongodb/VCMongoDbDriverTest.java @@ -1,9 +1,10 @@ package cbit.vcell.mongodb; +import org.junit.jupiter.api.*; import static org.junit.Assert.assertArrayEquals; import org.bson.types.ObjectId; -import org.junit.After; +@Tag("Fast") import org.junit.Before; import org.junit.Ignore; import org.junit.Test; diff --git a/vcell-server/src/test/java/org/vcell/auth/JWTUtilsTest.java b/vcell-server/src/test/java/org/vcell/auth/JWTUtilsTest.java index 87c42a8f2a..6e8d6ec440 100644 --- a/vcell-server/src/test/java/org/vcell/auth/JWTUtilsTest.java +++ b/vcell-server/src/test/java/org/vcell/auth/JWTUtilsTest.java @@ -4,7 +4,7 @@ import org.jose4j.jwt.MalformedClaimException; import org.jose4j.jwt.NumericDate; import org.jose4j.lang.JoseException; -import org.junit.Assert; +import org.junit.jupiter.api.Tag; import org.junit.Test; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @@ -12,6 +12,7 @@ import org.vcell.util.document.User; @Category(Fast.class) +@Tag("Fast") public class JWTUtilsTest { @Test diff --git a/vcell-util/src/main/java/org/vcell/test/BSTS_IT.java b/vcell-util/src/main/java/org/vcell/test/BSTS_IT.java deleted file mode 100644 index fe6d05646c..0000000000 --- a/vcell-util/src/main/java/org/vcell/test/BSTS_IT.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.vcell.test; - -public interface BSTS_IT { -} diff --git a/vcell-util/src/main/java/org/vcell/test/Fast.java b/vcell-util/src/main/java/org/vcell/test/Fast.java deleted file mode 100644 index 783973a708..0000000000 --- a/vcell-util/src/main/java/org/vcell/test/Fast.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.vcell.test; - -public interface Fast { -} diff --git a/vcell-util/src/main/java/org/vcell/test/MathGen_IT.java b/vcell-util/src/main/java/org/vcell/test/MathGen_IT.java deleted file mode 100644 index ef9b723f22..0000000000 --- a/vcell-util/src/main/java/org/vcell/test/MathGen_IT.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.vcell.test; - -public interface MathGen_IT extends Slow { -} diff --git a/vcell-util/src/main/java/org/vcell/test/SBML_IT.java b/vcell-util/src/main/java/org/vcell/test/SBML_IT.java deleted file mode 100644 index 541b88aba5..0000000000 --- a/vcell-util/src/main/java/org/vcell/test/SBML_IT.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.vcell.test; - -public interface SBML_IT extends Slow { -} diff --git a/vcell-util/src/main/java/org/vcell/test/SEDML_SBML_IT.java b/vcell-util/src/main/java/org/vcell/test/SEDML_SBML_IT.java deleted file mode 100644 index 4569561b18..0000000000 --- a/vcell-util/src/main/java/org/vcell/test/SEDML_SBML_IT.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.vcell.test; - -public interface SEDML_SBML_IT extends Slow { -} diff --git a/vcell-util/src/main/java/org/vcell/test/SEDML_VCML_IT.java b/vcell-util/src/main/java/org/vcell/test/SEDML_VCML_IT.java deleted file mode 100644 index ff4b55a895..0000000000 --- a/vcell-util/src/main/java/org/vcell/test/SEDML_VCML_IT.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.vcell.test; - -public interface SEDML_VCML_IT extends Slow { -} diff --git a/vcell-util/src/main/java/org/vcell/test/Slow.java b/vcell-util/src/main/java/org/vcell/test/Slow.java deleted file mode 100644 index 936e2986ce..0000000000 --- a/vcell-util/src/main/java/org/vcell/test/Slow.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.vcell.test; - -public interface Slow { -} diff --git a/vcell-util/src/main/java/org/vcell/test/Spatial_IT.java b/vcell-util/src/main/java/org/vcell/test/Spatial_IT.java deleted file mode 100644 index 601f440573..0000000000 --- a/vcell-util/src/main/java/org/vcell/test/Spatial_IT.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.vcell.test; - -public interface Spatial_IT { -} diff --git a/vcell-util/src/test/java/org/vcell/util/ArrayUtilsTest.java b/vcell-util/src/test/java/org/vcell/util/ArrayUtilsTest.java index 3b2809da3e..c6a757219e 100644 --- a/vcell-util/src/test/java/org/vcell/util/ArrayUtilsTest.java +++ b/vcell-util/src/test/java/org/vcell/util/ArrayUtilsTest.java @@ -1,12 +1,12 @@ package org.vcell.util; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; import static org.junit.Assert.*; -@Category(Fast.class) +@Tag("Fast") public class ArrayUtilsTest { @Test diff --git a/vcell-util/src/test/java/org/vcell/util/BeanUtilsTest.java b/vcell-util/src/test/java/org/vcell/util/BeanUtilsTest.java index c0741f7b78..7d5b86a665 100644 --- a/vcell-util/src/test/java/org/vcell/util/BeanUtilsTest.java +++ b/vcell-util/src/test/java/org/vcell/util/BeanUtilsTest.java @@ -1,9 +1,10 @@ package org.vcell.util; +import org.junit.jupiter.api.Tag; import java.net.MalformedURLException; import java.net.URL; -import org.junit.Ignore; +@Tag("Fast") import org.junit.Test; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; diff --git a/vcell-util/src/test/java/org/vcell/util/CastingUtilsTest.java b/vcell-util/src/test/java/org/vcell/util/CastingUtilsTest.java index 3787ffaeeb..edb139a43d 100644 --- a/vcell-util/src/test/java/org/vcell/util/CastingUtilsTest.java +++ b/vcell-util/src/test/java/org/vcell/util/CastingUtilsTest.java @@ -2,11 +2,11 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -import org.vcell.test.Fast; +import org.junit.jupiter.api.Tag; import static org.vcell.util.CastingUtils.CastInfo; -import static org.junit.Assert.*; +@Tag("Fast") @Category(Fast.class) public class CastingUtilsTest { diff --git a/vcell-util/src/test/java/org/vcell/util/CompressionUtilsTest.java b/vcell-util/src/test/java/org/vcell/util/CompressionUtilsTest.java index 25a1fa1430..790e5b2fd3 100644 --- a/vcell-util/src/test/java/org/vcell/util/CompressionUtilsTest.java +++ b/vcell-util/src/test/java/org/vcell/util/CompressionUtilsTest.java @@ -1,5 +1,6 @@ package org.vcell.util; +import org.junit.jupiter.api.Tag; import javax.management.StringValueExp; import java.io.IOException; import java.io.Serializable; @@ -9,7 +10,7 @@ import org.junit.experimental.categories.Category; import org.vcell.test.Fast; -import static org.junit.Assert.*; +@Tag("Fast") @Category(Fast.class) public class CompressionUtilsTest { diff --git a/vcell-util/src/test/java/org/vcell/util/DimensionalIndexTest.java b/vcell-util/src/test/java/org/vcell/util/DimensionalIndexTest.java index 03fdc44802..fb649f4427 100644 --- a/vcell-util/src/test/java/org/vcell/util/DimensionalIndexTest.java +++ b/vcell-util/src/test/java/org/vcell/util/DimensionalIndexTest.java @@ -1,6 +1,6 @@ package org.vcell.util; -import static org.junit.Assert.assertFalse; +import org.junit.jupiter.api.Tag; import static org.junit.Assert.assertTrue; import org.junit.Assert; @@ -8,7 +8,7 @@ import org.junit.experimental.categories.Category; import org.vcell.test.Fast; -@Category(Fast.class) +@Tag("Fast") public class DimensionalIndexTest { private static final int mX = 3; diff --git a/vcell-util/src/test/java/org/vcell/util/GenericUtilsTest.java b/vcell-util/src/test/java/org/vcell/util/GenericUtilsTest.java index 714fdf6ef6..77dda5eb46 100644 --- a/vcell-util/src/test/java/org/vcell/util/GenericUtilsTest.java +++ b/vcell-util/src/test/java/org/vcell/util/GenericUtilsTest.java @@ -1,6 +1,6 @@ package org.vcell.util; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Tag; import java.util.ArrayList; import java.util.List; @@ -9,7 +9,7 @@ import org.junit.experimental.categories.Category; import org.vcell.test.Fast; -@Category(Fast.class) +@Tag("Fast") public class GenericUtilsTest { @Test diff --git a/vcell-util/src/test/java/org/vcell/util/StackTraceUtilsTest.java b/vcell-util/src/test/java/org/vcell/util/StackTraceUtilsTest.java index 01809933c3..79208e4db0 100644 --- a/vcell-util/src/test/java/org/vcell/util/StackTraceUtilsTest.java +++ b/vcell-util/src/test/java/org/vcell/util/StackTraceUtilsTest.java @@ -1,6 +1,6 @@ package org.vcell.util; -import org.junit.Test; +import org.junit.jupiter.api.Tag; import org.junit.experimental.categories.Category; import org.vcell.test.Fast; @@ -9,6 +9,7 @@ import static org.junit.Assert.*; @Category(Fast.class) +@Tag("Fast") public class StackTraceUtilsTest { private void eenie(){ diff --git a/vcell-util/src/test/java/org/vcell/util/VCellThreadCheckerTest.java b/vcell-util/src/test/java/org/vcell/util/VCellThreadCheckerTest.java index 912735cbf5..48c9c95037 100644 --- a/vcell-util/src/test/java/org/vcell/util/VCellThreadCheckerTest.java +++ b/vcell-util/src/test/java/org/vcell/util/VCellThreadCheckerTest.java @@ -1,5 +1,6 @@ package org.vcell.util; +import org.junit.jupiter.api.Tag; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.lang.reflect.InvocationTargetException; @@ -17,7 +18,7 @@ * @author gweatherby * */ -@Category(Fast.class) +@Tag("Fast") public class VCellThreadCheckerTest { PrintStream oldOut = null; PrintStream oldErr = null;