diff --git a/source/test-java/org/alfresco/cmis/acl/CMISAccessControlServiceTest.java b/source/test-java/org/alfresco/cmis/acl/CMISAccessControlServiceTest.java index aa592bb367..f893a397a9 100644 --- a/source/test-java/org/alfresco/cmis/acl/CMISAccessControlServiceTest.java +++ b/source/test-java/org/alfresco/cmis/acl/CMISAccessControlServiceTest.java @@ -43,10 +43,13 @@ import org.alfresco.service.cmr.security.AccessPermission; 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.junit.experimental.categories.Category; /** * @author andyh */ +@Category(OwnJVMTestsCategory.class) public class CMISAccessControlServiceTest extends BaseCMISTest { private NodeRef parent; diff --git a/source/test-java/org/alfresco/cmis/dictionary/CMISDictionaryTest.java b/source/test-java/org/alfresco/cmis/dictionary/CMISDictionaryTest.java index 45c1c2c38d..8a160c973c 100644 --- a/source/test-java/org/alfresco/cmis/dictionary/CMISDictionaryTest.java +++ b/source/test-java/org/alfresco/cmis/dictionary/CMISDictionaryTest.java @@ -21,7 +21,10 @@ package org.alfresco.cmis.dictionary; import org.alfresco.cmis.CMISPropertyDefinition; import org.alfresco.cmis.CMISTypeDefinition; import org.alfresco.cmis.mapping.BaseCMISTest; +import org.alfresco.test_category.OwnJVMTestsCategory; +import org.junit.experimental.categories.Category; +@Category(OwnJVMTestsCategory.class) public class CMISDictionaryTest extends BaseCMISTest { public void testAllTypes() diff --git a/source/test-java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java b/source/test-java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java index 1e4854cab0..fdafd8cc15 100644 --- a/source/test-java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java +++ b/source/test-java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java @@ -44,9 +44,12 @@ import org.alfresco.service.cmr.rule.Rule; import org.alfresco.service.cmr.rule.RuleType; import org.alfresco.service.cmr.version.Version; import org.alfresco.service.cmr.version.VersionType; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl; +import org.junit.experimental.categories.Category; import org.springframework.extensions.webscripts.GUID; +@Category(OwnJVMTestsCategory.class) public class CMISPropertyServiceTest extends BaseCMISTest { public void testBasicFolder() throws Exception diff --git a/source/test-java/org/alfresco/cmis/renditions/CMISRenditionServiceTest.java b/source/test-java/org/alfresco/cmis/renditions/CMISRenditionServiceTest.java index 7ca0bc9d5a..380e629d8c 100644 --- a/source/test-java/org/alfresco/cmis/renditions/CMISRenditionServiceTest.java +++ b/source/test-java/org/alfresco/cmis/renditions/CMISRenditionServiceTest.java @@ -47,10 +47,13 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.TransformationOptions; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; +import org.junit.experimental.categories.Category; /** * @author Stas Sokolovsky */ +@Category(OwnJVMTestsCategory.class) public class CMISRenditionServiceTest extends BaseCMISTest { private static final String[] THUMBNAIL_NAMES = new String[] { "doclib", "webpreview", "imgpreview" }; diff --git a/source/test-java/org/alfresco/cmis/search/QueryTest.java b/source/test-java/org/alfresco/cmis/search/QueryTest.java index d525c17a8a..2405546810 100644 --- a/source/test-java/org/alfresco/cmis/search/QueryTest.java +++ b/source/test-java/org/alfresco/cmis/search/QueryTest.java @@ -89,6 +89,7 @@ import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.Duration; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.CachingDateFormat; import org.alfresco.util.ISO9075; import org.antlr.runtime.ANTLRStringStream; @@ -97,11 +98,13 @@ import org.antlr.runtime.CommonTokenStream; import org.antlr.runtime.RecognitionException; import org.antlr.runtime.tree.CommonTree; import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException; +import org.junit.experimental.categories.Category; import org.springframework.extensions.surf.util.I18NUtil; /** * @author andyh */ +@Category(OwnJVMTestsCategory.class) public class QueryTest extends BaseCMISTest { private static final String TEST_NAMESPACE = "http://www.alfresco.org/test/cmis-query-test"; diff --git a/source/test-java/org/alfresco/email/server/EmailServiceImplTest.java b/source/test-java/org/alfresco/email/server/EmailServiceImplTest.java index ad504b33c4..e3343f4b0f 100644 --- a/source/test-java/org/alfresco/email/server/EmailServiceImplTest.java +++ b/source/test-java/org/alfresco/email/server/EmailServiceImplTest.java @@ -54,10 +54,12 @@ import org.alfresco.service.cmr.security.PersonService; 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.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import com.sun.mail.smtp.SMTPMessage; @@ -67,6 +69,7 @@ import com.sun.mail.smtp.SMTPMessage; * @author mrogers * */ +@Category(OwnJVMTestsCategory.class) public class EmailServiceImplTest extends TestCase { /** diff --git a/source/test-java/org/alfresco/filesys/FTPServerTest.java b/source/test-java/org/alfresco/filesys/FTPServerTest.java index c0595f0077..c62998e704 100644 --- a/source/test-java/org/alfresco/filesys/FTPServerTest.java +++ b/source/test-java/org/alfresco/filesys/FTPServerTest.java @@ -44,6 +44,7 @@ import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PersonService; 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; @@ -52,6 +53,7 @@ import org.apache.commons.net.PrintCommandListener; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPFile; import org.apache.commons.net.ftp.FTPReply; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; @@ -61,6 +63,7 @@ import org.springframework.context.ApplicationContext; * Uses the commons-net ftp client library to connect to the * Alfresco FTP server. */ +@Category(OwnJVMTestsCategory.class) public class FTPServerTest extends TestCase { diff --git a/source/test-java/org/alfresco/filesys/repo/ContentDiskDriverTest.java b/source/test-java/org/alfresco/filesys/repo/ContentDiskDriverTest.java index 0dc45df705..e137db4378 100644 --- a/source/test-java/org/alfresco/filesys/repo/ContentDiskDriverTest.java +++ b/source/test-java/org/alfresco/filesys/repo/ContentDiskDriverTest.java @@ -91,16 +91,19 @@ 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.alfresco.util.Pair; 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.core.io.ClassPathResource; /** * Unit tests for Alfresco Repository ContentDiskDriver */ +@Category(OwnJVMTestsCategory.class) public class ContentDiskDriverTest extends TestCase { private static final String TEST_PROTOTYPE_NAME = "test"; diff --git a/source/test-java/org/alfresco/opencmis/OpenCmisLocalTest.java b/source/test-java/org/alfresco/opencmis/OpenCmisLocalTest.java index 1e78e55390..c16f109892 100644 --- a/source/test-java/org/alfresco/opencmis/OpenCmisLocalTest.java +++ b/source/test-java/org/alfresco/opencmis/OpenCmisLocalTest.java @@ -34,6 +34,7 @@ import org.alfresco.repo.content.MimetypeMap; 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.ApplicationContextHelper; import org.alfresco.util.GUID; import org.alfresco.util.TempFileProvider; @@ -57,6 +58,7 @@ import org.apache.chemistry.opencmis.commons.server.CallContext; import org.apache.chemistry.opencmis.commons.server.CmisService; import org.apache.chemistry.opencmis.server.shared.ThresholdOutputStream; import org.apache.chemistry.opencmis.server.shared.ThresholdOutputStreamFactory; +import org.junit.experimental.categories.Category; import org.springframework.aop.framework.ProxyFactory; import org.springframework.context.ApplicationContext; @@ -67,6 +69,7 @@ import org.springframework.context.ApplicationContext; * @author Derek Hulley * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class OpenCmisLocalTest extends TestCase { public static final String[] CONFIG_LOCATIONS = new String[] { "classpath:alfresco/application-context.xml", diff --git a/source/test-java/org/alfresco/repo/action/executer/ContentMetadataExtracterTagMappingTest.java b/source/test-java/org/alfresco/repo/action/executer/ContentMetadataExtracterTagMappingTest.java index 4d142fd9a4..f3bf393fcb 100644 --- a/source/test-java/org/alfresco/repo/action/executer/ContentMetadataExtracterTagMappingTest.java +++ b/source/test-java/org/alfresco/repo/action/executer/ContentMetadataExtracterTagMappingTest.java @@ -60,11 +60,13 @@ import org.alfresco.service.cmr.tagging.TaggingService; 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.GUID; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.Parser; import org.apache.tika.parser.jpeg.JpegParser; +import org.junit.experimental.categories.Category; import org.springframework.context.ConfigurableApplicationContext; import com.google.common.collect.Sets; @@ -78,6 +80,7 @@ import com.google.common.collect.Sets; * @author Nick Burch * @author Ray Gauss II */ +@Category(OwnJVMTestsCategory.class) public class ContentMetadataExtracterTagMappingTest extends TestCase { private static ConfigurableApplicationContext ctx = diff --git a/source/test-java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java b/source/test-java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java index 659eeee77c..5349114ab8 100644 --- a/source/test-java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java +++ b/source/test-java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java @@ -39,8 +39,10 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; import org.alfresco.util.GUID; +import org.junit.experimental.categories.Category; /** * Test of the ActionExecuter for extracting metadata. Note: This test makes @@ -48,6 +50,7 @@ import org.alfresco.util.GUID; * * @author Jesper Steen Møller */ +@Category(OwnJVMTestsCategory.class) public class ContentMetadataExtracterTest extends BaseSpringTest { protected static final String QUICK_TITLE = "The quick brown fox jumps over the lazy dog"; diff --git a/source/test-java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuterTest.java b/source/test-java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuterTest.java index 5c92682f95..e0a36d7d58 100644 --- a/source/test-java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuterTest.java +++ b/source/test-java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuterTest.java @@ -40,14 +40,17 @@ import org.alfresco.service.cmr.rule.RuleType; import org.alfresco.service.cmr.version.Version; import org.alfresco.service.cmr.version.VersionType; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; import org.alfresco.util.GUID; +import org.junit.experimental.categories.Category; /** * Execute all rules action execution test * * @author Roy Wetherall */ +@Category(OwnJVMTestsCategory.class) public class ExecuteAllRulesActionExecuterTest extends BaseSpringTest { /** The node service */ diff --git a/source/test-java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java b/source/test-java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java index 0599c32405..5cc228e613 100644 --- a/source/test-java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java +++ b/source/test-java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java @@ -31,7 +31,9 @@ import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.TemplateException; 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.extensions.surf.util.ISO8601DateFormat; @@ -40,6 +42,7 @@ import org.springframework.extensions.surf.util.ISO8601DateFormat; * * @author Andy Hind */ +@Category(OwnJVMTestsCategory.class) public class FreeMarkerModelLuceneFunctionTest extends TestCase { //private static SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.sssZ"); diff --git a/source/test-java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceTest.java b/source/test-java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceTest.java index 1b19b9ecc4..5f899e4ca5 100644 --- a/source/test-java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceTest.java +++ b/source/test-java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceTest.java @@ -41,8 +41,10 @@ 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.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.quartz.DateIntervalTrigger; import org.quartz.Job; import org.quartz.JobDetail; @@ -60,6 +62,7 @@ import org.springframework.context.ConfigurableApplicationContext; /** * Unit tests for the {@link ScheduledPersistedActionService} */ +@Category(OwnJVMTestsCategory.class) public class ScheduledPersistedActionServiceTest extends TestCase { private static ConfigurableApplicationContext ctx = diff --git a/source/test-java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java b/source/test-java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java index 54f0e20f52..dbc651b2d6 100644 --- a/source/test-java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java @@ -49,9 +49,11 @@ 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.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -59,6 +61,7 @@ import org.springframework.context.ApplicationContext; * * @author janv */ +@Category(OwnJVMTestsCategory.class) public class RepoAdminServiceImplTest extends TestCase { private static Log logger = LogFactory.getLog(RepoAdminServiceImplTest.class); diff --git a/source/test-java/org/alfresco/repo/admin/patch/PatchTest.java b/source/test-java/org/alfresco/repo/admin/patch/PatchTest.java index 5803a3b688..6845bb813b 100644 --- a/source/test-java/org/alfresco/repo/admin/patch/PatchTest.java +++ b/source/test-java/org/alfresco/repo/admin/patch/PatchTest.java @@ -31,7 +31,9 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespaceService; 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; /** @@ -41,6 +43,7 @@ import org.springframework.context.ApplicationContext; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class PatchTest extends TestCase { private static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/admin/registry/RegistryServiceImplTest.java b/source/test-java/org/alfresco/repo/admin/registry/RegistryServiceImplTest.java index 491e570be6..8c552fc855 100644 --- a/source/test-java/org/alfresco/repo/admin/registry/RegistryServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/admin/registry/RegistryServiceImplTest.java @@ -23,7 +23,9 @@ import java.util.Collection; import junit.framework.TestCase; import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -31,6 +33,7 @@ import org.springframework.context.ApplicationContext; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class RegistryServiceImplTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/content/MimetypeMapContentTest.java b/source/test-java/org/alfresco/repo/content/MimetypeMapContentTest.java index 664da75b6f..1589e7e988 100644 --- a/source/test-java/org/alfresco/repo/content/MimetypeMapContentTest.java +++ b/source/test-java/org/alfresco/repo/content/MimetypeMapContentTest.java @@ -28,8 +28,10 @@ import junit.framework.TestCase; import org.alfresco.repo.content.filestore.FileContentReader; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.MimetypeService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.DataModelTestApplicationContextHelper; import org.apache.poi.util.IOUtils; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -38,6 +40,7 @@ import org.springframework.context.ApplicationContext; * @see org.alfresco.repo.content.MimetypeMap * @see org.alfresco.repo.content.MimetypeMapTest */ +@Category(OwnJVMTestsCategory.class) public class MimetypeMapContentTest extends TestCase { private static ApplicationContext ctx = DataModelTestApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/content/RoutingContentServiceTest.java b/source/test-java/org/alfresco/repo/content/RoutingContentServiceTest.java index d098151057..b9195888b9 100644 --- a/source/test-java/org/alfresco/repo/content/RoutingContentServiceTest.java +++ b/source/test-java/org/alfresco/repo/content/RoutingContentServiceTest.java @@ -51,10 +51,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.GUID; import org.alfresco.util.PropertyMap; import org.alfresco.util.TempFileProvider; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -62,6 +64,7 @@ import org.springframework.context.ApplicationContext; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class RoutingContentServiceTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/content/RoutingContentStoreTest.java b/source/test-java/org/alfresco/repo/content/RoutingContentStoreTest.java index 816141d2af..ab485916bd 100644 --- a/source/test-java/org/alfresco/repo/content/RoutingContentStoreTest.java +++ b/source/test-java/org/alfresco/repo/content/RoutingContentStoreTest.java @@ -30,8 +30,10 @@ import org.alfresco.repo.content.filestore.FileContentStore; import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentWriter; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.Pair; import org.alfresco.util.TempFileProvider; +import org.junit.experimental.categories.Category; /** * Ensures that the routing of URLs based on context is working. A combination @@ -43,6 +45,7 @@ import org.alfresco.util.TempFileProvider; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class RoutingContentStoreTest extends AbstractWritableContentStoreTest { private ContentStore storeA; diff --git a/source/test-java/org/alfresco/repo/content/cleanup/ContentStoreCleanerTest.java b/source/test-java/org/alfresco/repo/content/cleanup/ContentStoreCleanerTest.java index ca12897e32..8e999b9b5d 100644 --- a/source/test-java/org/alfresco/repo/content/cleanup/ContentStoreCleanerTest.java +++ b/source/test-java/org/alfresco/repo/content/cleanup/ContentStoreCleanerTest.java @@ -50,8 +50,10 @@ 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.alfresco.util.GUID; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -59,6 +61,7 @@ import org.springframework.context.ApplicationContext; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class ContentStoreCleanerTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/content/filestore/FileContentStoreTest.java b/source/test-java/org/alfresco/repo/content/filestore/FileContentStoreTest.java index f47d9db38c..76b9abaab5 100644 --- a/source/test-java/org/alfresco/repo/content/filestore/FileContentStoreTest.java +++ b/source/test-java/org/alfresco/repo/content/filestore/FileContentStoreTest.java @@ -29,7 +29,9 @@ import org.alfresco.repo.content.ContentLimitProvider.SimpleFixedLimitProvider; import org.alfresco.repo.content.ContentLimitViolationException; import org.alfresco.repo.content.ContentStore; import org.alfresco.service.cmr.repository.ContentWriter; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.TempFileProvider; +import org.junit.experimental.categories.Category; /** * Tests read and write functionality for the store. @@ -38,6 +40,7 @@ import org.alfresco.util.TempFileProvider; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class FileContentStoreTest extends AbstractWritableContentStoreTest { private FileContentStore store; diff --git a/source/test-java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java b/source/test-java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java index 8bd1299021..467e783beb 100644 --- a/source/test-java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java +++ b/source/test-java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java @@ -22,7 +22,9 @@ import java.io.File; import org.alfresco.repo.content.AbstractWritableContentStoreTest; import org.alfresco.repo.content.ContentStore; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.TempFileProvider; +import org.junit.experimental.categories.Category; /** * Tests the file-based store when random access is not allowed, i.e. has to be spoofed. @@ -32,6 +34,7 @@ import org.alfresco.util.TempFileProvider; * @since 2.1 * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class NoRandomAccessFileContentStoreTest extends AbstractWritableContentStoreTest { private FileContentStore store; diff --git a/source/test-java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java b/source/test-java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java index 3fb41c95fd..421ee05498 100644 --- a/source/test-java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java +++ b/source/test-java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java @@ -23,7 +23,9 @@ import java.io.File; import org.alfresco.repo.content.AbstractReadOnlyContentStoreTest; import org.alfresco.repo.content.AbstractWritableContentStoreTest; import org.alfresco.repo.content.ContentStore; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.TempFileProvider; +import org.junit.experimental.categories.Category; /** * Tests the file-based store when in read-only mode. @@ -33,6 +35,7 @@ import org.alfresco.util.TempFileProvider; * @since 2.1 * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class ReadOnlyFileContentStoreTest extends AbstractReadOnlyContentStoreTest { private FileContentStore store; diff --git a/source/test-java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java b/source/test-java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java index 05fef49628..6139578135 100644 --- a/source/test-java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java +++ b/source/test-java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java @@ -35,8 +35,10 @@ import org.alfresco.repo.content.filestore.FileContentStore; import org.alfresco.service.cmr.repository.ContentIOException; 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.experimental.categories.Category; /** * Tests read and write functionality for the replicating store. @@ -48,6 +50,7 @@ import org.alfresco.util.TempFileProvider; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class ReplicatingContentStoreTest extends AbstractWritableContentStoreTest { private static final String SOME_CONTENT = "The No. 1 Ladies' Detective Agency"; diff --git a/source/test-java/org/alfresco/repo/copy/CopyServiceImplTest.java b/source/test-java/org/alfresco/repo/copy/CopyServiceImplTest.java index 7b082f9c8f..daa573f523 100644 --- a/source/test-java/org/alfresco/repo/copy/CopyServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/copy/CopyServiceImplTest.java @@ -80,9 +80,11 @@ 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.Pair; import org.alfresco.util.PropertyMap; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import org.springframework.extensions.surf.util.I18NUtil; @@ -92,6 +94,7 @@ import org.springframework.extensions.surf.util.I18NUtil; * @author Roy Wetherall * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class CopyServiceImplTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/descriptor/DescriptorServiceTest.java b/source/test-java/org/alfresco/repo/descriptor/DescriptorServiceTest.java index e08ebcb6a6..75f10a3bc4 100644 --- a/source/test-java/org/alfresco/repo/descriptor/DescriptorServiceTest.java +++ b/source/test-java/org/alfresco/repo/descriptor/DescriptorServiceTest.java @@ -27,8 +27,11 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.descriptor.Descriptor; import org.alfresco.service.descriptor.DescriptorService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; +import org.junit.experimental.categories.Category; +@Category(OwnJVMTestsCategory.class) public class DescriptorServiceTest extends BaseSpringTest { private NodeService nodeService; diff --git a/source/test-java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java b/source/test-java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java index 005650f16b..e7211e1697 100644 --- a/source/test-java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java +++ b/source/test-java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java @@ -38,14 +38,17 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseAlfrescoSpringTest; import org.alfresco.util.PropertyMap; +import org.junit.experimental.categories.Category; /** * Dictionary model type unit test * * @author Roy Wetherall, janv */ +@Category(OwnJVMTestsCategory.class) public class DictionaryModelTypeTest extends BaseAlfrescoSpringTest { /** QNames of the test models */ diff --git a/source/test-java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java b/source/test-java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java index 353866bd30..bbb088e12e 100644 --- a/source/test-java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java +++ b/source/test-java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java @@ -34,8 +34,11 @@ import org.alfresco.service.cmr.repository.NodeRef; 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.BaseAlfrescoSpringTest; +import org.junit.experimental.categories.Category; +@Category(OwnJVMTestsCategory.class) public class DictionaryRepositoryBootstrapTest extends BaseAlfrescoSpringTest { public static final String TEMPLATE_MODEL_XML = diff --git a/source/test-java/org/alfresco/repo/dictionary/types/period/PeriodTest.java b/source/test-java/org/alfresco/repo/dictionary/types/period/PeriodTest.java index 8f190a16c8..e871eafa21 100644 --- a/source/test-java/org/alfresco/repo/dictionary/types/period/PeriodTest.java +++ b/source/test-java/org/alfresco/repo/dictionary/types/period/PeriodTest.java @@ -28,9 +28,11 @@ import junit.framework.TestCase; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.Period; import org.alfresco.service.cmr.repository.PeriodProvider; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.CachingDateFormat; import org.junit.FixMethodOrder; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; /** @@ -39,6 +41,7 @@ import org.junit.runners.MethodSorters; * @author andyh */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(OwnJVMTestsCategory.class) public class PeriodTest extends TestCase { diff --git a/source/test-java/org/alfresco/repo/domain/PropertyValueTest.java b/source/test-java/org/alfresco/repo/domain/PropertyValueTest.java index 0965556839..483a157783 100644 --- a/source/test-java/org/alfresco/repo/domain/PropertyValueTest.java +++ b/source/test-java/org/alfresco/repo/domain/PropertyValueTest.java @@ -27,7 +27,9 @@ import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.MLText; 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; /** @@ -35,6 +37,7 @@ import org.springframework.context.ApplicationContext; * * @author Derek Hulley */ +@Category(OwnJVMTestsCategory.class) public class PropertyValueTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/domain/encoding/EncodingDAOTest.java b/source/test-java/org/alfresco/repo/domain/encoding/EncodingDAOTest.java index 0900bdb130..1bb1eda77b 100644 --- a/source/test-java/org/alfresco/repo/domain/encoding/EncodingDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/encoding/EncodingDAOTest.java @@ -24,9 +24,11 @@ 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.alfresco.util.GUID; import org.alfresco.util.Pair; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -35,6 +37,7 @@ import org.springframework.context.ApplicationContext; * @author Derek Hulley * @since 3.2 */ +@Category(OwnJVMTestsCategory.class) public class EncodingDAOTest extends TestCase { private ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/domain/locale/LocaleDAOTest.java b/source/test-java/org/alfresco/repo/domain/locale/LocaleDAOTest.java index d56b6a7574..074f96b05f 100644 --- a/source/test-java/org/alfresco/repo/domain/locale/LocaleDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/locale/LocaleDAOTest.java @@ -31,11 +31,13 @@ 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.alfresco.util.GUID; import org.alfresco.util.Pair; 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.extensions.surf.util.I18NUtil; @@ -45,6 +47,7 @@ import org.springframework.extensions.surf.util.I18NUtil; * @author Derek Hulley, janv * @since 2.2.1, 3.3 */ +@Category(OwnJVMTestsCategory.class) public class LocaleDAOTest extends TestCase { private static Log logger = LogFactory.getLog(LocaleDAOTest.class); diff --git a/source/test-java/org/alfresco/repo/domain/locks/LockDAOTest.java b/source/test-java/org/alfresco/repo/domain/locks/LockDAOTest.java index d4cab9e4f0..130ad32a41 100644 --- a/source/test-java/org/alfresco/repo/domain/locks/LockDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/locks/LockDAOTest.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 Derek Hulley * @since 3.2 */ +@Category(OwnJVMTestsCategory.class) public class LockDAOTest extends TestCase { public static final String NAMESPACE = "http://www.alfresco.org/test/LockDAOTest"; diff --git a/source/test-java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java b/source/test-java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java index 7b936a8aaa..0888224a76 100644 --- a/source/test-java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java @@ -24,9 +24,11 @@ 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.alfresco.util.GUID; import org.alfresco.util.Pair; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -35,6 +37,7 @@ import org.springframework.context.ApplicationContext; * @author Derek Hulley * @since 3.2 */ +@Category(OwnJVMTestsCategory.class) public class MimetypeDAOTest extends TestCase { private ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/domain/node/NodeDAOTest.java b/source/test-java/org/alfresco/repo/domain/node/NodeDAOTest.java index 478af8f55e..46bcacc1ae 100644 --- a/source/test-java/org/alfresco/repo/domain/node/NodeDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/node/NodeDAOTest.java @@ -31,8 +31,10 @@ import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.NodeRef; 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.Pair; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -43,6 +45,7 @@ import org.springframework.context.ApplicationContext; * @author Derek Hulley * @since 3.4 */ +@Category(OwnJVMTestsCategory.class) public class NodeDAOTest extends TestCase { private ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java b/source/test-java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java index 33ea3473bb..8389d316a7 100644 --- a/source/test-java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java @@ -38,9 +38,11 @@ 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.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.ISO8601DateFormat; @@ -50,6 +52,7 @@ import org.springframework.extensions.surf.util.ISO8601DateFormat; * @author Derek Hulley * @since 3.2 */ +@Category(OwnJVMTestsCategory.class) public class PropertyValueDAOTest extends TestCase { private ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/domain/qname/QNameDAOTest.java b/source/test-java/org/alfresco/repo/domain/qname/QNameDAOTest.java index 46eadb146c..135442a817 100644 --- a/source/test-java/org/alfresco/repo/domain/qname/QNameDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/qname/QNameDAOTest.java @@ -25,9 +25,11 @@ 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.alfresco.util.GUID; import org.alfresco.util.Pair; +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 QNameDAOTest extends TestCase { private ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/domain/solr/SOLRDAOTest.java b/source/test-java/org/alfresco/repo/domain/solr/SOLRDAOTest.java index d126a2a89e..bfe6bf2b0e 100644 --- a/source/test-java/org/alfresco/repo/domain/solr/SOLRDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/solr/SOLRDAOTest.java @@ -34,7 +34,9 @@ import org.alfresco.repo.solr.AclChangeSet; import org.alfresco.repo.solr.NodeParameters; import org.alfresco.repo.solr.Transaction; import org.alfresco.service.cmr.repository.StoreRef; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ConfigurableApplicationContext; /** @@ -42,6 +44,7 @@ import org.springframework.context.ConfigurableApplicationContext; * * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class SOLRDAOTest extends TestCase { private ConfigurableApplicationContext ctx = (ConfigurableApplicationContext) ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/domain/subscriptions/SubscriptionDAOTest.java b/source/test-java/org/alfresco/repo/domain/subscriptions/SubscriptionDAOTest.java index 9795007dce..cc2305b898 100644 --- a/source/test-java/org/alfresco/repo/domain/subscriptions/SubscriptionDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/subscriptions/SubscriptionDAOTest.java @@ -32,9 +32,12 @@ import org.alfresco.service.cmr.subscriptions.PagingFollowingResults; import org.alfresco.service.cmr.subscriptions.PagingSubscriptionResults; import org.alfresco.service.cmr.subscriptions.SubscriptionItemTypeEnum; 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 SubscriptionDAOTest extends TestCase { private ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/domain/tenant/TenantAdminDAOTest.java b/source/test-java/org/alfresco/repo/domain/tenant/TenantAdminDAOTest.java index 04b88ff32b..146a2950e3 100644 --- a/source/test-java/org/alfresco/repo/domain/tenant/TenantAdminDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/tenant/TenantAdminDAOTest.java @@ -26,7 +26,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; /** @@ -35,6 +37,7 @@ import org.springframework.context.ApplicationContext; * @author janv * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class TenantAdminDAOTest extends TestCase { private ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/domain/usage/UsageDAOTest.java b/source/test-java/org/alfresco/repo/domain/usage/UsageDAOTest.java index 9609878269..427cfcbd44 100644 --- a/source/test-java/org/alfresco/repo/domain/usage/UsageDAOTest.java +++ b/source/test-java/org/alfresco/repo/domain/usage/UsageDAOTest.java @@ -30,7 +30,9 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti import org.alfresco.service.cmr.repository.NodeRef; 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.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import org.springframework.extensions.surf.util.I18NUtil; @@ -40,6 +42,7 @@ import org.springframework.extensions.surf.util.I18NUtil; * @author janv * @since 3.4 */ +@Category(OwnJVMTestsCategory.class) public class UsageDAOTest extends TestCase { private ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/forms/FormServiceImplTest.java b/source/test-java/org/alfresco/repo/forms/FormServiceImplTest.java index c8d26c1673..af7147d970 100644 --- a/source/test-java/org/alfresco/repo/forms/FormServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/forms/FormServiceImplTest.java @@ -61,8 +61,10 @@ import org.alfresco.service.cmr.workflow.WorkflowTaskState; import org.alfresco.service.namespace.NamespaceException; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseAlfrescoSpringTest; import org.alfresco.util.GUID; +import org.junit.experimental.categories.Category; import org.springframework.util.StringUtils; /** @@ -71,6 +73,7 @@ import org.springframework.util.StringUtils; * @author Gavin Cornwell * @author Nick Smith */ +@Category(OwnJVMTestsCategory.class) public class FormServiceImplTest extends BaseAlfrescoSpringTest { private FormService formService; diff --git a/source/test-java/org/alfresco/repo/i18n/MessageServiceImplTest.java b/source/test-java/org/alfresco/repo/i18n/MessageServiceImplTest.java index bec994c56b..c04f34f5be 100644 --- a/source/test-java/org/alfresco/repo/i18n/MessageServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/i18n/MessageServiceImplTest.java @@ -48,8 +48,10 @@ 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.junit.FixMethodOrder; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; import org.springframework.context.ApplicationContext; import org.springframework.core.io.Resource; @@ -60,6 +62,7 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver; * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(OwnJVMTestsCategory.class) public class MessageServiceImplTest extends TestCase implements MessageDeployer { private static ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/imap/ImapMessageTest.java b/source/test-java/org/alfresco/repo/imap/ImapMessageTest.java index 207eaf54e0..47877e0a75 100644 --- a/source/test-java/org/alfresco/repo/imap/ImapMessageTest.java +++ b/source/test-java/org/alfresco/repo/imap/ImapMessageTest.java @@ -68,12 +68,14 @@ import org.alfresco.service.cmr.view.Location; 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.GUID; import org.alfresco.util.PropertyMap; import org.alfresco.util.config.RepositoryFolderConfigBean; 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.core.io.ClassPathResource; import org.springframework.mail.javamail.MimeMessageHelper; @@ -89,6 +91,7 @@ import com.sun.mail.imap.protocol.RFC822DATA; import com.sun.mail.imap.protocol.UID; import com.sun.mail.util.ASCIIUtility; +@Category(OwnJVMTestsCategory.class) public class ImapMessageTest extends TestCase { private static Log logger = LogFactory.getLog(ImapMessageTest.class); diff --git a/source/test-java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java b/source/test-java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java index cc416f472f..ed57f46d82 100644 --- a/source/test-java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java +++ b/source/test-java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java @@ -21,8 +21,10 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.namespace.NamespaceService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.config.RepositoryFolderConfigBean; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import com.icegreen.greenmail.store.SimpleStoredMessage; @@ -33,6 +35,7 @@ import com.icegreen.greenmail.store.SimpleStoredMessage; * * @author ArsenyKo */ +@Category(OwnJVMTestsCategory.class) public class ImapServiceImplCacheTest extends TestCase { private static final String USER_NAME = "admin"; diff --git a/source/test-java/org/alfresco/repo/imap/ImapServiceImplTest.java b/source/test-java/org/alfresco/repo/imap/ImapServiceImplTest.java index fe60273f1a..c1aa4b0402 100644 --- a/source/test-java/org/alfresco/repo/imap/ImapServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/imap/ImapServiceImplTest.java @@ -67,15 +67,18 @@ import org.alfresco.service.cmr.view.Location; 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.alfresco.util.config.RepositoryFolderConfigBean; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import org.springframework.core.io.ClassPathResource; /** * Unit test for ImapServiceImpl */ +@Category(OwnJVMTestsCategory.class) public class ImapServiceImplTest extends TestCase { private static final String IMAP_ROOT = "Alfresco IMAP"; diff --git a/source/test-java/org/alfresco/repo/importer/FileImporterTest.java b/source/test-java/org/alfresco/repo/importer/FileImporterTest.java index 9a2312c384..cd709c3041 100644 --- a/source/test-java/org/alfresco/repo/importer/FileImporterTest.java +++ b/source/test-java/org/alfresco/repo/importer/FileImporterTest.java @@ -47,10 +47,13 @@ import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.TestWithUserUtils; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; +@Category(OwnJVMTestsCategory.class) public class FileImporterTest extends TestCase { static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/importer/ImporterComponentTest.java b/source/test-java/org/alfresco/repo/importer/ImporterComponentTest.java index 34fccba95f..6eff9af3b5 100644 --- a/source/test-java/org/alfresco/repo/importer/ImporterComponentTest.java +++ b/source/test-java/org/alfresco/repo/importer/ImporterComponentTest.java @@ -41,11 +41,13 @@ import org.alfresco.service.cmr.view.ImporterBinding.UUID_BINDING; 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.BaseSpringTest; import org.alfresco.util.debug.NodeStoreInspector; +import org.junit.experimental.categories.Category; import org.springframework.extensions.surf.util.ISO8601DateFormat; - +@Category(OwnJVMTestsCategory.class) public class ImporterComponentTest extends BaseSpringTest { private ImporterService importerService; diff --git a/source/test-java/org/alfresco/repo/jscript/RhinoScriptTest.java b/source/test-java/org/alfresco/repo/jscript/RhinoScriptTest.java index 53dc69af7b..81b4076b2b 100644 --- a/source/test-java/org/alfresco/repo/jscript/RhinoScriptTest.java +++ b/source/test-java/org/alfresco/repo/jscript/RhinoScriptTest.java @@ -42,7 +42,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.mozilla.javascript.Context; import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; @@ -51,6 +53,7 @@ import org.springframework.context.ApplicationContext; /** * @author Kevin Roast */ +@Category(OwnJVMTestsCategory.class) public class RhinoScriptTest extends TestCase { private static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/lock/JobLockServiceTest.java b/source/test-java/org/alfresco/repo/lock/JobLockServiceTest.java index e263425155..852d089359 100644 --- a/source/test-java/org/alfresco/repo/lock/JobLockServiceTest.java +++ b/source/test-java/org/alfresco/repo/lock/JobLockServiceTest.java @@ -27,7 +27,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; /** @@ -41,6 +43,7 @@ import org.springframework.context.ApplicationContext; * @since 3.2 */ @SuppressWarnings("unused") +@Category(OwnJVMTestsCategory.class) public class JobLockServiceTest extends TestCase { public static final String NAMESPACE = "http://www.alfresco.org/test/JobLockServiceTest"; diff --git a/source/test-java/org/alfresco/repo/lock/LockBehaviourImplTest.java b/source/test-java/org/alfresco/repo/lock/LockBehaviourImplTest.java index 65c74703d9..8398617b5f 100644 --- a/source/test-java/org/alfresco/repo/lock/LockBehaviourImplTest.java +++ b/source/test-java/org/alfresco/repo/lock/LockBehaviourImplTest.java @@ -38,14 +38,17 @@ import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.version.VersionService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; import org.alfresco.util.TestWithUserUtils; +import org.junit.experimental.categories.Category; /** * LockBehaviourImpl Unit Test. * * @author Roy Wetherall */ +@Category(OwnJVMTestsCategory.class) public class LockBehaviourImplTest extends BaseSpringTest { /** diff --git a/source/test-java/org/alfresco/repo/model/filefolder/FileFolderDuplicateChildTest.java b/source/test-java/org/alfresco/repo/model/filefolder/FileFolderDuplicateChildTest.java index 7ad20ac2df..fd1edefe15 100644 --- a/source/test-java/org/alfresco/repo/model/filefolder/FileFolderDuplicateChildTest.java +++ b/source/test-java/org/alfresco/repo/model/filefolder/FileFolderDuplicateChildTest.java @@ -37,7 +37,9 @@ 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.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -48,6 +50,7 @@ import org.springframework.context.ApplicationContext; * @author Derek Hulley * @since 2.1.0 */ +@Category(OwnJVMTestsCategory.class) public class FileFolderDuplicateChildTest extends TestCase { private static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/model/ml/tools/ContentFilterLanguagesMapTest.java b/source/test-java/org/alfresco/repo/model/ml/tools/ContentFilterLanguagesMapTest.java index 23dea71cc7..bc157767c6 100644 --- a/source/test-java/org/alfresco/repo/model/ml/tools/ContentFilterLanguagesMapTest.java +++ b/source/test-java/org/alfresco/repo/model/ml/tools/ContentFilterLanguagesMapTest.java @@ -23,6 +23,9 @@ import java.util.Collections; import java.util.List; import java.util.Locale; +import org.alfresco.test_category.OwnJVMTestsCategory; +import org.junit.experimental.categories.Category; + /** * Content filter language service test cases * @@ -31,6 +34,7 @@ import java.util.Locale; * * @author Yannick Pignot */ +@Category(OwnJVMTestsCategory.class) public class ContentFilterLanguagesMapTest extends AbstractMultilingualTestCases { diff --git a/source/test-java/org/alfresco/repo/model/ml/tools/MLContainerTypeTest.java b/source/test-java/org/alfresco/repo/model/ml/tools/MLContainerTypeTest.java index bc380ce6f6..ccc62b30e6 100644 --- a/source/test-java/org/alfresco/repo/model/ml/tools/MLContainerTypeTest.java +++ b/source/test-java/org/alfresco/repo/model/ml/tools/MLContainerTypeTest.java @@ -25,6 +25,8 @@ import java.util.Map; import org.alfresco.model.ContentModel; 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; /** * Multilingual container type test cases @@ -33,6 +35,7 @@ import org.alfresco.service.namespace.QName; * * @author Yannick Pignot */ +@Category(OwnJVMTestsCategory.class) public class MLContainerTypeTest extends AbstractMultilingualTestCases { @SuppressWarnings("unused") diff --git a/source/test-java/org/alfresco/repo/model/ml/tools/MultilingualDocumentAspectTest.java b/source/test-java/org/alfresco/repo/model/ml/tools/MultilingualDocumentAspectTest.java index 2a0938cd63..d48f8a2210 100644 --- a/source/test-java/org/alfresco/repo/model/ml/tools/MultilingualDocumentAspectTest.java +++ b/source/test-java/org/alfresco/repo/model/ml/tools/MultilingualDocumentAspectTest.java @@ -25,6 +25,8 @@ import java.util.Map; import org.alfresco.model.ContentModel; 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; /** * Multilingual document aspect test cases @@ -33,6 +35,7 @@ import org.alfresco.service.namespace.QName; * * @author Yannick Pignot */ +@Category(OwnJVMTestsCategory.class) public class MultilingualDocumentAspectTest extends AbstractMultilingualTestCases { public void testCopy() throws Exception diff --git a/source/test-java/org/alfresco/repo/node/ConcurrentNodeServiceSearchTest.java b/source/test-java/org/alfresco/repo/node/ConcurrentNodeServiceSearchTest.java index a56ad3f6c8..44f90f7bfa 100644 --- a/source/test-java/org/alfresco/repo/node/ConcurrentNodeServiceSearchTest.java +++ b/source/test-java/org/alfresco/repo/node/ConcurrentNodeServiceSearchTest.java @@ -41,10 +41,12 @@ 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.apache.lucene.index.IndexWriter; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; +@Category(OwnJVMTestsCategory.class) public class ConcurrentNodeServiceSearchTest extends TestCase { diff --git a/source/test-java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptorTest.java b/source/test-java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptorTest.java index 97cd5b6fc8..8dcead907a 100644 --- a/source/test-java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptorTest.java +++ b/source/test-java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptorTest.java @@ -32,8 +32,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.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; +import org.junit.experimental.categories.Category; +@Category(OwnJVMTestsCategory.class) public class NodeRefPropertyMethodInterceptorTest extends BaseSpringTest { diff --git a/source/test-java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java b/source/test-java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java index 20f2642ad9..35c98d7fc3 100644 --- a/source/test-java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java +++ b/source/test-java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java @@ -41,9 +41,11 @@ 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.PropertyMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; /** * Checks that tagging of incomplete nodes is done properly. @@ -51,6 +53,7 @@ import org.apache.commons.logging.LogFactory; * @author Derek Hulley */ @SuppressWarnings("unused") +@Category(OwnJVMTestsCategory.class) public class IncompleteNodeTaggerTest extends TestCase { private static Log logger = LogFactory.getLog(IncompleteNodeTaggerTest.class); diff --git a/source/test-java/org/alfresco/repo/node/integrity/IntegrityTest.java b/source/test-java/org/alfresco/repo/node/integrity/IntegrityTest.java index b43ae20b84..12806fece9 100644 --- a/source/test-java/org/alfresco/repo/node/integrity/IntegrityTest.java +++ b/source/test-java/org/alfresco/repo/node/integrity/IntegrityTest.java @@ -38,10 +38,12 @@ 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.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; /** @@ -55,6 +57,7 @@ import org.springframework.context.ApplicationContext; * @author Derek Hulley */ @SuppressWarnings("unused") +@Category(OwnJVMTestsCategory.class) public class IntegrityTest extends TestCase { private static Log logger = LogFactory.getLog(IntegrityTest.class); diff --git a/source/test-java/org/alfresco/repo/policy/PolicyComponentTransactionTest.java b/source/test-java/org/alfresco/repo/policy/PolicyComponentTransactionTest.java index 3f82b33f9a..7972532e0b 100644 --- a/source/test-java/org/alfresco/repo/policy/PolicyComponentTransactionTest.java +++ b/source/test-java/org/alfresco/repo/policy/PolicyComponentTransactionTest.java @@ -35,13 +35,16 @@ import org.alfresco.repo.transaction.AlfrescoTransactionSupport; import org.alfresco.service.cmr.repository.NodeRef; 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; /** * Test Transaction-level Policies */ +@Category(OwnJVMTestsCategory.class) public class PolicyComponentTransactionTest extends TestCase { private static final String TEST_MODEL = "org/alfresco/repo/policy/policycomponenttest_model.xml"; diff --git a/source/test-java/org/alfresco/repo/preference/PreferenceServiceImplTest.java b/source/test-java/org/alfresco/repo/preference/PreferenceServiceImplTest.java index 11928edabc..6a0aa2f407 100644 --- a/source/test-java/org/alfresco/repo/preference/PreferenceServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/preference/PreferenceServiceImplTest.java @@ -41,6 +41,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.ScriptLocation; import org.alfresco.service.cmr.repository.ScriptService; import org.alfresco.service.cmr.security.PersonService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.test.junitrules.AlfrescoPerson; import org.alfresco.util.test.junitrules.ApplicationContextInit; import org.alfresco.util.test.junitrules.RunAsFullyAuthenticatedRule; @@ -54,6 +55,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.junit.rules.RuleChain; /** @@ -62,6 +64,7 @@ import org.junit.rules.RuleChain; * @author Roy Wetherall * @author Neil Mc Erlean (refactoring to JUnit Rules and enabling disabled tests) */ +@Category(OwnJVMTestsCategory.class) public class PreferenceServiceImplTest { private static final Log log = LogFactory.getLog(PreferenceServiceImplTest.class); diff --git a/source/test-java/org/alfresco/repo/publishing/ChannelServiceImplIntegratedTest.java b/source/test-java/org/alfresco/repo/publishing/ChannelServiceImplIntegratedTest.java index d4f40efe4f..c7617bef66 100644 --- a/source/test-java/org/alfresco/repo/publishing/ChannelServiceImplIntegratedTest.java +++ b/source/test-java/org/alfresco/repo/publishing/ChannelServiceImplIntegratedTest.java @@ -38,15 +38,18 @@ import org.alfresco.service.cmr.publishing.channels.ChannelType; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.GUID; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * @author Brian * @author Nick Smith * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class ChannelServiceImplIntegratedTest extends AbstractPublishingIntegrationTest { private static final String channelName = GUID.generate(); diff --git a/source/test-java/org/alfresco/repo/publishing/PublishWebContentActivitiTest.java b/source/test-java/org/alfresco/repo/publishing/PublishWebContentActivitiTest.java index 310621371b..ed4b762998 100644 --- a/source/test-java/org/alfresco/repo/publishing/PublishWebContentActivitiTest.java +++ b/source/test-java/org/alfresco/repo/publishing/PublishWebContentActivitiTest.java @@ -22,6 +22,8 @@ package org.alfresco.repo.publishing; import java.util.List; import org.alfresco.service.cmr.workflow.WorkflowPath; +import org.alfresco.test_category.OwnJVMTestsCategory; +import org.junit.experimental.categories.Category; /** @@ -29,6 +31,7 @@ import org.alfresco.service.cmr.workflow.WorkflowPath; * @author Frederik Heremans * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class PublishWebContentActivitiTest extends PublishWebContentProcessTest { private static final String DEF_NAME = "activiti$publishWebContent"; diff --git a/source/test-java/org/alfresco/repo/publishing/PublishWebContentJbpmTest.java b/source/test-java/org/alfresco/repo/publishing/PublishWebContentJbpmTest.java index d09b70fbb5..c8d3f32543 100644 --- a/source/test-java/org/alfresco/repo/publishing/PublishWebContentJbpmTest.java +++ b/source/test-java/org/alfresco/repo/publishing/PublishWebContentJbpmTest.java @@ -19,12 +19,16 @@ package org.alfresco.repo.publishing; +import org.alfresco.test_category.OwnJVMTestsCategory; +import org.junit.experimental.categories.Category; + /** * @author Nick Smith * @author Frederik Heremans * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class PublishWebContentJbpmTest extends PublishWebContentProcessTest { private static final String DEF_NAME = "jbpm$publishWebContent"; diff --git a/source/test-java/org/alfresco/repo/publishing/PublishingIntegratedTest.java b/source/test-java/org/alfresco/repo/publishing/PublishingIntegratedTest.java index 2efade4e8c..a8ea805465 100644 --- a/source/test-java/org/alfresco/repo/publishing/PublishingIntegratedTest.java +++ b/source/test-java/org/alfresco/repo/publishing/PublishingIntegratedTest.java @@ -47,15 +47,18 @@ import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.service.cmr.workflow.WorkflowService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; import org.alfresco.util.GUID; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * @author Brian * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class PublishingIntegratedTest extends BaseSpringTest { protected ServiceRegistry serviceRegistry; diff --git a/source/test-java/org/alfresco/repo/publishing/PublishingPackageSerializerTest.java b/source/test-java/org/alfresco/repo/publishing/PublishingPackageSerializerTest.java index 64ca3a82ef..75d057b35b 100644 --- a/source/test-java/org/alfresco/repo/publishing/PublishingPackageSerializerTest.java +++ b/source/test-java/org/alfresco/repo/publishing/PublishingPackageSerializerTest.java @@ -42,15 +42,18 @@ import org.alfresco.service.cmr.repository.Path; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.GUID; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * @author Brian * @author Nick Smith * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class PublishingPackageSerializerTest extends AbstractPublishingIntegrationTest { @Resource(name="publishingPackageSerializer") diff --git a/source/test-java/org/alfresco/repo/publishing/PublishingQueueImplTest.java b/source/test-java/org/alfresco/repo/publishing/PublishingQueueImplTest.java index 9374e70dd2..7c36c04dad 100644 --- a/source/test-java/org/alfresco/repo/publishing/PublishingQueueImplTest.java +++ b/source/test-java/org/alfresco/repo/publishing/PublishingQueueImplTest.java @@ -48,13 +48,16 @@ import org.alfresco.service.cmr.workflow.WorkflowInstance; import org.alfresco.service.cmr.workflow.WorkflowPath; import org.alfresco.service.cmr.workflow.WorkflowService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.GUID; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * @author Nick Smith * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class PublishingQueueImplTest extends AbstractPublishingIntegrationTest { private static final String channelId = "test://channel/node"; diff --git a/source/test-java/org/alfresco/repo/publishing/PublishingRootObjectTest.java b/source/test-java/org/alfresco/repo/publishing/PublishingRootObjectTest.java index 20b8d9ab1f..8f04414637 100644 --- a/source/test-java/org/alfresco/repo/publishing/PublishingRootObjectTest.java +++ b/source/test-java/org/alfresco/repo/publishing/PublishingRootObjectTest.java @@ -24,12 +24,15 @@ import javax.annotation.Resource; import org.alfresco.model.ContentModel; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * @author Nick Smith * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class PublishingRootObjectTest extends AbstractPublishingIntegrationTest { @Resource(name="publishingRootObject") diff --git a/source/test-java/org/alfresco/repo/publishing/flickr/FlickrTest.java b/source/test-java/org/alfresco/repo/publishing/flickr/FlickrTest.java index 7fdd9509bf..fdd9320cac 100644 --- a/source/test-java/org/alfresco/repo/publishing/flickr/FlickrTest.java +++ b/source/test-java/org/alfresco/repo/publishing/flickr/FlickrTest.java @@ -43,9 +43,11 @@ import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; import org.alfresco.util.GUID; import org.junit.Assert; +import org.junit.experimental.categories.Category; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; @@ -53,6 +55,7 @@ import org.springframework.core.io.Resource; * @author Brian * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class FlickrTest extends BaseSpringTest { protected ServiceRegistry serviceRegistry; diff --git a/source/test-java/org/alfresco/repo/publishing/slideshare/SlideShareTest.java b/source/test-java/org/alfresco/repo/publishing/slideshare/SlideShareTest.java index fd521e6c67..dbc7370b52 100644 --- a/source/test-java/org/alfresco/repo/publishing/slideshare/SlideShareTest.java +++ b/source/test-java/org/alfresco/repo/publishing/slideshare/SlideShareTest.java @@ -48,9 +48,11 @@ import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; import org.alfresco.util.GUID; import org.junit.Assert; +import org.junit.experimental.categories.Category; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; @@ -59,6 +61,7 @@ import org.springframework.core.io.Resource; * @author Brian * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class SlideShareTest extends BaseSpringTest { protected ServiceRegistry serviceRegistry; diff --git a/source/test-java/org/alfresco/repo/publishing/youtube/YouTubeTest.java b/source/test-java/org/alfresco/repo/publishing/youtube/YouTubeTest.java index d9d11a786a..7d73347e87 100644 --- a/source/test-java/org/alfresco/repo/publishing/youtube/YouTubeTest.java +++ b/source/test-java/org/alfresco/repo/publishing/youtube/YouTubeTest.java @@ -42,9 +42,11 @@ import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; import org.alfresco.util.GUID; import org.junit.Assert; +import org.junit.experimental.categories.Category; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; @@ -53,6 +55,7 @@ import org.springframework.core.io.Resource; * @author Brian * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class YouTubeTest extends BaseSpringTest { protected ServiceRegistry serviceRegistry; diff --git a/source/test-java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java b/source/test-java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java index 7fe7e45068..ee57327ecd 100644 --- a/source/test-java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java +++ b/source/test-java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java @@ -40,15 +40,18 @@ 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.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseAlfrescoSpringTest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; /** * Unit tests for the HTML Rendering Engine * * @author Nick Burch */ +@Category(OwnJVMTestsCategory.class) public class HTMLRenderingEngineTest extends BaseAlfrescoSpringTest { private final static Log log = LogFactory.getLog(HTMLRenderingEngineTest.class); diff --git a/source/test-java/org/alfresco/repo/rule/MiscellaneousRulesTest.java b/source/test-java/org/alfresco/repo/rule/MiscellaneousRulesTest.java index 6d6a8f1b01..2210ef1f88 100644 --- a/source/test-java/org/alfresco/repo/rule/MiscellaneousRulesTest.java +++ b/source/test-java/org/alfresco/repo/rule/MiscellaneousRulesTest.java @@ -47,6 +47,7 @@ import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.test.junitrules.AlfrescoPerson; import org.alfresco.util.test.junitrules.ApplicationContextInit; import org.alfresco.util.test.junitrules.RunAsFullyAuthenticatedRule; @@ -59,6 +60,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.junit.rules.RuleChain; import org.springframework.context.ApplicationContext; @@ -70,6 +72,7 @@ import org.springframework.context.ApplicationContext; * @author Neil Mc Erlean * @since 4.1.3 */ +@Category(OwnJVMTestsCategory.class) public class MiscellaneousRulesTest { private static final Log log = LogFactory.getLog(MiscellaneousRulesTest.class); diff --git a/source/test-java/org/alfresco/repo/search/QueryRegisterComponentTest.java b/source/test-java/org/alfresco/repo/search/QueryRegisterComponentTest.java index be783278cd..14c57967b4 100644 --- a/source/test-java/org/alfresco/repo/search/QueryRegisterComponentTest.java +++ b/source/test-java/org/alfresco/repo/search/QueryRegisterComponentTest.java @@ -23,9 +23,12 @@ import junit.framework.TestCase; import org.alfresco.service.cmr.dictionary.DictionaryService; 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.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; +@Category(OwnJVMTestsCategory.class) public class QueryRegisterComponentTest extends TestCase { static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/search/impl/lucene/ADMLuceneCategoryTest.java b/source/test-java/org/alfresco/repo/search/impl/lucene/ADMLuceneCategoryTest.java index cc3a49f6a7..f01ec54499 100644 --- a/source/test-java/org/alfresco/repo/search/impl/lucene/ADMLuceneCategoryTest.java +++ b/source/test-java/org/alfresco/repo/search/impl/lucene/ADMLuceneCategoryTest.java @@ -60,8 +60,10 @@ 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.Pair; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -69,6 +71,7 @@ import org.springframework.context.ApplicationContext; * @author andyh * */ +@Category(OwnJVMTestsCategory.class) public class ADMLuceneCategoryTest extends TestCase { private ServiceRegistry serviceRegistry; diff --git a/source/test-java/org/alfresco/repo/security/authority/AuthorityServiceTest.java b/source/test-java/org/alfresco/repo/security/authority/AuthorityServiceTest.java index 92e731a1e4..81521ace94 100644 --- a/source/test-java/org/alfresco/repo/security/authority/AuthorityServiceTest.java +++ b/source/test-java/org/alfresco/repo/security/authority/AuthorityServiceTest.java @@ -58,9 +58,12 @@ import org.alfresco.service.cmr.site.SiteService; 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; +@Category(OwnJVMTestsCategory.class) public class AuthorityServiceTest extends TestCase { private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); diff --git a/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java b/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java index 037b8273e1..183fc8d895 100644 --- a/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java @@ -68,15 +68,18 @@ import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.service.cmr.tagging.TaggingService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseAlfrescoSpringTest; import org.alfresco.util.GUID; import org.alfresco.util.PropertyMap; +import org.junit.experimental.categories.Category; /** * Site service implementation unit test * * @author Roy Wetherall */ +@Category(OwnJVMTestsCategory.class) public class SiteServiceImplTest extends BaseAlfrescoSpringTest { private static final String TEST_SITE_PRESET = "testSitePreset"; diff --git a/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java b/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java index 1767d8f964..5d68fc4e3b 100644 --- a/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java +++ b/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java @@ -49,6 +49,7 @@ import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.service.cmr.subscriptions.SubscriptionService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +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; @@ -65,11 +66,13 @@ 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; import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.springframework.context.ApplicationContext; +@Category(OwnJVMTestsCategory.class) public class SubscriptionServiceActivitiesTest { private static final Log log = LogFactory.getLog(SubscriptionServiceActivitiesTest.class); diff --git a/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceImplTest.java b/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceImplTest.java index ccafa28ca8..dd2ec87bc6 100644 --- a/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceImplTest.java @@ -40,11 +40,14 @@ import org.alfresco.service.cmr.subscriptions.SubscriptionService; 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.GUID; import org.alfresco.util.PropertyMap; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; +@Category(OwnJVMTestsCategory.class) public class SubscriptionServiceImplTest extends TestCase { public static final String[] CONTEXTS = new String[] { "classpath:alfresco/application-context.xml", "classpath:test/alfresco/test-subscriptions-context.xml" }; diff --git a/source/test-java/org/alfresco/repo/tagging/TaggingServiceImplTest.java b/source/test-java/org/alfresco/repo/tagging/TaggingServiceImplTest.java index ec9c046cb6..0fae9e487e 100644 --- a/source/test-java/org/alfresco/repo/tagging/TaggingServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/tagging/TaggingServiceImplTest.java @@ -63,6 +63,7 @@ import org.alfresco.service.cmr.tagging.TaggingService; 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.GUID; import org.alfresco.util.PropertyMap; @@ -71,6 +72,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.context.ConfigurableApplicationContext; import org.junit.FixMethodOrder; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; /** @@ -80,6 +82,7 @@ import org.junit.runners.MethodSorters; * @author Nick Burch */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(OwnJVMTestsCategory.class) public class TaggingServiceImplTest extends TestCase { private static ConfigurableApplicationContext ctx = diff --git a/source/test-java/org/alfresco/repo/template/XSLTProcessorTest.java b/source/test-java/org/alfresco/repo/template/XSLTProcessorTest.java index 8f748d5be6..a215bdd7f2 100644 --- a/source/test-java/org/alfresco/repo/template/XSLTProcessorTest.java +++ b/source/test-java/org/alfresco/repo/template/XSLTProcessorTest.java @@ -35,16 +35,19 @@ import org.alfresco.service.cmr.repository.TemplateProcessor; import org.alfresco.service.cmr.repository.TemplateService; import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.search.SearchService; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseAlfrescoSpringTest; import org.alfresco.util.GUID; import org.alfresco.util.XMLUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; /** * @author Brian * */ +@Category(OwnJVMTestsCategory.class) public class XSLTProcessorTest extends BaseAlfrescoSpringTest { private final static Log log = LogFactory.getLog(XSLTProcessorTest.class); diff --git a/source/test-java/org/alfresco/repo/thumbnail/conditions/NodeEligibleForRethumbnailingEvaluatorTest.java b/source/test-java/org/alfresco/repo/thumbnail/conditions/NodeEligibleForRethumbnailingEvaluatorTest.java index a4758a077f..e895f7a569 100644 --- a/source/test-java/org/alfresco/repo/thumbnail/conditions/NodeEligibleForRethumbnailingEvaluatorTest.java +++ b/source/test-java/org/alfresco/repo/thumbnail/conditions/NodeEligibleForRethumbnailingEvaluatorTest.java @@ -33,8 +33,10 @@ import org.alfresco.service.cmr.thumbnail.FailedThumbnailInfo; import org.alfresco.service.cmr.thumbnail.ThumbnailService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; import org.alfresco.util.GUID; +import org.junit.experimental.categories.Category; /** * This class tests {@link NodeEligibleForRethumbnailingEvaluator}. @@ -42,6 +44,7 @@ import org.alfresco.util.GUID; * @author Neil Mc Erlean * @since 3.5.0 */ +@Category(OwnJVMTestsCategory.class) public class NodeEligibleForRethumbnailingEvaluatorTest extends BaseSpringTest { private final QName thumbnailDef1 = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "thumbDef1"); diff --git a/source/test-java/org/alfresco/repo/transfer/NodeCrawlerTest.java b/source/test-java/org/alfresco/repo/transfer/NodeCrawlerTest.java index f3d3021f19..4f8a516364 100644 --- a/source/test-java/org/alfresco/repo/transfer/NodeCrawlerTest.java +++ b/source/test-java/org/alfresco/repo/transfer/NodeCrawlerTest.java @@ -37,14 +37,17 @@ import org.alfresco.service.cmr.transfer.NodeCrawler; import org.alfresco.service.cmr.transfer.NodeCrawlerFactory; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseAlfrescoSpringTest; import org.alfresco.util.GUID; +import org.junit.experimental.categories.Category; /** * Unit test for classes related to the {@link NodeCrawler} interface * * @author Brian Remmington */ +@Category(OwnJVMTestsCategory.class) public class NodeCrawlerTest extends BaseAlfrescoSpringTest { private ServiceRegistry serviceRegistry; diff --git a/source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java b/source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java index 978f720ae4..d721f7ae2f 100644 --- a/source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java +++ b/source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java @@ -63,10 +63,12 @@ import org.alfresco.service.cmr.transfer.TransferServicePolicies; 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.BaseAlfrescoSpringTest; 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.mockito.ArgumentCaptor; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.support.DefaultTransactionDefinition; @@ -77,7 +79,7 @@ import org.springframework.transaction.support.DefaultTransactionDefinition; * @author Brian Remmington */ @SuppressWarnings("deprecation") -// It's a test +@Category(OwnJVMTestsCategory.class) public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest { private static int fileCount = 0; diff --git a/source/test-java/org/alfresco/repo/transfer/TransferServiceCallbackTest.java b/source/test-java/org/alfresco/repo/transfer/TransferServiceCallbackTest.java index dad4fc4e43..c046ed5d02 100644 --- a/source/test-java/org/alfresco/repo/transfer/TransferServiceCallbackTest.java +++ b/source/test-java/org/alfresco/repo/transfer/TransferServiceCallbackTest.java @@ -68,13 +68,16 @@ import org.alfresco.service.cmr.transfer.TransferProgress.Status; import org.alfresco.service.cmr.transfer.TransferVersion; import org.alfresco.service.descriptor.DescriptorService; 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.mockito.ArgumentCaptor; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.context.ApplicationContext; +@Category(OwnJVMTestsCategory.class) public class TransferServiceCallbackTest extends TestCase { // private static Log log = LogFactory.getLog(TransferServiceImplUnitTest.class); diff --git a/source/test-java/org/alfresco/repo/transfer/TransferServiceImplTest.java b/source/test-java/org/alfresco/repo/transfer/TransferServiceImplTest.java index 0832506c46..9ab363d9dd 100644 --- a/source/test-java/org/alfresco/repo/transfer/TransferServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/transfer/TransferServiceImplTest.java @@ -91,11 +91,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.BaseAlfrescoSpringTest; import org.alfresco.util.GUID; import org.alfresco.util.Pair; import org.alfresco.util.PropertyMap; import org.alfresco.util.TempFileProvider; +import org.junit.experimental.categories.Category; import org.springframework.util.ResourceUtils; /** @@ -106,6 +108,7 @@ import org.springframework.util.ResourceUtils; * @author Mark Rogers */ @SuppressWarnings("deprecation") +@Category(OwnJVMTestsCategory.class) public class TransferServiceImplTest extends BaseAlfrescoSpringTest { private TransferService transferService; diff --git a/source/test-java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java b/source/test-java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java index 9a2d2ec459..71394fa34c 100644 --- a/source/test-java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java +++ b/source/test-java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java @@ -79,10 +79,12 @@ import org.alfresco.service.descriptor.DescriptorService; 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.BaseAlfrescoSpringTest; import org.alfresco.util.GUID; import org.alfresco.util.Pair; import org.alfresco.util.PropertyMap; +import org.junit.experimental.categories.Category; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.support.DefaultTransactionDefinition; import org.springframework.util.ResourceUtils; @@ -98,6 +100,7 @@ import org.springframework.util.ResourceUtils; * @author Mark Rogers */ @SuppressWarnings("deprecation") +@Category(OwnJVMTestsCategory.class) public class TransferServiceToBeRefactoredTest extends BaseAlfrescoSpringTest { private TransferService transferService; diff --git a/source/test-java/org/alfresco/repo/transfer/TransferVersionCheckerImplTest.java b/source/test-java/org/alfresco/repo/transfer/TransferVersionCheckerImplTest.java index 1311b106e7..88715bd60d 100644 --- a/source/test-java/org/alfresco/repo/transfer/TransferVersionCheckerImplTest.java +++ b/source/test-java/org/alfresco/repo/transfer/TransferVersionCheckerImplTest.java @@ -1,12 +1,15 @@ package org.alfresco.repo.transfer; import org.alfresco.service.cmr.transfer.TransferVersion; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseAlfrescoSpringTest; +import org.junit.experimental.categories.Category; /** * Unit test for TransferVersionChecker * @author mrogers */ +@Category(OwnJVMTestsCategory.class) public class TransferVersionCheckerImplTest extends BaseAlfrescoSpringTest { /** diff --git a/source/test-java/org/alfresco/repo/transfer/manifest/ManifestIntegrationTest.java b/source/test-java/org/alfresco/repo/transfer/manifest/ManifestIntegrationTest.java index 495ff288cc..9ed0e68441 100644 --- a/source/test-java/org/alfresco/repo/transfer/manifest/ManifestIntegrationTest.java +++ b/source/test-java/org/alfresco/repo/transfer/manifest/ManifestIntegrationTest.java @@ -49,14 +49,17 @@ import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.transfer.TransferService; import org.alfresco.service.cmr.transfer.TransferTarget; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseAlfrescoSpringTest; import org.alfresco.util.TempFileProvider; +import org.junit.experimental.categories.Category; /** * Integration test for Transfer Manifest * * @author Mark Rogers */ +@Category(OwnJVMTestsCategory.class) public class ManifestIntegrationTest extends BaseAlfrescoSpringTest { private TransferService transferService; diff --git a/source/test-java/org/alfresco/repo/transfer/script/ScriptTransferServiceTest.java b/source/test-java/org/alfresco/repo/transfer/script/ScriptTransferServiceTest.java index 146df908ce..136949ee56 100644 --- a/source/test-java/org/alfresco/repo/transfer/script/ScriptTransferServiceTest.java +++ b/source/test-java/org/alfresco/repo/transfer/script/ScriptTransferServiceTest.java @@ -33,7 +33,9 @@ import org.alfresco.service.cmr.transfer.TransferDefinition; import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferService; import org.alfresco.service.cmr.transfer.TransferTarget; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseAlfrescoSpringTest; +import org.junit.experimental.categories.Category; import org.mockito.Matchers; import org.mockito.Mockito; @@ -42,6 +44,7 @@ import org.mockito.Mockito; * * @author Mark Rogers */ +@Category(OwnJVMTestsCategory.class) public class ScriptTransferServiceTest extends BaseAlfrescoSpringTest { diff --git a/source/test-java/org/alfresco/repo/version/VersionMigratorTest.java b/source/test-java/org/alfresco/repo/version/VersionMigratorTest.java index e0053b4795..49b60e301b 100644 --- a/source/test-java/org/alfresco/repo/version/VersionMigratorTest.java +++ b/source/test-java/org/alfresco/repo/version/VersionMigratorTest.java @@ -42,13 +42,16 @@ import org.alfresco.service.cmr.version.VersionHistory; 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.EqualsHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; /** * Test simple version store migration */ +@Category(OwnJVMTestsCategory.class) public class VersionMigratorTest extends BaseVersionStoreTest { private static Log logger = LogFactory.getLog(VersionMigratorTest.class);