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

58572: Added some tests to the own Jvm category


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/test-java/org/alfresco/repo/domain/hibernate/BorrowedConnectionProxyTest.java

@@ -26,9 +26,11 @@ import javax.transaction.UserTransaction;
 import junit.framework.TestCase;
 
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.hibernate.HibernateException;
 import org.hibernate.jdbc.BorrowedConnectionProxy;
+import org.junit.experimental.categories.Category;
 import org.springframework.context.ApplicationContext;
 import org.springframework.jdbc.datasource.ConnectionHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
@@ -38,6 +40,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * 
  * @author Derek Hulley
  */
+@Category(OwnJVMTestsCategory.class)
 public class BorrowedConnectionProxyTest extends TestCase
 {
     private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();

source/test-java/org/alfresco/repo/jscript/PeopleTest.java

@@ -30,9 +30,11 @@ import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.security.PersonService;
 import org.alfresco.service.cmr.security.PersonService.PersonInfo;
 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.ScriptPagingDetails;
+import org.junit.experimental.categories.Category;
 import org.springframework.context.ApplicationContext;
 
 /**
@@ -44,6 +46,7 @@ import org.springframework.context.ApplicationContext;
  * @author Jamal Kaabi-Mofrad
  * @since 4.2
  */
+@Category(OwnJVMTestsCategory.class)
 public class PeopleTest extends TestCase
 {
 

source/test-java/org/alfresco/repo/lock/mem/LockStoreImplTxTest.java

@@ -18,11 +18,15 @@
  */
 package org.alfresco.repo.lock.mem;
 
+import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.junit.experimental.categories.Category;
+
 /**
  * Test transaction related functions of {@link LockStoreImpl}.
  * 
  * @author Matt Ward
  */
+@Category(OwnJVMTestsCategory.class)
 public class LockStoreImplTxTest extends AbstractLockStoreTxTest<LockStoreImpl>
 {
     @Override

source/test-java/org/alfresco/repo/security/authority/AuthorityBridgeTableAsynchronouslyRefreshedCacheTest.java

@@ -18,6 +18,8 @@
  */
 package org.alfresco.repo.security.authority;
 
+import java.util.Set;
+
 import junit.framework.TestCase;
 
 import org.alfresco.error.AlfrescoRuntimeException;
@@ -25,19 +27,20 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.tenant.TenantAdminService;
 import org.alfresco.repo.tenant.TenantService;
 import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
-import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.security.AuthorityService;
 import org.alfresco.service.cmr.security.AuthorityType;
 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.GUID;
+import org.junit.experimental.categories.Category;
 import org.springframework.context.ApplicationContext;
 
-import java.util.Set;
+@Category(OwnJVMTestsCategory.class)
-
 public class AuthorityBridgeTableAsynchronouslyRefreshedCacheTest extends TestCase
 {
     private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();

source/test-java/org/alfresco/repo/workflow/jbpm/JbpmMultitenantWorkflowTest.java

@@ -20,6 +20,7 @@
 package org.alfresco.repo.workflow.jbpm;
 
 import org.alfresco.repo.workflow.AbstractMultitenantWorkflowTest;
+import org.alfresco.test_category.LegacyCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.junit.experimental.categories.Category;
 
@@ -28,7 +29,7 @@ import org.junit.experimental.categories.Category;
  * @since 4.0
  *
  */
-@Category(OwnJVMTestsCategory.class)
+@Category({OwnJVMTestsCategory.class, LegacyCategory.class})
 public class JbpmMultitenantWorkflowTest extends AbstractMultitenantWorkflowTest
 {
     @Override

source/test-java/org/alfresco/util/schemacomp/ExportDbTest.java

@@ -21,6 +21,7 @@ package org.alfresco.util.schemacomp;
 
 import javax.sql.DataSource;
 
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.schemacomp.model.Schema;
 import org.alfresco.util.schemacomp.test.exportdb.AbstractExportTester;
@@ -33,6 +34,7 @@ import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.springframework.context.ApplicationContext;
 import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -47,6 +49,7 @@ import org.springframework.transaction.PlatformTransactionManager;
  * @see AbstractExportTester
  * @author Matt Ward
  */
+@Category(OwnJVMTestsCategory.class)
 public class ExportDbTest
 {
     private ApplicationContext ctx;