diff --git a/pom.xml b/pom.xml index a8d01c7dfd..7bf7310078 100644 --- a/pom.xml +++ b/pom.xml @@ -899,6 +899,7 @@ test + -Xmx2560m -XX:MaxPermSize=512m -Duser.language=en -Dcom.sun.management.jmxremote 1 false @@ -909,13 +910,29 @@ default-test - org.alfresco.test_category.OwnJVMTestsCategory, org.alfresco.test_category.BaseSpringTestsCategory + org.alfresco.test_category.OwnJVMTestsCategory, org.alfresco.test_category.BaseSpringTestsCategory,org.alfresco.test_category.LegacyCategory + + run-legacy-tests + + test + + + -Xmx2560m -XX:MaxPermSize=512m -Duser.language=en -Dcom.sun.management.jmxremote + + 1 + true + + org.alfresco.test_category.LegacyCategory + org.alfresco.test_category.OwnJVMTestsCategory,org.alfresco.test_category.BaseSpringTestsCategory + + + **/*Test.* diff --git a/source/test-java/org/alfresco/repo/avm/AVMChildNamePatternMatchPerformanceTest.java b/source/test-java/org/alfresco/repo/avm/AVMChildNamePatternMatchPerformanceTest.java index 6f84de3cd8..900acaebcf 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMChildNamePatternMatchPerformanceTest.java +++ b/source/test-java/org/alfresco/repo/avm/AVMChildNamePatternMatchPerformanceTest.java @@ -22,8 +22,11 @@ import java.util.SortedMap; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; +import org.alfresco.test_category.LegacyCategory; import org.alfresco.util.GUID; +import org.junit.experimental.categories.Category; +@Category(LegacyCategory.class) public class AVMChildNamePatternMatchPerformanceTest extends AVMServiceTestBase { diff --git a/source/test-java/org/alfresco/repo/avm/AVMCrawlTestP.java b/source/test-java/org/alfresco/repo/avm/AVMCrawlTestP.java index f0fd010eb6..07e3e5aad6 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMCrawlTestP.java +++ b/source/test-java/org/alfresco/repo/avm/AVMCrawlTestP.java @@ -25,6 +25,8 @@ import net.sf.acegisecurity.Authentication; import org.alfresco.repo.avm.util.BulkLoader; import org.alfresco.repo.security.authentication.AuthenticationUtil; +import org.alfresco.test_category.LegacyCategory; +import org.junit.experimental.categories.Category; /** @@ -32,6 +34,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil; * do operations with locality of reference. * @author britt */ +@Category(LegacyCategory.class) public class AVMCrawlTestP extends AVMServiceTestBase { /* diff --git a/source/test-java/org/alfresco/repo/avm/AVMDeploymentAttemptCleanerTest.java b/source/test-java/org/alfresco/repo/avm/AVMDeploymentAttemptCleanerTest.java index 7d78c8886b..6b696b2676 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMDeploymentAttemptCleanerTest.java +++ b/source/test-java/org/alfresco/repo/avm/AVMDeploymentAttemptCleanerTest.java @@ -26,6 +26,8 @@ import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.LegacyCategory; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -33,6 +35,7 @@ import org.springframework.context.ApplicationContext; * * @author gavinc */ +@Category(LegacyCategory.class) public class AVMDeploymentAttemptCleanerTest extends TestCase { private static ApplicationContext ctx = AVMTestSuite.getContext(); diff --git a/source/test-java/org/alfresco/repo/avm/AVMDiffPerformanceTest.java b/source/test-java/org/alfresco/repo/avm/AVMDiffPerformanceTest.java index a483ce644b..406a60219d 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMDiffPerformanceTest.java +++ b/source/test-java/org/alfresco/repo/avm/AVMDiffPerformanceTest.java @@ -22,8 +22,11 @@ import java.util.List; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.cmr.avmsync.AVMDifference; +import org.alfresco.test_category.LegacyCategory; import org.alfresco.util.GUID; +import org.junit.experimental.categories.Category; +@Category(LegacyCategory.class) public class AVMDiffPerformanceTest extends AVMServiceTestBase { public void testSetup() throws Exception diff --git a/source/test-java/org/alfresco/repo/avm/AVMExpiredContentTest.java b/source/test-java/org/alfresco/repo/avm/AVMExpiredContentTest.java index 2e1f6a50f1..f6357ca905 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMExpiredContentTest.java +++ b/source/test-java/org/alfresco/repo/avm/AVMExpiredContentTest.java @@ -29,6 +29,8 @@ import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.workflow.WorkflowService; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.LegacyCategory; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -36,6 +38,7 @@ import org.springframework.context.ApplicationContext; * * @author gavinc */ +@Category(LegacyCategory.class) public class AVMExpiredContentTest extends TestCase { private static ApplicationContext ctx = AVMTestSuite.getContext(); diff --git a/source/test-java/org/alfresco/repo/avm/AVMFileFolderPerformanceTester.java b/source/test-java/org/alfresco/repo/avm/AVMFileFolderPerformanceTester.java index 603900678a..e2b8617d0c 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMFileFolderPerformanceTester.java +++ b/source/test-java/org/alfresco/repo/avm/AVMFileFolderPerformanceTester.java @@ -23,10 +23,13 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; +import org.alfresco.test_category.LegacyCategory; +import org.junit.experimental.categories.Category; /** * @see FileFolderPerformanceTester */ +@Category(LegacyCategory.class) public class AVMFileFolderPerformanceTester extends FileFolderPerformanceTester { @Override diff --git a/source/test-java/org/alfresco/repo/avm/AVMNodeConverterTest.java b/source/test-java/org/alfresco/repo/avm/AVMNodeConverterTest.java index 751536441d..24ec1f5bad 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMNodeConverterTest.java +++ b/source/test-java/org/alfresco/repo/avm/AVMNodeConverterTest.java @@ -19,7 +19,9 @@ package org.alfresco.repo.avm; import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.test_category.LegacyCategory; import org.alfresco.util.Pair; +import org.junit.experimental.categories.Category; import junit.framework.TestCase; @@ -27,6 +29,7 @@ import junit.framework.TestCase; * Tester of the converter from NodeRef, StoreRef space to AVM space. * @author britt */ +@Category(LegacyCategory.class) public class AVMNodeConverterTest extends TestCase { /** diff --git a/source/test-java/org/alfresco/repo/avm/AVMScaleTestP.java b/source/test-java/org/alfresco/repo/avm/AVMScaleTestP.java index 542eb39a87..74d6b3ca77 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMScaleTestP.java +++ b/source/test-java/org/alfresco/repo/avm/AVMScaleTestP.java @@ -21,11 +21,14 @@ package org.alfresco.repo.avm; import org.alfresco.repo.avm.util.BulkLoader; import org.alfresco.repo.avm.util.BulkReader; +import org.alfresco.test_category.LegacyCategory; +import org.junit.experimental.categories.Category; /** * Test of scaling out to large numbers of files. * @author britt */ +@Category(LegacyCategory.class) public class AVMScaleTestP extends AVMServiceTestBase { public void testScaleA() diff --git a/source/test-java/org/alfresco/repo/avm/AVMServiceConcurrentTest.java b/source/test-java/org/alfresco/repo/avm/AVMServiceConcurrentTest.java index 829e2bdbd7..6a5ac094b8 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMServiceConcurrentTest.java +++ b/source/test-java/org/alfresco/repo/avm/AVMServiceConcurrentTest.java @@ -34,12 +34,15 @@ import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.search.ResultSetRow; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespaceService; +import org.alfresco.test_category.LegacyCategory; +import org.junit.experimental.categories.Category; /** * AVM concurrency and search * * @author andyh, janv */ +@Category(LegacyCategory.class) public class AVMServiceConcurrentTest extends AVMServiceTestBase { public void testSetup() throws Exception diff --git a/source/test-java/org/alfresco/repo/avm/AVMServiceIndexTest.java b/source/test-java/org/alfresco/repo/avm/AVMServiceIndexTest.java index 91e8579a81..bbea19a3a4 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMServiceIndexTest.java +++ b/source/test-java/org/alfresco/repo/avm/AVMServiceIndexTest.java @@ -26,14 +26,16 @@ import org.alfresco.repo.search.impl.lucene.AVMLuceneIndexer; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.search.SearchService; -import org.alfresco.util.TriggerBean; +import org.alfresco.test_category.LegacyCategory; import org.alfresco.util.TriggerBeanSPI; +import org.junit.experimental.categories.Category; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; /** * Test AVMService indexing */ +@Category(LegacyCategory.class) public class AVMServiceIndexTest extends AVMServiceTestBase { /* diff --git a/source/test-java/org/alfresco/repo/avm/AVMServiceLocalTest.java b/source/test-java/org/alfresco/repo/avm/AVMServiceLocalTest.java index d6de23fb2c..e06f585ebf 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMServiceLocalTest.java +++ b/source/test-java/org/alfresco/repo/avm/AVMServiceLocalTest.java @@ -47,15 +47,18 @@ import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.remote.AVMRemote; import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.LegacyCategory; import org.alfresco.util.NameMatcher; 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; /** * Local unit tests of AVM (AVMSyncService & AVMService) */ +@Category(LegacyCategory.class) public class AVMServiceLocalTest extends TestCase { private static Log logger = LogFactory.getLog(AVMServiceLocalTest.class); diff --git a/source/test-java/org/alfresco/repo/avm/AVMServicePerfTest.java b/source/test-java/org/alfresco/repo/avm/AVMServicePerfTest.java index 9a59204ef4..5a7451a62a 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMServicePerfTest.java +++ b/source/test-java/org/alfresco/repo/avm/AVMServicePerfTest.java @@ -20,10 +20,14 @@ package org.alfresco.repo.avm; import java.io.PrintStream; +import org.alfresco.test_category.LegacyCategory; +import org.junit.experimental.categories.Category; + /** * Performance test(s). * @author britt */ +@Category(LegacyCategory.class) public class AVMServicePerfTest extends AVMServiceTestBase { public void testSetup() throws Exception diff --git a/source/test-java/org/alfresco/repo/avm/AVMServicePermissionsTest.java b/source/test-java/org/alfresco/repo/avm/AVMServicePermissionsTest.java index 17bd4b1632..d2cbfd4bc4 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMServicePermissionsTest.java +++ b/source/test-java/org/alfresco/repo/avm/AVMServicePermissionsTest.java @@ -63,6 +63,8 @@ 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.LegacyCategory; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import org.springframework.orm.hibernate3.LocalSessionFactoryBean; @@ -71,6 +73,7 @@ import org.springframework.orm.hibernate3.LocalSessionFactoryBean; * * @author andyh */ +@Category(LegacyCategory.class) public class AVMServicePermissionsTest extends TestCase { private static ApplicationContext applicationContext = AVMTestSuite.getContext(); diff --git a/source/test-java/org/alfresco/repo/avm/AVMServiceRemoteSystemTest.java b/source/test-java/org/alfresco/repo/avm/AVMServiceRemoteSystemTest.java index 71b580c1e5..48f281b2ce 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMServiceRemoteSystemTest.java +++ b/source/test-java/org/alfresco/repo/avm/AVMServiceRemoteSystemTest.java @@ -22,12 +22,15 @@ import org.alfresco.repo.remote.ClientTicketHolder; import org.alfresco.service.cmr.avmsync.AVMSyncService; import org.alfresco.service.cmr.remote.AVMRemote; import org.alfresco.service.cmr.security.AuthenticationService; +import org.alfresco.test_category.LegacyCategory; import org.alfresco.util.NameMatcher; +import org.junit.experimental.categories.Category; import org.springframework.context.support.FileSystemXmlApplicationContext; /** * Remote system tests of AVM (AVMSyncService & AVMService) - requires running repo */ +@Category(LegacyCategory.class) public class AVMServiceRemoteSystemTest extends AVMServiceLocalTest { private final static String ADMIN_UN = "admin"; diff --git a/source/test-java/org/alfresco/repo/avm/AVMServiceTest.java b/source/test-java/org/alfresco/repo/avm/AVMServiceTest.java index 35535a9c60..e046ea2a2d 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMServiceTest.java +++ b/source/test-java/org/alfresco/repo/avm/AVMServiceTest.java @@ -79,15 +79,18 @@ import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.LegacyCategory; import org.alfresco.util.GUID; import org.alfresco.util.Pair; import org.alfresco.wcm.sandbox.SandboxConstants; +import org.junit.experimental.categories.Category; /** * Big test of AVM behavior. * * @author britt */ +@Category(LegacyCategory.class) public class AVMServiceTest extends AVMServiceTestBase { public void testSetup() throws Exception diff --git a/source/test-java/org/alfresco/repo/avm/AVMServiceTestBase.java b/source/test-java/org/alfresco/repo/avm/AVMServiceTestBase.java index ae99fcdc00..201d6c904a 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMServiceTestBase.java +++ b/source/test-java/org/alfresco/repo/avm/AVMServiceTestBase.java @@ -43,12 +43,15 @@ import org.alfresco.service.cmr.search.ResultSetRow; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.LegacyCategory; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** * Base class for AVMService tests. * @author britt */ +@Category(LegacyCategory.class) public class AVMServiceTestBase extends TestCase { /** diff --git a/source/test-java/org/alfresco/repo/avm/AVMStressTestP.java b/source/test-java/org/alfresco/repo/avm/AVMStressTestP.java index 841ba31814..0c934374c9 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMStressTestP.java +++ b/source/test-java/org/alfresco/repo/avm/AVMStressTestP.java @@ -22,11 +22,14 @@ import java.util.ArrayList; import java.util.List; import org.alfresco.repo.avm.util.BulkLoader; +import org.alfresco.test_category.LegacyCategory; +import org.junit.experimental.categories.Category; /** * This is a stress test for the AVM repository. * @author britt */ +@Category(LegacyCategory.class) public class AVMStressTestP extends AVMServiceTestBase { /* diff --git a/source/test-java/org/alfresco/repo/avm/AVMTestSuite.java b/source/test-java/org/alfresco/repo/avm/AVMTestSuite.java index 56cf7b9959..474be4ab51 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMTestSuite.java +++ b/source/test-java/org/alfresco/repo/avm/AVMTestSuite.java @@ -23,7 +23,9 @@ import junit.framework.TestSuite; import org.alfresco.repo.avm.locking.AVMLockingServiceTest; import org.alfresco.repo.avm.util.VersionPathTest; +import org.alfresco.test_category.LegacyCategory; 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 brittp, janv */ +@Category(LegacyCategory.class) public class AVMTestSuite extends TestSuite { public static ApplicationContext getContext() diff --git a/source/test-java/org/alfresco/repo/avm/AVMTester.java b/source/test-java/org/alfresco/repo/avm/AVMTester.java index b2edfced29..fed84e6ea5 100644 --- a/source/test-java/org/alfresco/repo/avm/AVMTester.java +++ b/source/test-java/org/alfresco/repo/avm/AVMTester.java @@ -34,12 +34,15 @@ import org.alfresco.service.cmr.avm.AVMException; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.repository.ContentIOException; +import org.alfresco.test_category.LegacyCategory; +import org.junit.experimental.categories.Category; /** * This is a Runnable which randomly performs operations on an AVM Repository. * It's purpose is to act as a single thread in a multithreaded stress tester. * @author britt */ +@Category(LegacyCategory.class) class AVMTester implements Runnable { // Operation codes. diff --git a/source/test-java/org/alfresco/repo/avm/PurgeTestP.java b/source/test-java/org/alfresco/repo/avm/PurgeTestP.java index e7ab110827..7fd42df0c3 100644 --- a/source/test-java/org/alfresco/repo/avm/PurgeTestP.java +++ b/source/test-java/org/alfresco/repo/avm/PurgeTestP.java @@ -20,13 +20,16 @@ package org.alfresco.repo.avm; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.repo.avm.util.BulkLoader; +import org.alfresco.test_category.LegacyCategory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; /** * Test the purge thread. * @author britt */ +@Category(LegacyCategory.class) public class PurgeTestP extends AVMServiceTestBase { private static Log logger = LogFactory.getLog(PurgeTestP.class); diff --git a/source/test-java/org/alfresco/repo/avm/SimultaneousLoadTest.java b/source/test-java/org/alfresco/repo/avm/SimultaneousLoadTest.java index 663eb6753e..b0784c334b 100644 --- a/source/test-java/org/alfresco/repo/avm/SimultaneousLoadTest.java +++ b/source/test-java/org/alfresco/repo/avm/SimultaneousLoadTest.java @@ -19,11 +19,14 @@ package org.alfresco.repo.avm; import org.alfresco.repo.avm.util.BulkLoader; +import org.alfresco.test_category.LegacyCategory; +import org.junit.experimental.categories.Category; /** * This tests loading content simultaneously. * @author britt */ +@Category(LegacyCategory.class) public class SimultaneousLoadTest extends AVMServiceTestBase { /* diff --git a/source/test-java/org/alfresco/repo/avm/TestDeploymentCallback.java b/source/test-java/org/alfresco/repo/avm/TestDeploymentCallback.java index 6f6d4672ab..da6d5f24ca 100644 --- a/source/test-java/org/alfresco/repo/avm/TestDeploymentCallback.java +++ b/source/test-java/org/alfresco/repo/avm/TestDeploymentCallback.java @@ -21,11 +21,14 @@ package org.alfresco.repo.avm; import org.alfresco.service.cmr.avm.deploy.DeploymentCallback; import org.alfresco.service.cmr.avm.deploy.DeploymentEvent; +import org.alfresco.test_category.LegacyCategory; +import org.junit.experimental.categories.Category; /** * Trivial deployment callback for testing. * @author britt */ +@Category(LegacyCategory.class) public class TestDeploymentCallback implements DeploymentCallback { public void eventOccurred(DeploymentEvent event) diff --git a/source/test-java/org/alfresco/repo/avm/WCMInheritPermissionsTest.java b/source/test-java/org/alfresco/repo/avm/WCMInheritPermissionsTest.java index 7d92d909dd..6a7077a9a0 100644 --- a/source/test-java/org/alfresco/repo/avm/WCMInheritPermissionsTest.java +++ b/source/test-java/org/alfresco/repo/avm/WCMInheritPermissionsTest.java @@ -24,7 +24,10 @@ import org.alfresco.config.JNDIConstants; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.security.PermissionService; +import org.alfresco.test_category.LegacyCategory; +import org.junit.experimental.categories.Category; +@Category(LegacyCategory.class) public class WCMInheritPermissionsTest extends AVMServiceTestBase { private static final String FILE_NAME = "fileForExport"; diff --git a/source/test-java/org/alfresco/repo/avm/locking/AVMLockingServiceTest.java b/source/test-java/org/alfresco/repo/avm/locking/AVMLockingServiceTest.java index 93088b0176..550576b0ca 100644 --- a/source/test-java/org/alfresco/repo/avm/locking/AVMLockingServiceTest.java +++ b/source/test-java/org/alfresco/repo/avm/locking/AVMLockingServiceTest.java @@ -50,9 +50,11 @@ import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.LegacyCategory; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.wcm.sandbox.SandboxConstants; import org.alfresco.wcm.util.WCMUtil; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** @@ -60,6 +62,7 @@ import org.springframework.context.ApplicationContext; * * @author Derek Hulley, janv */ +@Category(LegacyCategory.class) public class AVMLockingServiceTest extends TestCase { private static String[] TESTUSERS = {"Buffy", "Willow", "Xander", "Tara", "Spike"}; diff --git a/source/test-java/org/alfresco/repo/avm/util/VersionPathTest.java b/source/test-java/org/alfresco/repo/avm/util/VersionPathTest.java index 4edcd5cf5d..ca55f49558 100644 --- a/source/test-java/org/alfresco/repo/avm/util/VersionPathTest.java +++ b/source/test-java/org/alfresco/repo/avm/util/VersionPathTest.java @@ -21,7 +21,9 @@ package org.alfresco.repo.avm.util; import java.util.List; import org.alfresco.repo.avm.AVMNodeConverter; +import org.alfresco.test_category.LegacyCategory; import org.alfresco.util.Pair; +import org.junit.experimental.categories.Category; import junit.framework.TestCase; @@ -29,6 +31,7 @@ import junit.framework.TestCase; * Test out stuffing and unstuffing Version/Paths * @author britt */ +@Category(LegacyCategory.class) public class VersionPathTest extends TestCase { public void testVersionPath() diff --git a/source/test-java/org/alfresco/repo/bulkimport/impl/BulkImportTest.java b/source/test-java/org/alfresco/repo/bulkimport/impl/BulkImportTest.java index 38393c8efa..771b7a112e 100644 --- a/source/test-java/org/alfresco/repo/bulkimport/impl/BulkImportTest.java +++ b/source/test-java/org/alfresco/repo/bulkimport/impl/BulkImportTest.java @@ -53,14 +53,17 @@ 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.VersionHistory; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.springframework.util.ResourceUtils; /** * @since 4.0 */ +@Category(OwnJVMTestsCategory.class) public class BulkImportTest extends AbstractBulkImportTests { private StreamingNodeImporterFactory streamingNodeImporterFactory; diff --git a/source/test-java/org/alfresco/repo/deploy/ASRDeploymentTest.java b/source/test-java/org/alfresco/repo/deploy/ASRDeploymentTest.java index 1b07437400..b0602c72de 100644 --- a/source/test-java/org/alfresco/repo/deploy/ASRDeploymentTest.java +++ b/source/test-java/org/alfresco/repo/deploy/ASRDeploymentTest.java @@ -39,13 +39,16 @@ import org.alfresco.service.cmr.avm.deploy.DeploymentService; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.LegacyCategory; import org.alfresco.util.NameMatcher; +import org.junit.experimental.categories.Category; /** * End to end test of deployment to an alfresco system receiver (ASR). * @author britt * @author mrogers */ +@Category(LegacyCategory.class) public class ASRDeploymentTest extends AVMServiceTestBase { diff --git a/source/test-java/org/alfresco/repo/deploy/DeploymentServiceImplFSTest.java b/source/test-java/org/alfresco/repo/deploy/DeploymentServiceImplFSTest.java index 436b9e03e6..27421ba078 100644 --- a/source/test-java/org/alfresco/repo/deploy/DeploymentServiceImplFSTest.java +++ b/source/test-java/org/alfresco/repo/deploy/DeploymentServiceImplFSTest.java @@ -38,10 +38,12 @@ import org.alfresco.service.cmr.avm.deploy.DeploymentReport; import org.alfresco.service.cmr.avm.deploy.DeploymentReportCallback; import org.alfresco.service.cmr.avm.deploy.DeploymentService; import org.alfresco.service.cmr.repository.ContentWriter; +import org.alfresco.test_category.LegacyCategory; import org.alfresco.util.Deleter; import org.alfresco.util.NameMatcher; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.experimental.categories.Category; import org.springframework.context.support.ClassPathXmlApplicationContext; /** @@ -49,6 +51,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; * @author britt * @author mrogers */ +@Category(LegacyCategory.class) public class DeploymentServiceImplFSTest extends AVMServiceTestBase { private File log = null; diff --git a/source/test-java/org/alfresco/repo/template/AVMTemplateNodeTest.java b/source/test-java/org/alfresco/repo/template/AVMTemplateNodeTest.java index 97b7bf8777..7d1c80fd5a 100644 --- a/source/test-java/org/alfresco/repo/template/AVMTemplateNodeTest.java +++ b/source/test-java/org/alfresco/repo/template/AVMTemplateNodeTest.java @@ -34,12 +34,15 @@ import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.LegacyCategory; import org.alfresco.util.ApplicationContextHelper; +import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; /** * @author Dmitry Velichkevich */ +@Category(LegacyCategory.class) public class AVMTemplateNodeTest extends TestCase { private static final String TEST_WCM_NAMESPACE = "http://www.alfresco.org/model/testwcmmodel/1.0"; diff --git a/source/test-java/org/alfresco/repo/workflow/jbpm/AlfrescoJavaScriptIntegrationTest.java b/source/test-java/org/alfresco/repo/workflow/jbpm/AlfrescoJavaScriptIntegrationTest.java index c88c026aca..8dd406017e 100644 --- a/source/test-java/org/alfresco/repo/workflow/jbpm/AlfrescoJavaScriptIntegrationTest.java +++ b/source/test-java/org/alfresco/repo/workflow/jbpm/AlfrescoJavaScriptIntegrationTest.java @@ -43,6 +43,7 @@ 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.BaseAlfrescoSpringTest; import org.alfresco.util.GUID; import org.alfresco.util.PropertyMap; @@ -52,9 +53,11 @@ import org.jbpm.context.exe.ContextInstance; import org.jbpm.graph.exe.ExecutionContext; import org.jbpm.graph.exe.Token; import org.jbpm.taskmgmt.exe.TaskInstance; +import org.junit.experimental.categories.Category; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +@Category(OwnJVMTestsCategory.class) public class AlfrescoJavaScriptIntegrationTest extends BaseAlfrescoSpringTest { private static final QName fooName = QName.createQName(NamespaceService.SYSTEM_MODEL_1_0_URI, "Foo"); diff --git a/source/test-java/org/alfresco/test_category/LegacyCategory.java b/source/test-java/org/alfresco/test_category/LegacyCategory.java new file mode 100644 index 0000000000..a126d80b12 --- /dev/null +++ b/source/test-java/org/alfresco/test_category/LegacyCategory.java @@ -0,0 +1,11 @@ +package org.alfresco.test_category; + +/** + * Marker interface to group tests which are legacy code that have been end of lifed or is no longer supported. + * + * @author Gethin James + */ +public interface LegacyCategory +{ + +}