Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

58807: Categorised some more tests, less experimentation git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62037 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-08-07 17:49:17 +00:00 · 2014-02-12 00:13:59 +00:00
parent b9507acf29
commit bfa69dcca9
22 changed files with 41 additions and 30 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -882,7 +882,6 @@
                                 <goals>
                                     <goal>test</goal>
                                 </goals>
-                                 <phase>process-test-classes</phase>
                                 <configuration>
                                     <groups>org.alfresco.test_category.BaseSpringTestsCategory</groups>
                                     <testFailureIgnore>true</testFailureIgnore>
@@ -894,7 +893,6 @@
                                 <goals>
                                     <goal>test</goal>
                                 </goals>
-                                 <phase>process-test-classes</phase>
                                 <configuration>
                                     <!-- <reuseForks>false</reuseForks> -->
                                     <groups>org.alfresco.test_category.OwnJVMTestsCategory</groups>
--- a/source/test-java/org/alfresco/jcr/importer/ImportTest.java
+++ b/source/test-java/org/alfresco/jcr/importer/ImportTest.java
@@ -24,11 +24,11 @@ import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;

 import org.alfresco.jcr.test.BaseJCRTest;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.LegacyCategory;
 import org.junit.experimental.categories.Category;
 import org.springframework.core.io.ClassPathResource;

