Removed UnitTest category usage and class

Former-commit-id: be2a4ac94c
pull/4/head
Jens Pelzetter 2020-07-18 18:09:47 +02:00
parent 54213fb27b
commit c0d9bc8e69
59 changed files with 33 additions and 226 deletions

View File

@ -26,7 +26,6 @@ import org.libreccm.core.CcmObject;
import org.libreccm.security.Group; import org.libreccm.security.Group;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.security.User; import org.libreccm.security.User;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -40,7 +39,6 @@ import java.util.UUID;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class AssetEqualsAndHashCodeTest extends EqualsVerifier { public class AssetEqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -24,7 +24,6 @@ import org.junit.runners.Parameterized;
import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObject;
import org.libreccm.security.Group; import org.libreccm.security.Group;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -38,7 +37,6 @@ import java.util.UUID;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class AttachmentsEqualsAndHashCodeTest extends EqualsVerifier { public class AttachmentsEqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -22,10 +22,8 @@ import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetType;
import org.libreccm.testutils.DatasetsVerifier; import org.libreccm.testutils.DatasetsVerifier;
@ -37,7 +35,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class DatasetsTest extends DatasetsVerifier { public class DatasetsTest extends DatasetsVerifier {
@Parameterized.Parameters(name = "Dataset {0}") @Parameterized.Parameters(name = "Dataset {0}")

View File

@ -28,7 +28,6 @@ import org.libreccm.core.Resource;
import org.libreccm.security.Group; import org.libreccm.security.Group;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.security.User; import org.libreccm.security.User;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import org.libreccm.web.CcmApplication; import org.libreccm.web.CcmApplication;
import org.libreccm.workflow.Workflow; import org.libreccm.workflow.Workflow;
@ -42,7 +41,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -25,7 +25,6 @@ import java.util.Collection;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
/** /**
@ -33,7 +32,6 @@ import org.libreccm.testutils.EqualsVerifier;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -29,6 +29,24 @@
</licenses> </licenses>
<dependencies> <dependencies>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<scope>test</scope>
<version>2.44.0</version>
</dependency>
<dependency>
<groupId>com.opera</groupId>
<artifactId>operadriver</artifactId>
<scope>test</scope>
<version>1.5</version>
<exclusions>
<exclusion>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-remote-driver</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>javax</groupId> <groupId>javax</groupId>
<artifactId>javaee-api</artifactId> <artifactId>javaee-api</artifactId>

View File

@ -18,10 +18,8 @@
*/ */
package com.arsdigita.kernel; package com.arsdigita.kernel;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -33,7 +31,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")
public static Collection<Class<?>> data() { public static Collection<Class<?>> data() {

View File

@ -18,10 +18,8 @@
*/ */
package com.arsdigita.kernel; package com.arsdigita.kernel;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -32,7 +30,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -23,17 +23,14 @@ import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.libreccm.tests.categories.UnitTest;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.is;
import static org.junit.Assert.*; import static org.junit.Assert.assertThat;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@Category(UnitTest.class)
public class AssertTest { public class AssertTest {
public AssertTest() { public AssertTest() {

View File

@ -21,24 +21,26 @@ package com.arsdigita.util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.assertTrue;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.libreccm.tests.categories.UnitTest;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.*; import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
/** /**
* *
* @author Konermann * @author Konermann
*/ */
@Category(UnitTest.class)
public class StringUtilsTest { public class StringUtilsTest {
public StringUtilsTest() { public StringUtilsTest() {

View File

@ -23,19 +23,17 @@ import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.libreccm.tests.categories.UnitTest;
import java.util.ArrayList; import java.util.ArrayList;
import static org.hamcrest.Matchers.*; import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*; import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@Category(UnitTest.class)
public class WebConfigTest { public class WebConfigTest {
public WebConfigTest() { public WebConfigTest() {

View File

@ -20,9 +20,9 @@ package org.libreccm.categorization;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetType;
import org.libreccm.testutils.DatasetsVerifier; import org.libreccm.testutils.DatasetsVerifier;
@ -34,7 +34,6 @@ import static org.libreccm.testutils.DatasetType.*;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class DatasetsTest extends DatasetsVerifier { public class DatasetsTest extends DatasetsVerifier {
@Parameterized.Parameters(name = "Dataset {0}") @Parameterized.Parameters(name = "Dataset {0}")

View File

@ -25,7 +25,6 @@ import org.libreccm.core.CcmObject;
import org.libreccm.security.Group; import org.libreccm.security.Group;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.security.User; import org.libreccm.security.User;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import org.libreccm.web.CcmApplication; import org.libreccm.web.CcmApplication;
@ -37,7 +36,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -20,10 +20,8 @@ package org.libreccm.categorization;
import static org.libreccm.testutils.DatasetType.*; import static org.libreccm.testutils.DatasetType.*;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetType;
import org.libreccm.testutils.DatasetsVerifier; import org.libreccm.testutils.DatasetsVerifier;
@ -35,7 +33,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class RegistrySetupDatasetsTest extends DatasetsVerifier { public class RegistrySetupDatasetsTest extends DatasetsVerifier {
@Parameterized.Parameters(name = "Dataset {0}") @Parameterized.Parameters(name = "Dataset {0}")

View File

@ -21,7 +21,6 @@ package org.libreccm.categorization;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
import org.libreccm.tests.categories.UnitTest;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -31,7 +30,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -20,14 +20,13 @@ package org.libreccm.configuration;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetType;
import org.libreccm.testutils.DatasetsVerifier; import org.libreccm.testutils.DatasetsVerifier;
@ -39,7 +38,6 @@ import static org.libreccm.testutils.DatasetType.*;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class DatasetsTest extends DatasetsVerifier { public class DatasetsTest extends DatasetsVerifier {
@Parameterized.Parameters(name = "Dataset {0}") @Parameterized.Parameters(name = "Dataset {0}")

View File

@ -23,7 +23,6 @@ import java.util.Collection;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
/** /**
@ -33,7 +32,6 @@ import org.libreccm.testutils.EqualsVerifier;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -21,10 +21,8 @@ package org.libreccm.configuration;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
/** /**
@ -34,7 +32,6 @@ import org.libreccm.testutils.ToStringVerifier;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -22,10 +22,8 @@ import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.DatasetsVerifier; import org.libreccm.testutils.DatasetsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -37,7 +35,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class DatasetsTest extends DatasetsVerifier { public class DatasetsTest extends DatasetsVerifier {
@Parameterized.Parameters(name = "Dataset {0}") @Parameterized.Parameters(name = "Dataset {0}")

View File

@ -21,7 +21,6 @@ package org.libreccm.core;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -39,7 +38,6 @@ import org.libreccm.testutils.EqualsVerifier;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -26,7 +26,6 @@ import org.libreccm.l10n.LocalizedString;
import org.libreccm.security.Group; import org.libreccm.security.Group;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.security.User; import org.libreccm.security.User;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -42,7 +41,6 @@ import java.util.Locale;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class ResourceEntityTest extends EqualsVerifier { public class ResourceEntityTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -18,11 +18,9 @@
*/ */
package org.libreccm.core; package org.libreccm.core;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
import org.libreccm.tests.categories.UnitTest;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -34,7 +32,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -26,7 +26,6 @@ import org.libreccm.core.CcmObject;
import org.libreccm.security.Group; import org.libreccm.security.Group;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.security.User; import org.libreccm.security.User;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -37,7 +36,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -18,11 +18,9 @@
*/ */
package org.libreccm.formbuilder; package org.libreccm.formbuilder;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
import org.libreccm.tests.categories.UnitTest;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -32,7 +30,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -23,7 +23,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.formbuilder.Component; import org.libreccm.formbuilder.Component;
import org.libreccm.formbuilder.FormSection; import org.libreccm.formbuilder.FormSection;
import org.libreccm.tests.categories.UnitTest;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -40,7 +39,6 @@ import org.libreccm.testutils.EqualsVerifier;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -18,11 +18,9 @@
*/ */
package org.libreccm.formbuilder.actions; package org.libreccm.formbuilder.actions;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
import org.libreccm.tests.categories.UnitTest;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -32,7 +30,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -24,8 +24,6 @@ import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.libreccm.tests.categories.UnitTest;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@ -38,7 +36,6 @@ import static org.hamcrest.Matchers.*;
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@Category(UnitTest.class)
public class UriConverterTest { public class UriConverterTest {
private static final String WWW_EXAMPLE_ORG = "http://www.example.org"; private static final String WWW_EXAMPLE_ORG = "http://www.example.org";

View File

@ -19,11 +19,9 @@
package org.libreccm.l10n; package org.libreccm.l10n;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.messaging.Message; import org.libreccm.messaging.Message;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -34,7 +32,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -18,10 +18,8 @@
*/ */
package org.libreccm.l10n; package org.libreccm.l10n;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -32,7 +30,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -26,7 +26,6 @@ import org.libreccm.core.CcmObject;
import org.libreccm.security.Group; import org.libreccm.security.Group;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.security.User; import org.libreccm.security.User;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -37,7 +36,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -18,10 +18,8 @@
*/ */
package org.libreccm.messaging; package org.libreccm.messaging;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -32,7 +30,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -27,8 +27,6 @@ import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.libreccm.tests.categories.UnitTest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -40,7 +38,6 @@ import static org.junit.Assert.*;
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@Category(UnitTest.class)
public class ComparableVersionTest { public class ComparableVersionTest {
public ComparableVersionTest() { public ComparableVersionTest() {

View File

@ -24,10 +24,8 @@ import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetType;
import org.libreccm.testutils.DatasetsVerifier; import org.libreccm.testutils.DatasetsVerifier;
@ -40,7 +38,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class DatasetsTest extends DatasetsVerifier { public class DatasetsTest extends DatasetsVerifier {
@Parameterized.Parameters(name = "Dataset {0}") @Parameterized.Parameters(name = "Dataset {0}")

View File

@ -26,8 +26,6 @@ import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; 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.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -38,7 +36,6 @@ import static org.junit.Assert.*;
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@Category(UnitTest.class)
public class DependencyTreeManagerValidateVersionTest { public class DependencyTreeManagerValidateVersionTest {
public DependencyTreeManagerValidateVersionTest() { public DependencyTreeManagerValidateVersionTest() {

View File

@ -27,7 +27,6 @@ import org.libreccm.messaging.Message;
import org.libreccm.security.Party; import org.libreccm.security.Party;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.security.User; import org.libreccm.security.User;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -38,7 +37,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -18,10 +18,8 @@
*/ */
package org.libreccm.notification; package org.libreccm.notification;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -32,7 +30,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -26,7 +26,6 @@ import org.libreccm.core.CcmObject;
import org.libreccm.core.Resource; import org.libreccm.core.Resource;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.security.User; import org.libreccm.security.User;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -37,7 +36,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -18,10 +18,8 @@
*/ */
package org.libreccm.portal; package org.libreccm.portal;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -32,7 +30,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -21,7 +21,6 @@ package org.libreccm.runtime;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -32,7 +31,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -18,10 +18,8 @@
*/ */
package org.libreccm.runtime; package org.libreccm.runtime;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -32,7 +30,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -23,7 +23,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.security.Group; import org.libreccm.security.Group;
import org.libreccm.security.User; import org.libreccm.security.User;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -34,7 +33,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -18,10 +18,8 @@
*/ */
package org.libreccm.search.lucene; package org.libreccm.search.lucene;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -32,7 +30,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -18,10 +18,8 @@
*/ */
package org.libreccm.security; package org.libreccm.security;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import static org.libreccm.testutils.DatasetType.*; import static org.libreccm.testutils.DatasetType.*;
@ -36,7 +34,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class DatasetsTest extends DatasetsVerifier { public class DatasetsTest extends DatasetsVerifier {
@Parameterized.Parameters(name = "Dataset {0}") @Parameterized.Parameters(name = "Dataset {0}")

View File

@ -20,10 +20,8 @@ package org.libreccm.security;
import static org.libreccm.testutils.DatasetType.*; import static org.libreccm.testutils.DatasetType.*;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetType;
import org.libreccm.testutils.DatasetsVerifier; import org.libreccm.testutils.DatasetsVerifier;
@ -35,7 +33,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class DatasetsXmlTest extends DatasetsVerifier { public class DatasetsXmlTest extends DatasetsVerifier {
@Parameterized.Parameters(name = "Dataset {0}") @Parameterized.Parameters(name = "Dataset {0}")

View File

@ -22,7 +22,6 @@ import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObject;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import org.libreccm.workflow.AssignableTask; import org.libreccm.workflow.AssignableTask;
@ -35,7 +34,6 @@ import java.util.Locale;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -23,9 +23,7 @@ import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.libreccm.core.EmailAddress; import org.libreccm.core.EmailAddress;
import org.libreccm.tests.categories.UnitTest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -37,7 +35,6 @@ import static org.junit.Assert.*;
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@Category(UnitTest.class)
public class ListContainsTest { public class ListContainsTest {
public ListContainsTest() { public ListContainsTest() {

View File

@ -25,8 +25,6 @@ import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.libreccm.tests.categories.UnitTest;
import java.util.Set; import java.util.Set;
@ -40,7 +38,6 @@ import static org.junit.Assert.*;
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@Category(UnitTest.class)
public class PartyConstraintTest { public class PartyConstraintTest {
public PartyConstraintTest() { public PartyConstraintTest() {

View File

@ -18,10 +18,8 @@
*/ */
package org.libreccm.security; package org.libreccm.security;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -32,7 +30,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -21,7 +21,6 @@ package org.libreccm.theming.db;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -33,7 +32,6 @@ import java.util.Objects;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -28,7 +28,6 @@ import org.libreccm.core.Resource;
import org.libreccm.security.Group; import org.libreccm.security.Group;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.security.User; import org.libreccm.security.User;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -39,7 +38,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@org.junit.experimental.categories.Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -18,10 +18,8 @@
*/ */
package org.libreccm.web; package org.libreccm.web;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -32,7 +30,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -19,14 +19,12 @@
package org.libreccm.workflow; package org.libreccm.workflow;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObject;
import org.libreccm.security.Group; import org.libreccm.security.Group;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.security.User; import org.libreccm.security.User;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -38,7 +36,6 @@ import java.util.Locale;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -18,10 +18,8 @@
*/ */
package org.libreccm.workflow; package org.libreccm.workflow;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -32,7 +30,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -20,14 +20,13 @@ package org.libreccm.shortcuts;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.DatasetType; import org.libreccm.testutils.DatasetType;
import org.libreccm.testutils.DatasetsVerifier; import org.libreccm.testutils.DatasetsVerifier;
@ -36,7 +35,6 @@ import org.libreccm.testutils.DatasetsVerifier;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class DatasetsTest extends DatasetsVerifier { public class DatasetsTest extends DatasetsVerifier {
@Parameterized.Parameters(name = "Dataset {0}") @Parameterized.Parameters(name = "Dataset {0}")

View File

@ -23,11 +23,9 @@ import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.EqualsVerifier; import org.libreccm.testutils.EqualsVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -38,7 +36,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class EqualsAndHashCodeTest extends EqualsVerifier { public class EqualsAndHashCodeTest extends EqualsVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -22,10 +22,8 @@ import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest;
import org.libreccm.testutils.ToStringVerifier; import org.libreccm.testutils.ToStringVerifier;
import java.util.Arrays; import java.util.Arrays;
@ -37,7 +35,6 @@ import java.util.Collection;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(UnitTest.class)
public class ToStringTest extends ToStringVerifier { public class ToStringTest extends ToStringVerifier {
@Parameterized.Parameters(name = "{0}") @Parameterized.Parameters(name = "{0}")

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
public interface IntegrationTest {
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
public interface UnitTest {
}

View File

@ -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;