diff --git a/source/test-java/org/alfresco/RepositoryStartStopTest.java b/source/test-java/org/alfresco/RepositoryStartStopTest.java index ba177e06e7..6faa838234 100644 --- a/source/test-java/org/alfresco/RepositoryStartStopTest.java +++ b/source/test-java/org/alfresco/RepositoryStartStopTest.java @@ -28,9 +28,11 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.BaseApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import org.springframework.context.support.AbstractApplicationContext; @@ -51,6 +53,7 @@ import junit.framework.TestCase; * * @author Nick Burch */ +@Category(OwnJVMTestsCategory.class) public class RepositoryStartStopTest extends TestCase { private ServiceRegistry serviceRegistry; diff --git a/source/test-java/org/alfresco/repo/action/ActionTrackingServiceImplTest.java b/source/test-java/org/alfresco/repo/action/ActionTrackingServiceImplTest.java index 109ee628c1..066c4bc97d 100644 --- a/source/test-java/org/alfresco/repo/action/ActionTrackingServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/action/ActionTrackingServiceImplTest.java @@ -58,7 +58,9 @@ import org.alfresco.service.cmr.repository.ScriptService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ConfigurableApplicationContext; /** @@ -67,6 +69,7 @@ import org.springframework.context.ConfigurableApplicationContext; * * @author Nick Burch */ +@Category(OwnJVMTestsCategory.class) public class ActionTrackingServiceImplTest extends TestCase { private static ConfigurableApplicationContext ctx = diff --git a/source/test-java/org/alfresco/repo/activities/ActivityServiceImplTest.java b/source/test-java/org/alfresco/repo/activities/ActivityServiceImplTest.java index 3f47fa1b6a..4a1c0f5040 100644 --- a/source/test-java/org/alfresco/repo/activities/ActivityServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/activities/ActivityServiceImplTest.java @@ -36,7 +36,9 @@ import org.alfresco.service.cmr.repository.ScriptService; import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteVisibility; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -45,6 +47,7 @@ import org.springframework.context.ApplicationContext; * @author janv * @since 3.0 */ +@Category(OwnJVMTestsCategory.class) public class ActivityServiceImplTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/audit/AuditBootstrapTest.java b/source/test-java/org/alfresco/repo/audit/AuditBootstrapTest.java index 4f0dd8cb65..e2d4e616c6 100644 --- a/source/test-java/org/alfresco/repo/audit/AuditBootstrapTest.java +++ b/source/test-java/org/alfresco/repo/audit/AuditBootstrapTest.java @@ -29,10 +29,12 @@ import org.alfresco.repo.audit.model.AuditApplication; import org.alfresco.repo.audit.model.AuditModelException; import org.alfresco.repo.audit.model.AuditModelRegistryImpl; import org.alfresco.repo.audit.model.AuditApplication.DataExtractorDefinition; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.PathMapper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import org.springframework.util.ResourceUtils; @@ -44,6 +46,7 @@ import org.springframework.util.ResourceUtils; * @author Derek Hulley * @since 3.2 */ +@Category(OwnJVMTestsCategory.class) public class AuditBootstrapTest extends TestCase { private static final String APPLICATION_TEST = "Alfresco Test"; diff --git a/source/test-java/org/alfresco/repo/audit/AuditComponentTest.java b/source/test-java/org/alfresco/repo/audit/AuditComponentTest.java index 1182b0c58e..6f70ddfc36 100644 --- a/source/test-java/org/alfresco/repo/audit/AuditComponentTest.java +++ b/source/test-java/org/alfresco/repo/audit/AuditComponentTest.java @@ -47,11 +47,13 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.EqualsHelper; import org.apache.commons.lang.mutable.MutableInt; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import org.springframework.util.ResourceUtils; @@ -64,6 +66,7 @@ import org.springframework.util.ResourceUtils; * @author Derek Hulley * @since 3.2 */ +@Category(OwnJVMTestsCategory.class) public class AuditComponentTest extends TestCase { private static final String APPLICATION_TEST = "Alfresco Test"; diff --git a/source/test-java/org/alfresco/repo/audit/AuditableAspectTest.java b/source/test-java/org/alfresco/repo/audit/AuditableAspectTest.java index ddb00f882c..a510569b38 100644 --- a/source/test-java/org/alfresco/repo/audit/AuditableAspectTest.java +++ b/source/test-java/org/alfresco/repo/audit/AuditableAspectTest.java @@ -41,8 +41,10 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.debug.NodeStoreInspector; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -51,6 +53,7 @@ import org.springframework.context.ApplicationContext; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class AuditableAspectTest extends TestCase { private static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/coci/CheckOutCheckInServiceImplTest.java b/source/test-java/org/alfresco/repo/coci/CheckOutCheckInServiceImplTest.java index 2c0efba14b..fac597bc94 100644 --- a/source/test-java/org/alfresco/repo/coci/CheckOutCheckInServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/coci/CheckOutCheckInServiceImplTest.java @@ -62,10 +62,12 @@ import org.alfresco.service.cmr.version.VersionType; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; import org.alfresco.util.GUID; import org.alfresco.util.PropertyMap; import org.alfresco.util.TestWithUserUtils; +import org.junit.experimental.categories.Category; import org.springframework.extensions.surf.util.I18NUtil; /** @@ -73,6 +75,7 @@ import org.springframework.extensions.surf.util.I18NUtil; * * @author Roy Wetherall */ +@Category(OwnJVMTestsCategory.class) public class CheckOutCheckInServiceImplTest extends BaseSpringTest { /** diff --git a/source/test-java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java b/source/test-java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java index da7d225ece..47f219cce5 100644 --- a/source/test-java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java @@ -28,7 +28,9 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.RegexQNamePattern; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; +import org.junit.experimental.categories.Category; /** * Configurable service implementation test @@ -36,6 +38,7 @@ import org.alfresco.util.BaseSpringTest; * @author Roy Wetherall */ @SuppressWarnings("unused") +@Category(OwnJVMTestsCategory.class) public class ConfigurableServiceImplTest extends BaseSpringTest { public NodeService nodeService; diff --git a/source/test-java/org/alfresco/repo/content/caching/CachingContentStoreSpringTest.java b/source/test-java/org/alfresco/repo/content/caching/CachingContentStoreSpringTest.java index c189a2fdfe..1f956ba492 100644 --- a/source/test-java/org/alfresco/repo/content/caching/CachingContentStoreSpringTest.java +++ b/source/test-java/org/alfresco/repo/content/caching/CachingContentStoreSpringTest.java @@ -32,7 +32,9 @@ import org.alfresco.repo.content.ContentStore; import org.alfresco.repo.content.caching.quota.QuotaManagerStrategy; import org.alfresco.repo.content.filestore.FileContentStore; import org.alfresco.service.cmr.repository.ContentWriter; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.TempFileProvider; +import org.junit.experimental.categories.Category; import org.junit.internal.runners.JUnit38ClassRunner; import org.junit.runner.RunWith; @@ -44,6 +46,7 @@ import org.junit.runner.RunWith; * @author Matt Ward */ @RunWith(JUnit38ClassRunner.class) +@Category(OwnJVMTestsCategory.class) public class CachingContentStoreSpringTest extends AbstractWritableContentStoreTest { private CachingContentStore store; diff --git a/source/test-java/org/alfresco/repo/content/caching/ContentCacheImplTest.java b/source/test-java/org/alfresco/repo/content/caching/ContentCacheImplTest.java index 173b693994..805606dee0 100644 --- a/source/test-java/org/alfresco/repo/content/caching/ContentCacheImplTest.java +++ b/source/test-java/org/alfresco/repo/content/caching/ContentCacheImplTest.java @@ -32,10 +32,12 @@ import org.alfresco.repo.content.filestore.FileContentReader; import org.alfresco.repo.content.filestore.FileContentWriter; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentWriter; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.GUID; import org.alfresco.util.TempFileProvider; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; @@ -51,6 +53,7 @@ import org.mockito.stubbing.Answer; * @author Matt Ward */ @RunWith(MockitoJUnitRunner.class) +@Category(OwnJVMTestsCategory.class) public class ContentCacheImplTest { private ContentCacheImpl contentCache; diff --git a/source/test-java/org/alfresco/repo/domain/audit/AuditDAOTest.java b/source/test-java/org/alfresco/repo/domain/audit/AuditDAOTest.java index 85125dced9..bf66dd76b2 100644 --- a/source/test-java/org/alfresco/repo/domain/audit/AuditDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/audit/AuditDAOTest.java @@ -40,10 +40,12 @@ import org.alfresco.service.cmr.audit.AuditQueryParameters; import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback; import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.GUID; import org.alfresco.util.Pair; import org.apache.commons.lang.mutable.MutableInt; +import org.junit.experimental.categories.Category; import org.springframework.context.ConfigurableApplicationContext; /** @@ -52,6 +54,7 @@ import org.springframework.context.ConfigurableApplicationContext; * @author Derek Hulley * @since 3.2 */ +@Category(OwnJVMTestsCategory.class) public class AuditDAOTest extends TestCase { private ConfigurableApplicationContext ctx = (ConfigurableApplicationContext) ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java b/source/test-java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java index a92865f362..4a3072e889 100644 --- a/source/test-java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java @@ -34,9 +34,11 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.Pair; import org.alfresco.util.TempFileProvider; +import org.junit.experimental.categories.Category; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.dao.DataIntegrityViolationException; @@ -46,6 +48,7 @@ import org.springframework.dao.DataIntegrityViolationException; * @author Derek Hulley * @since 3.2 */ +@Category(OwnJVMTestsCategory.class) public class ContentDataDAOTest extends TestCase { private ConfigurableApplicationContext ctx = (ConfigurableApplicationContext) ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/domain/patch/AppliedPatchDAOTest.java b/source/test-java/org/alfresco/repo/domain/patch/AppliedPatchDAOTest.java index a9d9496816..0d708079d8 100644 --- a/source/test-java/org/alfresco/repo/domain/patch/AppliedPatchDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/patch/AppliedPatchDAOTest.java @@ -27,7 +27,9 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -36,6 +38,7 @@ import org.springframework.context.ApplicationContext; * @author Derek Hulley * @since 3.4 */ +@Category(OwnJVMTestsCategory.class) public class AppliedPatchDAOTest extends TestCase { private ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/domain/permissions/AclCrudDAOTest.java b/source/test-java/org/alfresco/repo/domain/permissions/AclCrudDAOTest.java index 48179ad2c8..425df3d7c9 100644 --- a/source/test-java/org/alfresco/repo/domain/permissions/AclCrudDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/permissions/AclCrudDAOTest.java @@ -30,7 +30,9 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti import org.alfresco.service.ServiceRegistry; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -39,6 +41,7 @@ import org.springframework.context.ApplicationContext; * @author janv * @since 3.4 */ +@Category(OwnJVMTestsCategory.class) public class AclCrudDAOTest extends TestCase { private ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/domain/query/CannedQueryDAOTest.java b/source/test-java/org/alfresco/repo/domain/query/CannedQueryDAOTest.java index ede63b0524..bf7db59bef 100644 --- a/source/test-java/org/alfresco/repo/domain/query/CannedQueryDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/query/CannedQueryDAOTest.java @@ -33,12 +33,14 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.GUID; import org.alfresco.util.test.junitrules.ApplicationContextInit; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.RuleChain; import org.junit.runners.MethodSorters; @@ -49,6 +51,7 @@ import org.junit.runners.MethodSorters; * @since 3.2 */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(OwnJVMTestsCategory.class) public class CannedQueryDAOTest { private static final String QUERY_NS = "alfresco.query.test"; diff --git a/source/test-java/org/alfresco/repo/exporter/ExporterComponentTest.java b/source/test-java/org/alfresco/repo/exporter/ExporterComponentTest.java index a0b911f341..5531de0210 100644 --- a/source/test-java/org/alfresco/repo/exporter/ExporterComponentTest.java +++ b/source/test-java/org/alfresco/repo/exporter/ExporterComponentTest.java @@ -57,12 +57,14 @@ import org.alfresco.service.cmr.view.ImporterService; import org.alfresco.service.cmr.view.Location; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; import org.alfresco.util.TempFileProvider; import org.alfresco.util.debug.NodeStoreInspector; +import org.junit.experimental.categories.Category; import org.springframework.extensions.surf.util.I18NUtil; - +@Category(OwnJVMTestsCategory.class) public class ExporterComponentTest extends BaseSpringTest { diff --git a/source/test-java/org/alfresco/repo/lock/LockServiceImplTest.java b/source/test-java/org/alfresco/repo/lock/LockServiceImplTest.java index c515e6fcbb..4b7ce79214 100644 --- a/source/test-java/org/alfresco/repo/lock/LockServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/lock/LockServiceImplTest.java @@ -47,15 +47,18 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; import org.alfresco.util.TestWithUserUtils; import org.hibernate.engine.TransactionHelper; +import org.junit.experimental.categories.Category; /** * Simple lock service test * * @author Roy Wetherall */ +@Category(OwnJVMTestsCategory.class) public class LockServiceImplTest extends BaseSpringTest { /** diff --git a/source/test-java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java b/source/test-java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java index daabfb9e12..a2d6fa3d4f 100644 --- a/source/test-java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java @@ -72,11 +72,13 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.FileFilterMode; import org.alfresco.util.FileFilterMode.Client; import org.alfresco.util.GUID; import org.alfresco.util.Pair; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import org.springframework.extensions.surf.util.I18NUtil; @@ -84,6 +86,7 @@ import org.springframework.extensions.surf.util.I18NUtil; * @see org.alfresco.repo.model.filefolder.FileFolderServiceImpl * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class FileFolderServiceImplTest extends TestCase { private static final String IMPORT_VIEW = "filefolder/filefolder-test-import.xml"; diff --git a/source/test-java/org/alfresco/repo/model/ml/tools/EditionServiceImplTest.java b/source/test-java/org/alfresco/repo/model/ml/tools/EditionServiceImplTest.java index 9fdc9b2f1c..422a5c3d6d 100644 --- a/source/test-java/org/alfresco/repo/model/ml/tools/EditionServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/model/ml/tools/EditionServiceImplTest.java @@ -36,6 +36,8 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.version.Version; import org.alfresco.service.cmr.version.VersionHistory; import org.alfresco.service.cmr.version.VersionType; +import org.alfresco.test_category.OwnJVMTestsCategory; +import org.junit.experimental.categories.Category; /** * Edition Service test cases @@ -43,6 +45,7 @@ import org.alfresco.service.cmr.version.VersionType; * @since 2.1 * @author Yannick Pignot */ +@Category(OwnJVMTestsCategory.class) public class EditionServiceImplTest extends AbstractMultilingualTestCases { private static String FRENCH_CONTENT = "FRENCH_CONTENT"; diff --git a/source/test-java/org/alfresco/repo/model/ml/tools/EmptyTranslationAspectTest.java b/source/test-java/org/alfresco/repo/model/ml/tools/EmptyTranslationAspectTest.java index 464ca10bb9..ae1d846111 100644 --- a/source/test-java/org/alfresco/repo/model/ml/tools/EmptyTranslationAspectTest.java +++ b/source/test-java/org/alfresco/repo/model/ml/tools/EmptyTranslationAspectTest.java @@ -28,6 +28,8 @@ import org.alfresco.service.cmr.repository.ContentService; import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; +import org.junit.experimental.categories.Category; /** * Empty translations aspect test cases @@ -36,6 +38,7 @@ import org.alfresco.service.namespace.QName; * * @author Yannick Pignot */ +@Category(OwnJVMTestsCategory.class) public class EmptyTranslationAspectTest extends AbstractMultilingualTestCases { protected ContentService contentService; diff --git a/source/test-java/org/alfresco/repo/model/ml/tools/MultilingualContentServiceImplTest.java b/source/test-java/org/alfresco/repo/model/ml/tools/MultilingualContentServiceImplTest.java index 6c89d8804d..9021025734 100644 --- a/source/test-java/org/alfresco/repo/model/ml/tools/MultilingualContentServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/model/ml/tools/MultilingualContentServiceImplTest.java @@ -30,7 +30,9 @@ import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.security.PermissionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.GUID; +import org.junit.experimental.categories.Category; import org.springframework.extensions.surf.util.I18NUtil; /** @@ -39,6 +41,7 @@ import org.springframework.extensions.surf.util.I18NUtil; * @author Derek Hulley * @author Philippe Dubois */ +@Category(OwnJVMTestsCategory.class) public class MultilingualContentServiceImplTest extends AbstractMultilingualTestCases { diff --git a/source/test-java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java b/source/test-java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java index aeab9db27d..d104cce31a 100644 --- a/source/test-java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java +++ b/source/test-java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java @@ -40,15 +40,18 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** * @author Nick Burch * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class ConcurrentNodeServiceTest extends TestCase { public static final String NAMESPACE = "http://www.alfresco.org/test/BaseNodeServiceTest"; diff --git a/source/test-java/org/alfresco/repo/node/FullNodeServiceTest.java b/source/test-java/org/alfresco/repo/node/FullNodeServiceTest.java index 19eeb8ea77..0a18a4f5d3 100644 --- a/source/test-java/org/alfresco/repo/node/FullNodeServiceTest.java +++ b/source/test-java/org/alfresco/repo/node/FullNodeServiceTest.java @@ -37,6 +37,8 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; +import org.junit.experimental.categories.Category; import org.springframework.extensions.surf.util.I18NUtil; /** @@ -46,6 +48,7 @@ import org.springframework.extensions.surf.util.I18NUtil; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class FullNodeServiceTest extends BaseNodeServiceTest { protected NodeService getNodeService() diff --git a/source/test-java/org/alfresco/repo/node/NodeServiceTest.java b/source/test-java/org/alfresco/repo/node/NodeServiceTest.java index 912573533a..0840dc91ee 100644 --- a/source/test-java/org/alfresco/repo/node/NodeServiceTest.java +++ b/source/test-java/org/alfresco/repo/node/NodeServiceTest.java @@ -81,6 +81,7 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.GUID; import org.alfresco.util.Pair; import org.alfresco.util.PropertyMap; @@ -92,6 +93,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.RuleChain; import org.springframework.dao.ConcurrencyFailureException; import org.springframework.extensions.surf.util.I18NUtil; @@ -102,6 +104,7 @@ import org.springframework.extensions.surf.util.I18NUtil; * @author Derek Hulley * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class NodeServiceTest { public static final String NAMESPACE = "http://www.alfresco.org/test/BaseNodeServiceTest"; diff --git a/source/test-java/org/alfresco/repo/node/PerformanceNodeServiceTest.java b/source/test-java/org/alfresco/repo/node/PerformanceNodeServiceTest.java index 33aa117e07..6b6aaca66d 100644 --- a/source/test-java/org/alfresco/repo/node/PerformanceNodeServiceTest.java +++ b/source/test-java/org/alfresco/repo/node/PerformanceNodeServiceTest.java @@ -41,12 +41,15 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** * PerformanceNodeServiceTest */ +@Category(OwnJVMTestsCategory.class) public class PerformanceNodeServiceTest extends TestCase { public static final String NAMESPACE = "http://www.alfresco.org/test/BaseNodeServiceTest"; diff --git a/source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java b/source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java index 3bf9acbb22..beda997f23 100644 --- a/source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java +++ b/source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java @@ -54,9 +54,11 @@ import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.ScriptPagingDetails; import org.alfresco.util.TestWithUserUtils; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -65,6 +67,7 @@ import org.springframework.context.ApplicationContext; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class ArchiveAndRestoreTest extends TestCase { private static final String USER_A = "aaaaa"; diff --git a/source/test-java/org/alfresco/repo/node/archive/LargeArchiveAndRestoreTest.java b/source/test-java/org/alfresco/repo/node/archive/LargeArchiveAndRestoreTest.java index d4ddb84d12..4305fe71ca 100644 --- a/source/test-java/org/alfresco/repo/node/archive/LargeArchiveAndRestoreTest.java +++ b/source/test-java/org/alfresco/repo/node/archive/LargeArchiveAndRestoreTest.java @@ -37,10 +37,12 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.PropertyMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -48,6 +50,7 @@ import org.springframework.context.ApplicationContext; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class LargeArchiveAndRestoreTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/node/cleanup/TransactionCleanupTest.java b/source/test-java/org/alfresco/repo/node/cleanup/TransactionCleanupTest.java index e31a984653..db64ef97c9 100644 --- a/source/test-java/org/alfresco/repo/node/cleanup/TransactionCleanupTest.java +++ b/source/test-java/org/alfresco/repo/node/cleanup/TransactionCleanupTest.java @@ -28,12 +28,14 @@ import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import org.springframework.extensions.webscripts.GUID; @@ -41,6 +43,7 @@ import org.springframework.extensions.webscripts.GUID; * @author Derek Hulley * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class TransactionCleanupTest { private static Log logger = LogFactory.getLog(TransactionCleanupTest.class); diff --git a/source/test-java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java b/source/test-java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java index 3c453a54b5..c6af17892c 100644 --- a/source/test-java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java @@ -45,7 +45,9 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.Pair; +import org.junit.experimental.categories.Category; import org.springframework.extensions.surf.util.I18NUtil; /** @@ -54,6 +56,7 @@ import org.springframework.extensions.surf.util.I18NUtil; * @author Derek Hulley */ @SuppressWarnings("unused") +@Category(OwnJVMTestsCategory.class) public class DbNodeServiceImplTest extends BaseNodeServiceTest { private TransactionService txnService; diff --git a/source/test-java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryTest.java b/source/test-java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryTest.java index cdcb037340..8d15cdc85d 100644 --- a/source/test-java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryTest.java +++ b/source/test-java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryTest.java @@ -72,12 +72,14 @@ import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.Pair; import org.alfresco.util.PropertyMap; import org.alfresco.util.registry.NamedObjectRegistry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -86,6 +88,7 @@ import org.springframework.context.ApplicationContext; * @author janv * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class GetChildrenCannedQueryTest extends TestCase { private Log logger = LogFactory.getLog(getClass()); diff --git a/source/test-java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java b/source/test-java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java index da7b1a7ffc..088d5c8298 100644 --- a/source/test-java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java +++ b/source/test-java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java @@ -35,7 +35,9 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -43,6 +45,7 @@ import org.springframework.context.ApplicationContext; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class FullIndexRecoveryComponentTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/node/index/IndexTransactionTrackerTest.java b/source/test-java/org/alfresco/repo/node/index/IndexTransactionTrackerTest.java index 150f1aff1a..4d4e40f821 100644 --- a/source/test-java/org/alfresco/repo/node/index/IndexTransactionTrackerTest.java +++ b/source/test-java/org/alfresco/repo/node/index/IndexTransactionTrackerTest.java @@ -42,7 +42,9 @@ import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -51,6 +53,7 @@ import org.springframework.context.ApplicationContext; * @author Derek Hulley */ @SuppressWarnings("unused") +@Category(OwnJVMTestsCategory.class) public class IndexTransactionTrackerTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java b/source/test-java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java index 1de19420ad..7c222b75c7 100644 --- a/source/test-java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java +++ b/source/test-java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java @@ -45,8 +45,10 @@ import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.GUID; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -54,6 +56,7 @@ import org.springframework.context.ApplicationContext; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class MissingContentReindexComponentTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/notification/NotificationServiceImplSystemTest.java b/source/test-java/org/alfresco/repo/notification/NotificationServiceImplSystemTest.java index 4f19855d50..29c0e89c66 100644 --- a/source/test-java/org/alfresco/repo/notification/NotificationServiceImplSystemTest.java +++ b/source/test-java/org/alfresco/repo/notification/NotificationServiceImplSystemTest.java @@ -36,10 +36,12 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseAlfrescoTestCase; import org.alfresco.util.GUID; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; /** * Notification service implementation test. @@ -47,6 +49,7 @@ import org.apache.commons.logging.LogFactory; * @author Roy Wetherall * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class NotificationServiceImplSystemTest extends BaseAlfrescoTestCase { private static final String FROM_USER = "fromUser" + GUID.generate(); diff --git a/source/test-java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java b/source/test-java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java index 8e4b4bb0bf..140e396f7b 100644 --- a/source/test-java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java +++ b/source/test-java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java @@ -33,16 +33,19 @@ import org.alfresco.service.cmr.oauth1.OAuth1CredentialsStoreService; import org.alfresco.service.cmr.remotecredentials.OAuth1CredentialsInfo; import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.PersonService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.PropertyMap; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.FixMethodOrder; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; import org.junit.Test; import org.springframework.context.ApplicationContext; @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(OwnJVMTestsCategory.class) public class OAuth1CredentialsStoreServiceTest { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java b/source/test-java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java index 6e122dc647..ce5efd88da 100644 --- a/source/test-java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java +++ b/source/test-java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java @@ -34,13 +34,16 @@ import org.alfresco.service.cmr.oauth2.OAuth2CredentialsStoreService; import org.alfresco.service.cmr.remotecredentials.OAuth2CredentialsInfo; import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.PersonService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.PropertyMap; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; +@Category(OwnJVMTestsCategory.class) public class OAuth2CredentialsStoreServiceTest { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/ownable/impl/OwnableServiceTest.java b/source/test-java/org/alfresco/repo/ownable/impl/OwnableServiceTest.java index ab7be5b4b0..da8b92406f 100644 --- a/source/test-java/org/alfresco/repo/ownable/impl/OwnableServiceTest.java +++ b/source/test-java/org/alfresco/repo/ownable/impl/OwnableServiceTest.java @@ -42,9 +42,12 @@ import org.alfresco.service.cmr.security.OwnableService; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; +@Category(OwnJVMTestsCategory.class) public class OwnableServiceTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/remotecredentials/RemoteCredentialsServicesTest.java b/source/test-java/org/alfresco/repo/remotecredentials/RemoteCredentialsServicesTest.java index 83dbf5cec4..5b896577fa 100644 --- a/source/test-java/org/alfresco/repo/remotecredentials/RemoteCredentialsServicesTest.java +++ b/source/test-java/org/alfresco/repo/remotecredentials/RemoteCredentialsServicesTest.java @@ -47,6 +47,7 @@ import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.PropertyMap; import org.alfresco.util.test.junitrules.ApplicationContextInit; import org.alfresco.util.test.junitrules.TemporaryNodes; @@ -58,6 +59,7 @@ import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -69,6 +71,7 @@ import org.springframework.context.ApplicationContext; * @author Nick Burch * @since Odin */ +@Category(OwnJVMTestsCategory.class) public class RemoteCredentialsServicesTest { private static final String TEST_REMOTE_SYSTEM_ONE = "TestRemoteSystemOne"; diff --git a/source/test-java/org/alfresco/repo/rule/RuleLinkTest.java b/source/test-java/org/alfresco/repo/rule/RuleLinkTest.java index 56900c8019..76d6b42d0a 100644 --- a/source/test-java/org/alfresco/repo/rule/RuleLinkTest.java +++ b/source/test-java/org/alfresco/repo/rule/RuleLinkTest.java @@ -42,13 +42,16 @@ import org.alfresco.service.cmr.rule.RuleService; import org.alfresco.service.cmr.rule.RuleServiceException; import org.alfresco.service.cmr.rule.RuleType; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; +import org.junit.experimental.categories.Category; /** * Parameter definition implementation unit test. * * @author Roy Wetherall */ +@Category(OwnJVMTestsCategory.class) public class RuleLinkTest extends BaseSpringTest { protected static final String RULE_TYPE_NAME = RuleType.INBOUND; diff --git a/source/test-java/org/alfresco/repo/rule/RuleServiceCoverageTest.java b/source/test-java/org/alfresco/repo/rule/RuleServiceCoverageTest.java index 1eaa73ef68..4d5540d8e5 100644 --- a/source/test-java/org/alfresco/repo/rule/RuleServiceCoverageTest.java +++ b/source/test-java/org/alfresco/repo/rule/RuleServiceCoverageTest.java @@ -93,13 +93,16 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import org.springframework.util.StopWatch; /** * @author Roy Wetherall */ +@Category(OwnJVMTestsCategory.class) public class RuleServiceCoverageTest extends TestCase { /** diff --git a/source/test-java/org/alfresco/repo/rule/RuleServiceImplTest.java b/source/test-java/org/alfresco/repo/rule/RuleServiceImplTest.java index 569b74ddae..eaa5859e26 100644 --- a/source/test-java/org/alfresco/repo/rule/RuleServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/rule/RuleServiceImplTest.java @@ -51,7 +51,9 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.GUID; +import org.junit.experimental.categories.Category; /** @@ -59,6 +61,7 @@ import org.alfresco.util.GUID; * * @author Roy Wetherall */ +@Category(OwnJVMTestsCategory.class) public class RuleServiceImplTest extends BaseRuleTest { private String ASSOC_NAME_RULES_PREFIX = "rules"; diff --git a/source/test-java/org/alfresco/repo/rule/RuleServiceIntegrationTest.java b/source/test-java/org/alfresco/repo/rule/RuleServiceIntegrationTest.java index 8e7df31800..7f7f791747 100644 --- a/source/test-java/org/alfresco/repo/rule/RuleServiceIntegrationTest.java +++ b/source/test-java/org/alfresco/repo/rule/RuleServiceIntegrationTest.java @@ -49,6 +49,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.rule.RuleService; import org.alfresco.service.cmr.rule.RuleType; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.GUID; import org.alfresco.util.test.junitrules.AlfrescoPerson; import org.alfresco.util.test.junitrules.ApplicationContextInit; @@ -61,12 +62,14 @@ import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.RuleChain; /** * @author Harpritt Kalsi * @since 3.4 */ +@Category(OwnJVMTestsCategory.class) public class RuleServiceIntegrationTest { private static final String STANDARD_TEXT_CONTENT = "standardTextContent"; diff --git a/source/test-java/org/alfresco/repo/rule/RuleTypeImplTest.java b/source/test-java/org/alfresco/repo/rule/RuleTypeImplTest.java index 4357f3c59d..eeaebe9bf8 100644 --- a/source/test-java/org/alfresco/repo/rule/RuleTypeImplTest.java +++ b/source/test-java/org/alfresco/repo/rule/RuleTypeImplTest.java @@ -29,13 +29,16 @@ import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; +import org.junit.experimental.categories.Category; /** * Parameter definition implementation unit test. * * @author Roy Wetherall */ +@Category(OwnJVMTestsCategory.class) public class RuleTypeImplTest extends BaseSpringTest { private static final String NAME = "name"; diff --git a/source/test-java/org/alfresco/repo/rule/ruletrigger/RuleTriggerTest.java b/source/test-java/org/alfresco/repo/rule/ruletrigger/RuleTriggerTest.java index 48265a676a..1a249ff032 100644 --- a/source/test-java/org/alfresco/repo/rule/ruletrigger/RuleTriggerTest.java +++ b/source/test-java/org/alfresco/repo/rule/ruletrigger/RuleTriggerTest.java @@ -28,13 +28,16 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.rule.RuleType; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; +import org.junit.experimental.categories.Category; /** * Rule trigger test * * @author Roy Wetherall */ +@Category(OwnJVMTestsCategory.class) public class RuleTriggerTest extends BaseSpringTest { private static final String ON_CREATE_NODE_TRIGGER = "on-create-node-trigger"; diff --git a/source/test-java/org/alfresco/repo/search/SearchServiceTest.java b/source/test-java/org/alfresco/repo/search/SearchServiceTest.java index c49a14d1ca..af9d71e8c3 100644 --- a/source/test-java/org/alfresco/repo/search/SearchServiceTest.java +++ b/source/test-java/org/alfresco/repo/search/SearchServiceTest.java @@ -39,9 +39,12 @@ import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; +@Category(OwnJVMTestsCategory.class) public class SearchServiceTest extends TestCase { diff --git a/source/test-java/org/alfresco/repo/search/SearcherComponentTest.java b/source/test-java/org/alfresco/repo/search/SearcherComponentTest.java index 04b66af534..c7f8a6c065 100644 --- a/source/test-java/org/alfresco/repo/search/SearcherComponentTest.java +++ b/source/test-java/org/alfresco/repo/search/SearcherComponentTest.java @@ -42,10 +42,12 @@ import org.alfresco.service.cmr.search.QueryParameterDefinition; import org.alfresco.service.namespace.DynamicNamespacePrefixResolver; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.ISO9075; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.PostgreSQLDialect; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -53,7 +55,7 @@ import org.springframework.context.ApplicationContext; * * @author Derek Hulley */ - +@Category(OwnJVMTestsCategory.class) public class SearcherComponentTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java b/source/test-java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java index 87e7a19724..90122e8073 100644 --- a/source/test-java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java +++ b/source/test-java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java @@ -99,6 +99,7 @@ import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.CachingDateFormat; import org.alfresco.util.GUID; @@ -112,6 +113,7 @@ import org.apache.lucene.index.TermDocs; import org.apache.lucene.index.TermEnum; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.PostgreSQLDialect; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import org.springframework.extensions.surf.util.I18NUtil; @@ -119,6 +121,7 @@ import org.springframework.extensions.surf.util.I18NUtil; * @author andyh */ @SuppressWarnings("unused") +@Category(OwnJVMTestsCategory.class) public class ADMLuceneTest extends TestCase implements DictionaryListener { diff --git a/source/test-java/org/alfresco/repo/search/impl/lucene/ALF947Test.java b/source/test-java/org/alfresco/repo/search/impl/lucene/ALF947Test.java index 20a24f75bd..fc1444727f 100644 --- a/source/test-java/org/alfresco/repo/search/impl/lucene/ALF947Test.java +++ b/source/test-java/org/alfresco/repo/search/impl/lucene/ALF947Test.java @@ -28,9 +28,12 @@ import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; +@Category(OwnJVMTestsCategory.class) public class ALF947Test extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/search/impl/lucene/LuceneIndexBackupComponentTest.java b/source/test-java/org/alfresco/repo/search/impl/lucene/LuceneIndexBackupComponentTest.java index 39218414dd..a9f2e9a1f8 100644 --- a/source/test-java/org/alfresco/repo/search/impl/lucene/LuceneIndexBackupComponentTest.java +++ b/source/test-java/org/alfresco/repo/search/impl/lucene/LuceneIndexBackupComponentTest.java @@ -28,14 +28,17 @@ import org.alfresco.repo.search.impl.lucene.AbstractLuceneIndexerAndSearcherFact import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.TempFileProvider; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class LuceneIndexBackupComponentTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/security/authentication/AuthenticationTest.java b/source/test-java/org/alfresco/repo/security/authentication/AuthenticationTest.java index 99184f745d..726f49404f 100644 --- a/source/test-java/org/alfresco/repo/security/authentication/AuthenticationTest.java +++ b/source/test-java/org/alfresco/repo/security/authentication/AuthenticationTest.java @@ -67,12 +67,15 @@ import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.PostgreSQLDialect; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; @SuppressWarnings("unchecked") +@Category(OwnJVMTestsCategory.class) public class AuthenticationTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/security/authority/DuplicateAuthorityTest.java b/source/test-java/org/alfresco/repo/security/authority/DuplicateAuthorityTest.java index 7949d368c3..198b59a1f1 100644 --- a/source/test-java/org/alfresco/repo/security/authority/DuplicateAuthorityTest.java +++ b/source/test-java/org/alfresco/repo/security/authority/DuplicateAuthorityTest.java @@ -46,7 +46,9 @@ import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import org.springframework.dao.DataIntegrityViolationException; @@ -57,6 +59,7 @@ import org.springframework.dao.DataIntegrityViolationException; * @author Derek Hulley * @since 2.1.0 */ +@Category(OwnJVMTestsCategory.class) public class DuplicateAuthorityTest extends TestCase { private static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/security/authority/ExtendedPermissionServiceTest.java b/source/test-java/org/alfresco/repo/security/authority/ExtendedPermissionServiceTest.java index e0d13fc1ce..1564821cc3 100644 --- a/source/test-java/org/alfresco/repo/security/authority/ExtendedPermissionServiceTest.java +++ b/source/test-java/org/alfresco/repo/security/authority/ExtendedPermissionServiceTest.java @@ -23,7 +23,10 @@ import org.alfresco.repo.security.permissions.impl.SimplePermissionEntry; import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.service.cmr.security.PermissionService; +import org.alfresco.test_category.OwnJVMTestsCategory; +import org.junit.experimental.categories.Category; +@Category(OwnJVMTestsCategory.class) public class ExtendedPermissionServiceTest extends AbstractPermissionTest { public void testGroupPermission() diff --git a/source/test-java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthorityTest.java b/source/test-java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthorityTest.java index 9b69d56d11..2f91fac6cb 100644 --- a/source/test-java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthorityTest.java +++ b/source/test-java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthorityTest.java @@ -48,7 +48,9 @@ import org.alfresco.service.cmr.security.OwnableService; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -56,6 +58,8 @@ import org.springframework.context.ApplicationContext; * * @author andyh */ + +@Category(OwnJVMTestsCategory.class) public class LockOwnerDynamicAuthorityTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java b/source/test-java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java index f4caaf270b..663239c2f1 100644 --- a/source/test-java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java +++ b/source/test-java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java @@ -60,10 +60,13 @@ import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.EqualsHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; +@Category(OwnJVMTestsCategory.class) public class AclDaoComponentTest extends TestCase { private static ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java b/source/test-java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java index 86334abd02..3b27e6d6f7 100644 --- a/source/test-java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java +++ b/source/test-java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java @@ -41,7 +41,10 @@ import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; +import org.junit.experimental.categories.Category; +@Category(OwnJVMTestsCategory.class) public class PermissionServiceTest extends AbstractPermissionTest { private SimplePermissionEntry denyAndyAll; diff --git a/source/test-java/org/alfresco/repo/security/permissions/impl/ReadPermissionTest.java b/source/test-java/org/alfresco/repo/security/permissions/impl/ReadPermissionTest.java index a677a12de8..a743eb390a 100644 --- a/source/test-java/org/alfresco/repo/security/permissions/impl/ReadPermissionTest.java +++ b/source/test-java/org/alfresco/repo/security/permissions/impl/ReadPermissionTest.java @@ -11,8 +11,11 @@ import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; +import org.junit.experimental.categories.Category; // Unit tests for ALF-3952 "Search/Read Permissions Evaluation Performance" +@Category(OwnJVMTestsCategory.class) public class ReadPermissionTest extends AbstractReadPermissionTest { // public void testDynamicAuthority() throws Exception diff --git a/source/test-java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationTest.java b/source/test-java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationTest.java index f66ac1aaff..682decbbde 100644 --- a/source/test-java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationTest.java +++ b/source/test-java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationTest.java @@ -44,14 +44,17 @@ import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.Pair; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; +import org.junit.experimental.categories.Category; import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.framework.adapter.AdvisorAdapterRegistry; import org.springframework.aop.framework.adapter.GlobalAdvisorAdapterRegistry; import org.springframework.aop.target.SingletonTargetSource; +@Category(OwnJVMTestsCategory.class) public class ACLEntryAfterInvocationTest extends AbstractPermissionTest { diff --git a/source/test-java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoterTest.java b/source/test-java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoterTest.java index fd46e2527c..10dd988d1a 100644 --- a/source/test-java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoterTest.java +++ b/source/test-java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoterTest.java @@ -34,13 +34,16 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.PermissionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; +import org.junit.experimental.categories.Category; import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.framework.adapter.AdvisorAdapterRegistry; import org.springframework.aop.framework.adapter.GlobalAdvisorAdapterRegistry; import org.springframework.aop.target.SingletonTargetSource; +@Category(OwnJVMTestsCategory.class) public class ACLEntryVoterTest extends AbstractPermissionTest { diff --git a/source/test-java/org/alfresco/repo/security/permissions/impl/model/PermissionModelTest.java b/source/test-java/org/alfresco/repo/security/permissions/impl/model/PermissionModelTest.java index 65c7201576..ecab840c60 100644 --- a/source/test-java/org/alfresco/repo/security/permissions/impl/model/PermissionModelTest.java +++ b/source/test-java/org/alfresco/repo/security/permissions/impl/model/PermissionModelTest.java @@ -29,7 +29,10 @@ import org.alfresco.repo.security.permissions.impl.SimplePermissionReference; import org.alfresco.repo.security.permissions.impl.RequiredPermission.On; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; +import org.junit.experimental.categories.Category; +@Category(OwnJVMTestsCategory.class) public class PermissionModelTest extends AbstractPermissionTest { diff --git a/source/test-java/org/alfresco/repo/security/person/PersonTest.java b/source/test-java/org/alfresco/repo/security/person/PersonTest.java index 70dfd7d322..7a65d57a3a 100644 --- a/source/test-java/org/alfresco/repo/security/person/PersonTest.java +++ b/source/test-java/org/alfresco/repo/security/person/PersonTest.java @@ -57,14 +57,17 @@ import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService.PersonInfo; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.tools.RenameUser; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.EqualsHelper; import org.alfresco.util.GUID; import org.alfresco.util.Pair; import org.alfresco.util.PropertyMap; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; +@Category(OwnJVMTestsCategory.class) public class PersonTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java b/source/test-java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java index e59cd2466d..3e8119e3ce 100644 --- a/source/test-java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java +++ b/source/test-java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java @@ -56,10 +56,12 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.PropertyMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; import org.springframework.context.ConfigurableApplicationContext; /** @@ -67,6 +69,7 @@ import org.springframework.context.ConfigurableApplicationContext; * * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class SOLRTrackingComponentTest extends TestCase { private static final Log logger = LogFactory.getLog(SOLRTrackingComponentTest.class); diff --git a/source/test-java/org/alfresco/repo/template/TemplateServiceImplTest.java b/source/test-java/org/alfresco/repo/template/TemplateServiceImplTest.java index 376dfcaaf9..dd676aea1a 100644 --- a/source/test-java/org/alfresco/repo/template/TemplateServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/template/TemplateServiceImplTest.java @@ -36,12 +36,15 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.TemplateService; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** * @author Kevin Roast */ +@Category(OwnJVMTestsCategory.class) public class TemplateServiceImplTest extends TestCase { private static final String TEMPLATE_1 = "org/alfresco/repo/template/test_template1.ftl"; diff --git a/source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java b/source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java index 5d609c767e..f78e3f968f 100644 --- a/source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java +++ b/source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java @@ -80,10 +80,12 @@ import org.alfresco.service.cmr.usage.UsageService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.FixMethodOrder; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -93,6 +95,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; * since 3.0 */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(OwnJVMTestsCategory.class) public class MultiTDemoTest extends TestCase { private static Log logger = LogFactory.getLog(MultiTDemoTest.class); diff --git a/source/test-java/org/alfresco/repo/tenant/MultiTNodeServiceInterceptorTest.java b/source/test-java/org/alfresco/repo/tenant/MultiTNodeServiceInterceptorTest.java index 03b91b58da..5bf214d3c1 100644 --- a/source/test-java/org/alfresco/repo/tenant/MultiTNodeServiceInterceptorTest.java +++ b/source/test-java/org/alfresco/repo/tenant/MultiTNodeServiceInterceptorTest.java @@ -22,8 +22,10 @@ import junit.framework.TestCase; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.GUID; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -32,6 +34,7 @@ import org.springframework.context.ApplicationContext; * @since 3.0 * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class MultiTNodeServiceInterceptorTest extends TestCase { public static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/transaction/AlfrescoTransactionSupportTest.java b/source/test-java/org/alfresco/repo/transaction/AlfrescoTransactionSupportTest.java index fe772936e5..90b7b90439 100644 --- a/source/test-java/org/alfresco/repo/transaction/AlfrescoTransactionSupportTest.java +++ b/source/test-java/org/alfresco/repo/transaction/AlfrescoTransactionSupportTest.java @@ -30,7 +30,9 @@ import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -42,6 +44,7 @@ import org.springframework.context.ApplicationContext; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class AlfrescoTransactionSupportTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/transaction/RetryingTransactionHelperTest.java b/source/test-java/org/alfresco/repo/transaction/RetryingTransactionHelperTest.java index f0faa15e10..0ba4f96219 100644 --- a/source/test-java/org/alfresco/repo/transaction/RetryingTransactionHelperTest.java +++ b/source/test-java/org/alfresco/repo/transaction/RetryingTransactionHelperTest.java @@ -48,6 +48,7 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.Pair; import org.apache.commons.lang.mutable.MutableInt; @@ -56,6 +57,7 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.SessionFactory; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.MySQLInnoDBDialect; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import org.springframework.dao.ConcurrencyFailureException; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; @@ -69,6 +71,7 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport; * @author Derek Hulley * @since 2.1 */ +@Category(OwnJVMTestsCategory.class) public class RetryingTransactionHelperTest extends TestCase { private static Log logger = LogFactory.getLog("org.alfresco.repo.transaction.RetryingTransactionHelperTest"); diff --git a/source/test-java/org/alfresco/repo/transaction/TransactionAwareSingletonTest.java b/source/test-java/org/alfresco/repo/transaction/TransactionAwareSingletonTest.java index 02d6bf89c0..843be1065b 100644 --- a/source/test-java/org/alfresco/repo/transaction/TransactionAwareSingletonTest.java +++ b/source/test-java/org/alfresco/repo/transaction/TransactionAwareSingletonTest.java @@ -26,7 +26,9 @@ import junit.framework.TestCase; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -34,6 +36,7 @@ import org.springframework.context.ApplicationContext; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class TransactionAwareSingletonTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/transaction/TransactionServiceImplTest.java b/source/test-java/org/alfresco/repo/transaction/TransactionServiceImplTest.java index cb705985ab..560b45d253 100644 --- a/source/test-java/org/alfresco/repo/transaction/TransactionServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/transaction/TransactionServiceImplTest.java @@ -36,10 +36,12 @@ import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.ReadOnlyServerException; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.PropertyMap; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.PostgreSQLDialect; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.dao.TransientDataAccessResourceException; @@ -51,6 +53,7 @@ import org.springframework.transaction.PlatformTransactionManager; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class TransactionServiceImplTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/usage/RepoUsageComponentTest.java b/source/test-java/org/alfresco/repo/usage/RepoUsageComponentTest.java index 9526073fac..790de46d38 100644 --- a/source/test-java/org/alfresco/repo/usage/RepoUsageComponentTest.java +++ b/source/test-java/org/alfresco/repo/usage/RepoUsageComponentTest.java @@ -31,10 +31,12 @@ import org.alfresco.service.cmr.admin.RepoUsage.LicenseMode; import org.alfresco.service.cmr.admin.RepoUsage.UsageType; import org.alfresco.service.cmr.admin.RepoUsageStatus; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.FixMethodOrder; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; import org.springframework.context.ApplicationContext; @@ -45,6 +47,7 @@ import org.springframework.context.ApplicationContext; * @since 3.5 */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(OwnJVMTestsCategory.class) public class RepoUsageComponentTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/usage/UserUsageTest.java b/source/test-java/org/alfresco/repo/usage/UserUsageTest.java index aa0c610134..945b3dce8c 100644 --- a/source/test-java/org/alfresco/repo/usage/UserUsageTest.java +++ b/source/test-java/org/alfresco/repo/usage/UserUsageTest.java @@ -50,14 +50,17 @@ import org.alfresco.service.cmr.usage.UsageService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** * User Usage unit test */ +@Category(OwnJVMTestsCategory.class) public class UserUsageTest extends TestCase { private static Log logger = LogFactory.getLog(UserUsageTest.class); diff --git a/source/test-java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java b/source/test-java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java index a201242a3e..7fb5b1717c 100644 --- a/source/test-java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java +++ b/source/test-java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java @@ -43,14 +43,17 @@ import org.alfresco.service.cmr.usage.ContentUsageService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** * Test enabling (recalculating) and disabling (clearing) and user usages, and also collapsing user usage deltas. */ +@Category(OwnJVMTestsCategory.class) public class UserUsageTrackingComponentTest extends TestCase { private static ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/version/ContentServiceImplTest.java b/source/test-java/org/alfresco/repo/version/ContentServiceImplTest.java index cc471f2c2b..d72df79cdb 100644 --- a/source/test-java/org/alfresco/repo/version/ContentServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/version/ContentServiceImplTest.java @@ -26,12 +26,15 @@ import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.TransformationOptions; import org.alfresco.service.cmr.version.Version; +import org.alfresco.test_category.OwnJVMTestsCategory; +import org.junit.experimental.categories.Category; /** * Tests for retrieving frozen content from a verioned node * * @author Roy Wetherall */ +@Category(OwnJVMTestsCategory.class) public class ContentServiceImplTest extends BaseVersionStoreTest { /** diff --git a/source/test-java/org/alfresco/repo/version/VersionServiceImplTest.java b/source/test-java/org/alfresco/repo/version/VersionServiceImplTest.java index 266d1deb2d..ce1cfdc2ec 100644 --- a/source/test-java/org/alfresco/repo/version/VersionServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/version/VersionServiceImplTest.java @@ -62,10 +62,12 @@ import org.alfresco.service.cmr.version.VersionType; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.GUID; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -73,6 +75,7 @@ import org.springframework.context.ApplicationContext; * * @author Roy Wetherall, janv */ +@Category(OwnJVMTestsCategory.class) public class VersionServiceImplTest extends BaseVersionStoreTest { private static Log logger = LogFactory.getLog(VersionServiceImplTest.class); diff --git a/source/test-java/org/alfresco/repo/version/VersionableAspectTest.java b/source/test-java/org/alfresco/repo/version/VersionableAspectTest.java index 14d8e6e13c..16f5250178 100644 --- a/source/test-java/org/alfresco/repo/version/VersionableAspectTest.java +++ b/source/test-java/org/alfresco/repo/version/VersionableAspectTest.java @@ -41,12 +41,15 @@ import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.version.VersionType; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** * @author Dmitry Velichkevich */ +@Category(OwnJVMTestsCategory.class) public class VersionableAspectTest extends TestCase { private static final String NAME_AND_EXT_DELIMETER = "."; diff --git a/source/test-java/org/alfresco/util/DynamicallySizedThreadPoolExecutorTest.java b/source/test-java/org/alfresco/util/DynamicallySizedThreadPoolExecutorTest.java index 5a35f3e70e..077e61c3c7 100644 --- a/source/test-java/org/alfresco/util/DynamicallySizedThreadPoolExecutorTest.java +++ b/source/test-java/org/alfresco/util/DynamicallySizedThreadPoolExecutorTest.java @@ -21,8 +21,10 @@ package org.alfresco.util; import java.util.ArrayList; import java.util.concurrent.TimeUnit; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; import junit.framework.TestCase; @@ -31,6 +33,7 @@ import junit.framework.TestCase; * * @author Nick Burch */ +@Category(OwnJVMTestsCategory.class) public class DynamicallySizedThreadPoolExecutorTest extends TestCase { // We need logging, so load that if we don't have the full repo already diff --git a/source/test-java/org/alfresco/util/debug/OutputSpacesStoreSystemTest.java b/source/test-java/org/alfresco/util/debug/OutputSpacesStoreSystemTest.java index 98a50eab5f..e693d2e910 100644 --- a/source/test-java/org/alfresco/util/debug/OutputSpacesStoreSystemTest.java +++ b/source/test-java/org/alfresco/util/debug/OutputSpacesStoreSystemTest.java @@ -20,11 +20,14 @@ package org.alfresco.util.debug; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; +import org.junit.experimental.categories.Category; /** * @author Roy Wetherall */ +@Category(OwnJVMTestsCategory.class) public class OutputSpacesStoreSystemTest extends BaseSpringTest { /** diff --git a/source/test-java/org/alfresco/util/schemacomp/SchemaReferenceFileTest.java b/source/test-java/org/alfresco/util/schemacomp/SchemaReferenceFileTest.java index fd0d11cfc5..00948ddd3e 100644 --- a/source/test-java/org/alfresco/util/schemacomp/SchemaReferenceFileTest.java +++ b/source/test-java/org/alfresco/util/schemacomp/SchemaReferenceFileTest.java @@ -25,10 +25,12 @@ import java.io.ByteArrayOutputStream; import java.io.PrintWriter; import org.alfresco.repo.domain.schema.SchemaBootstrap; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.springframework.context.support.ClassPathXmlApplicationContext; /** @@ -46,6 +48,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; * @see DbToXML * @author Matt Ward */ +@Category(OwnJVMTestsCategory.class) public class SchemaReferenceFileTest { private ClassPathXmlApplicationContext ctx; diff --git a/source/test-java/org/alfresco/util/schemacomp/model/ColumnTest.java b/source/test-java/org/alfresco/util/schemacomp/model/ColumnTest.java index 4b4ea36dc6..94c8ce0718 100644 --- a/source/test-java/org/alfresco/util/schemacomp/model/ColumnTest.java +++ b/source/test-java/org/alfresco/util/schemacomp/model/ColumnTest.java @@ -19,9 +19,12 @@ package org.alfresco.util.schemacomp.model; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.schemacomp.DbProperty; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; + import static org.mockito.Mockito.*; import static org.junit.Assert.*; @@ -29,6 +32,7 @@ import static org.junit.Assert.*; * Tests for the Column class. * @author Matt Ward */ +@Category(OwnJVMTestsCategory.class) public class ColumnTest extends DbObjectTestBase { private Column thisColumn; diff --git a/source/test-java/org/alfresco/util/schemacomp/model/ForeignKeyTest.java b/source/test-java/org/alfresco/util/schemacomp/model/ForeignKeyTest.java index 8530fc3205..855de5947a 100644 --- a/source/test-java/org/alfresco/util/schemacomp/model/ForeignKeyTest.java +++ b/source/test-java/org/alfresco/util/schemacomp/model/ForeignKeyTest.java @@ -22,15 +22,18 @@ package org.alfresco.util.schemacomp.model; import static org.junit.Assert.*; import static org.mockito.Mockito.verify; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.schemacomp.DbProperty; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Tests for the ForeignKey class. * * @author Matt Ward */ +@Category(OwnJVMTestsCategory.class) public class ForeignKeyTest extends DbObjectTestBase { private ForeignKey thisFK, thatFK; diff --git a/source/test-java/org/alfresco/util/schemacomp/model/IndexTest.java b/source/test-java/org/alfresco/util/schemacomp/model/IndexTest.java index de3e81988b..f76d6998a8 100644 --- a/source/test-java/org/alfresco/util/schemacomp/model/IndexTest.java +++ b/source/test-java/org/alfresco/util/schemacomp/model/IndexTest.java @@ -24,15 +24,18 @@ import static org.mockito.Mockito.verify; import java.util.Arrays; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.schemacomp.DbProperty; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Tests for the Index class. * @author Matt Ward */ +@Category(OwnJVMTestsCategory.class) public class IndexTest extends DbObjectTestBase { private Table thisTable; diff --git a/source/test-java/org/alfresco/util/schemacomp/model/PrimaryKeyTest.java b/source/test-java/org/alfresco/util/schemacomp/model/PrimaryKeyTest.java index d6fb731176..2d0d6ae78c 100644 --- a/source/test-java/org/alfresco/util/schemacomp/model/PrimaryKeyTest.java +++ b/source/test-java/org/alfresco/util/schemacomp/model/PrimaryKeyTest.java @@ -25,9 +25,11 @@ import static org.mockito.Mockito.verify; import java.util.Arrays; import java.util.List; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.schemacomp.DbProperty; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; /** @@ -35,6 +37,7 @@ import org.junit.Test; * * @author Matt Ward */ +@Category(OwnJVMTestsCategory.class) public class PrimaryKeyTest extends DbObjectTestBase { private PrimaryKey thisPK; diff --git a/source/test-java/org/alfresco/util/schemacomp/model/SchemaTest.java b/source/test-java/org/alfresco/util/schemacomp/model/SchemaTest.java index 435fbc2232..003ae07b2d 100644 --- a/source/test-java/org/alfresco/util/schemacomp/model/SchemaTest.java +++ b/source/test-java/org/alfresco/util/schemacomp/model/SchemaTest.java @@ -21,9 +21,11 @@ package org.alfresco.util.schemacomp.model; import static org.junit.Assert.*; import static org.mockito.Mockito.verify; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.schemacomp.DbProperty; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; @@ -34,6 +36,7 @@ import org.mockito.runners.MockitoJUnitRunner; * @author Matt Ward */ @RunWith(MockitoJUnitRunner.class) +@Category(OwnJVMTestsCategory.class) public class SchemaTest extends DbObjectTestBase { private Schema left; diff --git a/source/test-java/org/alfresco/util/schemacomp/model/SequenceTest.java b/source/test-java/org/alfresco/util/schemacomp/model/SequenceTest.java index 84834a8e89..1ce5f70710 100644 --- a/source/test-java/org/alfresco/util/schemacomp/model/SequenceTest.java +++ b/source/test-java/org/alfresco/util/schemacomp/model/SequenceTest.java @@ -20,13 +20,16 @@ package org.alfresco.util.schemacomp.model; import static org.mockito.Mockito.verify; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Tests for the Sequence class. * @author Matt Ward */ +@Category(OwnJVMTestsCategory.class) public class SequenceTest extends DbObjectTestBase { private Sequence thisSequence; diff --git a/source/test-java/org/alfresco/util/schemacomp/model/TableTest.java b/source/test-java/org/alfresco/util/schemacomp/model/TableTest.java index dafddede8b..63db1b94b7 100644 --- a/source/test-java/org/alfresco/util/schemacomp/model/TableTest.java +++ b/source/test-java/org/alfresco/util/schemacomp/model/TableTest.java @@ -24,8 +24,10 @@ import static org.mockito.Mockito.verify; import java.util.ArrayList; import java.util.List; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; @@ -37,6 +39,7 @@ import org.mockito.runners.MockitoJUnitRunner; * @author Matt Ward */ @RunWith(MockitoJUnitRunner.class) +@Category(OwnJVMTestsCategory.class) public class TableTest extends DbObjectTestBase { private Table table; diff --git a/source/test-java/org/alfresco/util/test/junitrules/TemporaryNodesTest.java b/source/test-java/org/alfresco/util/test/junitrules/TemporaryNodesTest.java index 2b3fa0760a..ed8b4d0889 100644 --- a/source/test-java/org/alfresco/util/test/junitrules/TemporaryNodesTest.java +++ b/source/test-java/org/alfresco/util/test/junitrules/TemporaryNodesTest.java @@ -47,11 +47,13 @@ import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.service.cmr.version.Version; import org.alfresco.service.cmr.version.VersionService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.RuleChain; /** @@ -60,6 +62,7 @@ import org.junit.rules.RuleChain; * @author Neil Mc Erlean * @since 4.1 */ +@Category(OwnJVMTestsCategory.class) public class TemporaryNodesTest { // Rule to initialise the default Alfresco spring configuration