-@Category(OwnJVMTestsCategory.class)
+@Category(LegacyCategory.class)
 public class ImportTest extends BaseJCRTest
 {
    protected Session superuserSession;
--- a/source/test-java/org/alfresco/jcr/item/ItemTest.java
+++ b/source/test-java/org/alfresco/jcr/item/ItemTest.java
@@ -37,6 +37,8 @@ import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.version.VersionService;
+import org.alfresco.test_category.LegacyCategory;
+import org.junit.experimental.categories.Category;


 /**
@@ -44,6 +46,7 @@ import org.alfresco.service.cmr.version.VersionService;
 * 
 * @author janv
 */
+@Category(LegacyCategory.class)
 public class ItemTest extends BaseJCRTest
 {
    protected Session session;
--- a/source/test-java/org/alfresco/repo/cache/CacheTest.java
+++ b/source/test-java/org/alfresco/repo/cache/CacheTest.java
@@ -33,7 +33,6 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti
 import org.alfresco.repo.transaction.TransactionListenerAdapter;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.transaction.TransactionService;
-import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.apache.commons.lang.mutable.MutableLong;
@@ -45,7 +44,7 @@ import org.springframework.context.ApplicationContext;
 * 
 * @author Derek Hulley 
 */
-@Category(BaseSpringTestsCategory.class)
+@Category(OwnJVMTestsCategory.class)
 public class CacheTest extends TestCase
 {
    private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(
--- 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,7 @@ 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.BaseSpringTestsCategory;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.junit.experimental.categories.Category;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -44,7 +44,7 @@ import org.springframework.context.ConfigurableApplicationContext;
 *
 * @since 4.0
 */
-@Category(BaseSpringTestsCategory.class)
+@Category(OwnJVMTestsCategory.class)
 public class SOLRDAOTest extends TestCase
 {
    private ConfigurableApplicationContext ctx = (ConfigurableApplicationContext) ApplicationContextHelper.getApplicationContext();
--- a/source/test-java/org/alfresco/repo/forms/processor/action/ActionFormProcessorTest.java
+++ b/source/test-java/org/alfresco/repo/forms/processor/action/ActionFormProcessorTest.java
@@ -55,6 +55,7 @@ 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.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.junit.After;
@@ -70,7 +71,7 @@ import org.springframework.context.ApplicationContext;
 * @author Neil Mc Erlean
 * @since 4.0
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class ActionFormProcessorTest
 {
    private static final ApplicationContext testContext = ApplicationContextHelper.getApplicationContext();
--- a/source/test-java/org/alfresco/repo/lock/JobLockServiceTest.java
+++ b/source/test-java/org/alfresco/repo/lock/JobLockServiceTest.java
@@ -27,7 +27,6 @@ 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.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.junit.experimental.categories.Category;
@@ -44,7 +43,7 @@ import org.springframework.context.ApplicationContext;
 * @since 3.2
 */
@SuppressWarnings("unused")
-@Category(BaseSpringTestsCategory.class)
+@Category(OwnJVMTestsCategory.class)
 public class JobLockServiceTest extends TestCase
 {
    public static final String NAMESPACE = "http://www.alfresco.org/test/JobLockServiceTest";
--- a/source/test-java/org/alfresco/repo/node/FullNodeServiceTest.java
+++ b/source/test-java/org/alfresco/repo/node/FullNodeServiceTest.java
@@ -37,6 +37,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.junit.experimental.categories.Category;
 import org.springframework.extensions.surf.util.I18NUtil;
@@ -48,7 +49,7 @@ import org.springframework.extensions.surf.util.I18NUtil;
 * 
 * @author Derek Hulley
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class FullNodeServiceTest extends BaseNodeServiceTest
 {
    protected NodeService getNodeService()
--- a/source/test-java/org/alfresco/repo/node/NodeServiceTest.java
+++ b/source/test-java/org/alfresco/repo/node/NodeServiceTest.java
@@ -81,7 +81,7 @@ import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
 import org.alfresco.service.transaction.TransactionService;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.GUID;
 import org.alfresco.util.Pair;
 import org.alfresco.util.PropertyMap;
@@ -104,7 +104,7 @@ import org.springframework.extensions.surf.util.I18NUtil;
 * @author Derek Hulley
 * @since 4.0
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class NodeServiceTest
 {
    public static final String NAMESPACE = "http://www.alfresco.org/test/BaseNodeServiceTest";
--- a/source/test-java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java
+++ b/source/test-java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java
@@ -33,6 +33,7 @@ import org.alfresco.service.cmr.oauth1.OAuth1CredentialsStoreService;
 import org.alfresco.service.cmr.remotecredentials.OAuth1CredentialsInfo;
 import org.alfresco.service.cmr.security.MutableAuthenticationService;
 import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.PropertyMap;
@@ -45,7 +46,7 @@ import org.junit.Test;
 import org.springframework.context.ApplicationContext;

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class OAuth1CredentialsStoreServiceTest
 {
    private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
--- a/source/test-java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java
+++ b/source/test-java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java
@@ -34,6 +34,7 @@ import org.alfresco.service.cmr.oauth2.OAuth2CredentialsStoreService;
 import org.alfresco.service.cmr.remotecredentials.OAuth2CredentialsInfo;
 import org.alfresco.service.cmr.security.MutableAuthenticationService;
 import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.PropertyMap;
@@ -43,7 +44,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.springframework.context.ApplicationContext;

-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class OAuth2CredentialsStoreServiceTest
 {
    private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
--- 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.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.test.junitrules.AlfrescoPerson;
 import org.alfresco.util.test.junitrules.ApplicationContextInit;
@@ -64,7 +65,7 @@ import org.junit.rules.RuleChain;
 * @author Roy Wetherall
 * @author Neil Mc Erlean (refactoring to JUnit Rules and enabling disabled tests)
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class PreferenceServiceImplTest
 {
    private static final Log log = LogFactory.getLog(PreferenceServiceImplTest.class);
--- a/source/test-java/org/alfresco/repo/publishing/PublishWebContentActivitiTest.java
+++ b/source/test-java/org/alfresco/repo/publishing/PublishWebContentActivitiTest.java
@@ -22,7 +22,7 @@ package org.alfresco.repo.publishing;
 import java.util.List;

 import org.alfresco.service.cmr.workflow.WorkflowPath;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.junit.experimental.categories.Category;


@@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category;
 * @author Frederik Heremans
 * @since 4.0
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class PublishWebContentActivitiTest extends PublishWebContentProcessTest
 {
    private static final String DEF_NAME = "activiti$publishWebContent";
--- a/source/test-java/org/alfresco/repo/publishing/PublishWebContentJbpmTest.java
+++ b/source/test-java/org/alfresco/repo/publishing/PublishWebContentJbpmTest.java
@@ -19,7 +19,7 @@

 package org.alfresco.repo.publishing;

-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.junit.experimental.categories.Category;


@@ -28,7 +28,7 @@ import org.junit.experimental.categories.Category;
 * @author Frederik Heremans
 * @since 4.0
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class PublishWebContentJbpmTest extends PublishWebContentProcessTest
 {
    private static final String DEF_NAME = "jbpm$publishWebContent";
--- a/source/test-java/org/alfresco/repo/workflow/jbpm/ReviewAndApproveTest.java
+++ b/source/test-java/org/alfresco/repo/workflow/jbpm/ReviewAndApproveTest.java
@@ -43,7 +43,7 @@ import org.alfresco.service.cmr.workflow.WorkflowPath;
 import org.alfresco.service.cmr.workflow.WorkflowTask;
 import org.alfresco.service.cmr.workflow.WorkflowTaskState;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.junit.experimental.categories.Category;
 import org.springframework.core.io.ClassPathResource;
@@ -54,7 +54,7 @@ import org.springframework.core.io.ClassPathResource;
 * 
 * @author davidc
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class ReviewAndApproveTest extends BaseSpringTest
 {
    AuthenticationComponent authenticationComponent;
--- a/source/test-java/org/alfresco/util/schemacomp/model/ColumnTest.java
+++ b/source/test-java/org/alfresco/util/schemacomp/model/ColumnTest.java
@@ -19,6 +19,7 @@
 package org.alfresco.util.schemacomp.model;


+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.schemacomp.DbProperty;
 import org.junit.Before;
@@ -32,7 +33,7 @@ import static org.junit.Assert.*;
 * Tests for the Column class.
 * @author Matt Ward
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class ColumnTest extends DbObjectTestBase<Column>
 {
    private Column thisColumn;
--- a/source/test-java/org/alfresco/util/schemacomp/model/ForeignKeyTest.java
+++ b/source/test-java/org/alfresco/util/schemacomp/model/ForeignKeyTest.java
@@ -22,6 +22,7 @@ package org.alfresco.util.schemacomp.model;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.verify;

+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.schemacomp.DbProperty;
 import org.junit.Before;
@@ -33,7 +34,7 @@ import org.junit.experimental.categories.Category;
 * 
 * @author Matt Ward
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class ForeignKeyTest extends DbObjectTestBase<ForeignKey>
 {
    private ForeignKey thisFK, thatFK;
--- a/source/test-java/org/alfresco/util/schemacomp/model/IndexTest.java
+++ b/source/test-java/org/alfresco/util/schemacomp/model/IndexTest.java
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.verify;

 import java.util.Arrays;

+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.schemacomp.DbProperty;
 import org.junit.Before;
@@ -35,7 +36,7 @@ import org.junit.experimental.categories.Category;
 * Tests for the Index class.
 * @author Matt Ward
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class IndexTest extends DbObjectTestBase<Index>
 {
    private Table thisTable;
--- a/source/test-java/org/alfresco/util/schemacomp/model/PrimaryKeyTest.java
+++ b/source/test-java/org/alfresco/util/schemacomp/model/PrimaryKeyTest.java
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.verify;
 import java.util.Arrays;
 import java.util.List;

+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.schemacomp.DbProperty;
 import org.junit.Before;
@@ -37,7 +38,7 @@ import org.junit.experimental.categories.Category;
 * 
 * @author Matt Ward
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class PrimaryKeyTest extends DbObjectTestBase<PrimaryKey>
 {
    private PrimaryKey thisPK;
--- a/source/test-java/org/alfresco/util/schemacomp/model/SchemaTest.java
+++ b/source/test-java/org/alfresco/util/schemacomp/model/SchemaTest.java
@@ -21,6 +21,7 @@ package org.alfresco.util.schemacomp.model;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.verify;

+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.schemacomp.DbProperty;
 import org.junit.Before;
@@ -36,7 +37,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 * @author Matt Ward
 */
@RunWith(MockitoJUnitRunner.class)
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class SchemaTest extends DbObjectTestBase<Schema>
 {
    private Schema left;
--- a/source/test-java/org/alfresco/util/schemacomp/model/SequenceTest.java
+++ b/source/test-java/org/alfresco/util/schemacomp/model/SequenceTest.java
@@ -20,6 +20,7 @@ package org.alfresco.util.schemacomp.model;

 import static org.mockito.Mockito.verify;

+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.junit.Before;
 import org.junit.Test;
@@ -29,7 +30,7 @@ import org.junit.experimental.categories.Category;
 * Tests for the Sequence class.
 * @author Matt Ward
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class SequenceTest extends DbObjectTestBase<Sequence>
 {
    private Sequence thisSequence;
--- a/source/test-java/org/alfresco/util/schemacomp/model/TableTest.java
+++ b/source/test-java/org/alfresco/util/schemacomp/model/TableTest.java
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.verify;
 import java.util.ArrayList;
 import java.util.List;

+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.junit.Before;
 import org.junit.Test;
@@ -39,7 +40,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 * @author Matt Ward
 */
@RunWith(MockitoJUnitRunner.class)
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class TableTest extends DbObjectTestBase<Table>
 {
    private Table table;