diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java index c84168f6d..12ea95743 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java @@ -26,7 +26,6 @@ import org.libreccm.core.CcmObject; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -40,7 +39,6 @@ import java.util.UUID; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class AssetEqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java index f0122fb1e..870cf818b 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java @@ -24,7 +24,6 @@ import org.junit.runners.Parameterized; import org.libreccm.core.CcmObject; import org.libreccm.security.Group; import org.libreccm.security.Role; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -38,7 +37,6 @@ import java.util.UUID; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class AttachmentsEqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java index 75cd0f9ac..65ebe7dad 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java @@ -22,10 +22,8 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetsVerifier; @@ -37,7 +35,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class DatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java index cec043aa3..50ae8e28c 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java @@ -28,7 +28,6 @@ import org.libreccm.core.Resource; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import org.libreccm.web.CcmApplication; import org.libreccm.workflow.Workflow; @@ -42,7 +41,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java index 80b7b94fa..a097ada32 100644 --- a/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java +++ b/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java @@ -25,7 +25,6 @@ import java.util.Collection; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; /** @@ -33,7 +32,6 @@ import org.libreccm.testutils.EqualsVerifier; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index aa63f14ff..0080ece81 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -29,6 +29,24 @@ + + org.seleniumhq.selenium + selenium-java + test + 2.44.0 + + + com.opera + operadriver + test + 1.5 + + + org.seleniumhq.selenium + selenium-remote-driver + + + javax javaee-api diff --git a/ccm-core/src/test/java/com/arsdigita/kernel/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/com/arsdigita/kernel/EqualsAndHashCodeTest.java index 97d5bba31..c4e8b305c 100644 --- a/ccm-core/src/test/java/com/arsdigita/kernel/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/com/arsdigita/kernel/EqualsAndHashCodeTest.java @@ -18,10 +18,8 @@ */ package com.arsdigita.kernel; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -33,7 +31,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") public static Collection> data() { diff --git a/ccm-core/src/test/java/com/arsdigita/kernel/ToStringTest.java b/ccm-core/src/test/java/com/arsdigita/kernel/ToStringTest.java index 7a66e75ce..7741ed6a7 100644 --- a/ccm-core/src/test/java/com/arsdigita/kernel/ToStringTest.java +++ b/ccm-core/src/test/java/com/arsdigita/kernel/ToStringTest.java @@ -18,10 +18,8 @@ */ package com.arsdigita.kernel; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/com/arsdigita/util/AssertTest.java b/ccm-core/src/test/java/com/arsdigita/util/AssertTest.java index e8b11cc9a..9d9b7eddf 100644 --- a/ccm-core/src/test/java/com/arsdigita/util/AssertTest.java +++ b/ccm-core/src/test/java/com/arsdigita/util/AssertTest.java @@ -23,17 +23,14 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.libreccm.tests.categories.UnitTest; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; /** * * @author Jens Pelzetter */ -@Category(UnitTest.class) public class AssertTest { public AssertTest() { diff --git a/ccm-core/src/test/java/com/arsdigita/util/StringUtilsTest.java b/ccm-core/src/test/java/com/arsdigita/util/StringUtilsTest.java index 3cedd67cd..4f1432878 100644 --- a/ccm-core/src/test/java/com/arsdigita/util/StringUtilsTest.java +++ b/ccm-core/src/test/java/com/arsdigita/util/StringUtilsTest.java @@ -21,24 +21,26 @@ package com.arsdigita.util; import java.util.ArrayList; import java.util.HashMap; import java.util.List; + import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertTrue; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.libreccm.tests.categories.UnitTest; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; + /** * * @author Konermann */ -@Category(UnitTest.class) public class StringUtilsTest { public StringUtilsTest() { diff --git a/ccm-core/src/test/java/com/arsdigita/web/WebConfigTest.java b/ccm-core/src/test/java/com/arsdigita/web/WebConfigTest.java index aad370776..ac6c1c7e8 100644 --- a/ccm-core/src/test/java/com/arsdigita/web/WebConfigTest.java +++ b/ccm-core/src/test/java/com/arsdigita/web/WebConfigTest.java @@ -23,19 +23,17 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.libreccm.tests.categories.UnitTest; import java.util.ArrayList; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; /** * * @author Jens Pelzetter */ -@Category(UnitTest.class) public class WebConfigTest { public WebConfigTest() { diff --git a/ccm-core/src/test/java/org/libreccm/categorization/DatasetsTest.java b/ccm-core/src/test/java/org/libreccm/categorization/DatasetsTest.java index f2b0a9f4d..869bc2170 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/DatasetsTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/DatasetsTest.java @@ -20,9 +20,9 @@ package org.libreccm.categorization; import java.util.Arrays; import java.util.Collection; + import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetsVerifier; @@ -34,7 +34,6 @@ import static org.libreccm.testutils.DatasetType.*; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class DatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java index 92480a450..c8ce5f3fb 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java @@ -25,7 +25,6 @@ import org.libreccm.core.CcmObject; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import org.libreccm.web.CcmApplication; @@ -37,7 +36,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/categorization/RegistrySetupDatasetsTest.java b/ccm-core/src/test/java/org/libreccm/categorization/RegistrySetupDatasetsTest.java index f579ed543..d94b128c6 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/RegistrySetupDatasetsTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/RegistrySetupDatasetsTest.java @@ -20,10 +20,8 @@ package org.libreccm.categorization; import static org.libreccm.testutils.DatasetType.*; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetsVerifier; @@ -35,7 +33,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class RegistrySetupDatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-core/src/test/java/org/libreccm/categorization/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/categorization/ToStringTest.java index e43c22dcf..234ca8524 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/ToStringTest.java @@ -21,7 +21,6 @@ package org.libreccm.categorization; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.testutils.ToStringVerifier; -import org.libreccm.tests.categories.UnitTest; import java.util.Arrays; import java.util.Collection; @@ -31,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/configuration/DatasetsTest.java b/ccm-core/src/test/java/org/libreccm/configuration/DatasetsTest.java index d788721b4..d1a788c43 100644 --- a/ccm-core/src/test/java/org/libreccm/configuration/DatasetsTest.java +++ b/ccm-core/src/test/java/org/libreccm/configuration/DatasetsTest.java @@ -20,14 +20,13 @@ package org.libreccm.configuration; import java.util.Arrays; import java.util.Collection; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetsVerifier; @@ -39,7 +38,6 @@ import static org.libreccm.testutils.DatasetType.*; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class DatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-core/src/test/java/org/libreccm/configuration/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/configuration/EqualsAndHashCodeTest.java index 2c4bd15d9..e862c886c 100644 --- a/ccm-core/src/test/java/org/libreccm/configuration/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/configuration/EqualsAndHashCodeTest.java @@ -23,7 +23,6 @@ import java.util.Collection; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; /** @@ -33,7 +32,6 @@ import org.libreccm.testutils.EqualsVerifier; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/configuration/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/configuration/ToStringTest.java index 4f92ca584..b0ee7c8d4 100644 --- a/ccm-core/src/test/java/org/libreccm/configuration/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/configuration/ToStringTest.java @@ -21,10 +21,8 @@ package org.libreccm.configuration; import java.util.Arrays; import java.util.Collection; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; /** @@ -34,7 +32,6 @@ import org.libreccm.testutils.ToStringVerifier; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/core/DatasetsTest.java b/ccm-core/src/test/java/org/libreccm/core/DatasetsTest.java index 914d84527..688635a0e 100644 --- a/ccm-core/src/test/java/org/libreccm/core/DatasetsTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/DatasetsTest.java @@ -22,10 +22,8 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetsVerifier; import java.util.Arrays; @@ -37,7 +35,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class DatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java index 9b3d52dcc..dfdc745a5 100644 --- a/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java @@ -21,7 +21,6 @@ package org.libreccm.core; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import java.util.Arrays; import java.util.Collection; @@ -39,7 +38,6 @@ import org.libreccm.testutils.EqualsVerifier; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java b/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java index 9f8809ef5..a75375a2c 100644 --- a/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java @@ -26,7 +26,6 @@ import org.libreccm.l10n.LocalizedString; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -42,7 +41,6 @@ import java.util.Locale; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class ResourceEntityTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/core/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/core/ToStringTest.java index 4f6a7b06d..ab7952e4e 100644 --- a/ccm-core/src/test/java/org/libreccm/core/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/ToStringTest.java @@ -18,11 +18,9 @@ */ package org.libreccm.core; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.testutils.ToStringVerifier; -import org.libreccm.tests.categories.UnitTest; import java.util.Arrays; import java.util.Collection; @@ -34,7 +32,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java index 350578c1f..56a43e5bd 100644 --- a/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java @@ -26,7 +26,6 @@ import org.libreccm.core.CcmObject; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -37,7 +36,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/formbuilder/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/formbuilder/ToStringTest.java index ef58b3c4c..f36bf88aa 100644 --- a/ccm-core/src/test/java/org/libreccm/formbuilder/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/formbuilder/ToStringTest.java @@ -18,11 +18,9 @@ */ package org.libreccm.formbuilder; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.testutils.ToStringVerifier; -import org.libreccm.tests.categories.UnitTest; import java.util.Arrays; import java.util.Collection; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java index 19d43cf35..af1392972 100644 --- a/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java @@ -23,7 +23,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.formbuilder.Component; import org.libreccm.formbuilder.FormSection; -import org.libreccm.tests.categories.UnitTest; import java.util.Arrays; import java.util.Collection; @@ -40,7 +39,6 @@ import org.libreccm.testutils.EqualsVerifier; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/formbuilder/actions/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/formbuilder/actions/ToStringTest.java index 0758a4567..f9b975b08 100644 --- a/ccm-core/src/test/java/org/libreccm/formbuilder/actions/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/formbuilder/actions/ToStringTest.java @@ -18,11 +18,9 @@ */ package org.libreccm.formbuilder.actions; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.testutils.ToStringVerifier; -import org.libreccm.tests.categories.UnitTest; import java.util.Arrays; import java.util.Collection; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/jpautils/UriConverterTest.java b/ccm-core/src/test/java/org/libreccm/jpautils/UriConverterTest.java index d1e29b55b..bfb392cf3 100644 --- a/ccm-core/src/test/java/org/libreccm/jpautils/UriConverterTest.java +++ b/ccm-core/src/test/java/org/libreccm/jpautils/UriConverterTest.java @@ -24,8 +24,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.libreccm.tests.categories.UnitTest; import java.net.URI; import java.net.URISyntaxException; @@ -38,7 +36,6 @@ import static org.hamcrest.Matchers.*; * * @author Jens Pelzetter */ -@Category(UnitTest.class) public class UriConverterTest { private static final String WWW_EXAMPLE_ORG = "http://www.example.org"; diff --git a/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java index 6c709cda9..02ed5ef56 100644 --- a/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java @@ -19,11 +19,9 @@ package org.libreccm.l10n; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.messaging.Message; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -34,7 +32,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/l10n/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/l10n/ToStringTest.java index 215d70843..74a3928e4 100644 --- a/ccm-core/src/test/java/org/libreccm/l10n/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/l10n/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.l10n; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java index 2e4272eea..6a8306b4b 100644 --- a/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java @@ -26,7 +26,6 @@ import org.libreccm.core.CcmObject; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -37,7 +36,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/messaging/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/messaging/ToStringTest.java index 7fd022cda..744f04238 100644 --- a/ccm-core/src/test/java/org/libreccm/messaging/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/messaging/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.messaging; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/modules/ComparableVersionTest.java b/ccm-core/src/test/java/org/libreccm/modules/ComparableVersionTest.java index b1efc5e25..8743c7784 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/ComparableVersionTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/ComparableVersionTest.java @@ -27,8 +27,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.libreccm.tests.categories.UnitTest; import java.util.ArrayList; import java.util.Collections; @@ -40,7 +38,6 @@ import static org.junit.Assert.*; * * @author Jens Pelzetter */ -@Category(UnitTest.class) public class ComparableVersionTest { public ComparableVersionTest() { diff --git a/ccm-core/src/test/java/org/libreccm/modules/DatasetsTest.java b/ccm-core/src/test/java/org/libreccm/modules/DatasetsTest.java index fa7b0955b..48e0c7d05 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/DatasetsTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DatasetsTest.java @@ -24,10 +24,8 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetsVerifier; @@ -40,7 +38,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class DatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerValidateVersionTest.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerValidateVersionTest.java index cbae578f9..16dedd1f2 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerValidateVersionTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerValidateVersionTest.java @@ -26,8 +26,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.libreccm.tests.categories.UnitTest; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -38,7 +36,6 @@ import static org.junit.Assert.*; * * @author Jens Pelzetter */ -@Category(UnitTest.class) public class DependencyTreeManagerValidateVersionTest { public DependencyTreeManagerValidateVersionTest() { diff --git a/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java index c799c4929..ebd391bca 100644 --- a/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java @@ -27,7 +27,6 @@ import org.libreccm.messaging.Message; import org.libreccm.security.Party; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -38,7 +37,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/notification/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/notification/ToStringTest.java index bcf244356..48d0be9e8 100644 --- a/ccm-core/src/test/java/org/libreccm/notification/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/notification/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.notification; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java index f538c008f..da421ed04 100644 --- a/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java @@ -26,7 +26,6 @@ import org.libreccm.core.CcmObject; import org.libreccm.core.Resource; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -37,7 +36,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/portal/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/portal/ToStringTest.java index 4ad9d9738..1c250ff00 100644 --- a/ccm-core/src/test/java/org/libreccm/portal/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/portal/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.portal; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java index dfb1ce0ce..2a64d023c 100644 --- a/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java @@ -21,7 +21,6 @@ package org.libreccm.runtime; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -32,7 +31,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/runtime/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/runtime/ToStringTest.java index c3c192835..74f15094b 100644 --- a/ccm-core/src/test/java/org/libreccm/runtime/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/runtime/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.runtime; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java index bd2dc37d1..1ca8df3c6 100644 --- a/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java @@ -23,7 +23,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.security.Group; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -34,7 +33,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/search/lucene/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/search/lucene/ToStringTest.java index 2ca7077b8..e180d3b46 100644 --- a/ccm-core/src/test/java/org/libreccm/search/lucene/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/search/lucene/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.search.lucene; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/security/DatasetsTest.java b/ccm-core/src/test/java/org/libreccm/security/DatasetsTest.java index 1d33f1346..2ddd6a21e 100644 --- a/ccm-core/src/test/java/org/libreccm/security/DatasetsTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/DatasetsTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.security; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import static org.libreccm.testutils.DatasetType.*; @@ -36,7 +34,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class DatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-core/src/test/java/org/libreccm/security/DatasetsXmlTest.java b/ccm-core/src/test/java/org/libreccm/security/DatasetsXmlTest.java index ccf99d489..e2c224088 100644 --- a/ccm-core/src/test/java/org/libreccm/security/DatasetsXmlTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/DatasetsXmlTest.java @@ -20,10 +20,8 @@ package org.libreccm.security; import static org.libreccm.testutils.DatasetType.*; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetsVerifier; @@ -35,7 +33,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class DatasetsXmlTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java index e9fdb8543..75eb1b7ec 100644 --- a/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java @@ -22,7 +22,6 @@ import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.core.CcmObject; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import org.libreccm.workflow.AssignableTask; @@ -35,7 +34,6 @@ import java.util.Locale; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/security/ListContainsTest.java b/ccm-core/src/test/java/org/libreccm/security/ListContainsTest.java index 827602255..ab94910c7 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ListContainsTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/ListContainsTest.java @@ -23,9 +23,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.libreccm.core.EmailAddress; -import org.libreccm.tests.categories.UnitTest; import java.util.ArrayList; import java.util.List; @@ -37,7 +35,6 @@ import static org.junit.Assert.*; * * @author Jens Pelzetter */ -@Category(UnitTest.class) public class ListContainsTest { public ListContainsTest() { diff --git a/ccm-core/src/test/java/org/libreccm/security/PartyConstraintTest.java b/ccm-core/src/test/java/org/libreccm/security/PartyConstraintTest.java index 4b178c5be..0f5bc9d63 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PartyConstraintTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PartyConstraintTest.java @@ -25,8 +25,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.libreccm.tests.categories.UnitTest; import java.util.Set; @@ -40,7 +38,6 @@ import static org.junit.Assert.*; * * @author Jens Pelzetter */ -@Category(UnitTest.class) public class PartyConstraintTest { public PartyConstraintTest() { diff --git a/ccm-core/src/test/java/org/libreccm/security/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/security/ToStringTest.java index 082a3a8d9..aff5da1dd 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.security; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java index 74b04eac1..0d43dd378 100644 --- a/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java @@ -21,7 +21,6 @@ package org.libreccm.theming.db; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -33,7 +32,6 @@ import java.util.Objects; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java index abe3727bb..352ce7c71 100644 --- a/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java @@ -28,7 +28,6 @@ import org.libreccm.core.Resource; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -39,7 +38,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@org.junit.experimental.categories.Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/web/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/web/ToStringTest.java index 8e89990b0..062c41947 100644 --- a/ccm-core/src/test/java/org/libreccm/web/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/web/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.web; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java index 36124b50b..2ccca5cfa 100644 --- a/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java @@ -19,14 +19,12 @@ package org.libreccm.workflow; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.core.CcmObject; import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.User; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -38,7 +36,6 @@ import java.util.Locale; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-core/src/test/java/org/libreccm/workflow/ToStringTest.java b/ccm-core/src/test/java/org/libreccm/workflow/ToStringTest.java index 438f46909..96dc2f8ae 100644 --- a/ccm-core/src/test/java/org/libreccm/workflow/ToStringTest.java +++ b/ccm-core/src/test/java/org/libreccm/workflow/ToStringTest.java @@ -18,10 +18,8 @@ */ package org.libreccm.workflow; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -32,7 +30,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/DatasetsTest.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/DatasetsTest.java index 7c00b9215..47710d531 100644 --- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/DatasetsTest.java +++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/DatasetsTest.java @@ -20,14 +20,13 @@ package org.libreccm.shortcuts; import java.util.Arrays; import java.util.Collection; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetsVerifier; @@ -36,7 +35,6 @@ import org.libreccm.testutils.DatasetsVerifier; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class DatasetsTest extends DatasetsVerifier { @Parameterized.Parameters(name = "Dataset {0}") diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/EqualsAndHashCodeTest.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/EqualsAndHashCodeTest.java index 4b3524578..750cb25da 100644 --- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/EqualsAndHashCodeTest.java +++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/EqualsAndHashCodeTest.java @@ -23,11 +23,9 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.EqualsVerifier; import java.util.Arrays; @@ -38,7 +36,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class EqualsAndHashCodeTest extends EqualsVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ToStringTest.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ToStringTest.java index 7e604d59e..9c3d971c1 100644 --- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ToStringTest.java +++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ToStringTest.java @@ -22,10 +22,8 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.libreccm.tests.categories.UnitTest; import org.libreccm.testutils.ToStringVerifier; import java.util.Arrays; @@ -37,7 +35,6 @@ import java.util.Collection; * @author Jens Pelzetter */ @RunWith(Parameterized.class) -@Category(UnitTest.class) public class ToStringTest extends ToStringVerifier { @Parameterized.Parameters(name = "{0}") diff --git a/ccm-testutils/src/main/java/org/libreccm/tests/categories/IntegrationTest.java b/ccm-testutils/src/main/java/org/libreccm/tests/categories/IntegrationTest.java deleted file mode 100644 index 4de21a89d..000000000 --- a/ccm-testutils/src/main/java/org/libreccm/tests/categories/IntegrationTest.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2015 LibreCCM Foundation. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ -package org.libreccm.tests.categories; - -import org.junit.experimental.categories.Category; - -/** - * A marker interface for use with JUnit's {@link Category} annotation to mark - * the tests which should be only executed when using one of the Arquillian - * profiles. - * - * Tests with this category are only executed in the Arquillian profiles and - * are executed by Arquillian inside a Java EE container. The tests are usually - * used to test CDI beans and EJBs. - * - * @author Jens Pelzetter - */ -public interface IntegrationTest { - -} diff --git a/ccm-testutils/src/main/java/org/libreccm/tests/categories/UnitTest.java b/ccm-testutils/src/main/java/org/libreccm/tests/categories/UnitTest.java deleted file mode 100644 index 9bbcf1723..000000000 --- a/ccm-testutils/src/main/java/org/libreccm/tests/categories/UnitTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2015 LibreCCM Foundation. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ -package org.libreccm.tests.categories; - -import org.junit.experimental.categories.Category; - -/** - * A marker interface for use with JUnit's {@link Category} annotation to mark - * the tests which should be executed in every case. - * - * Tests which are grouped into this category are used to test an - * individual class. All external dependencies should be mocked. - * - * @author Jens Pelzetter - */ -public interface UnitTest { - -} diff --git a/ccm-testutils/src/main/java/org/libreccm/tests/categories/package-info.java b/ccm-testutils/src/main/java/org/libreccm/tests/categories/package-info.java deleted file mode 100644 index 0decdba5b..000000000 --- a/ccm-testutils/src/main/java/org/libreccm/tests/categories/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * The interfaces in this package are used to control which test are executed - * in the default module and which ones are executed in special profiles. - */ -package org.libreccm.tests.categories;