inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
58876: BDE-195 Fix tests in Maven
     Put FTPServerTest back into OwnJVM until MNT-10160 is fixed
     Put ThumbnailServiceImplTest back into OwnJVM too, as it is failing and seems to bring everything down
     Bring back RepositoryStartStopTest: this one is fine!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62053 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 00:26:34 +00:00
parent 0a746c042c
commit 995821ee71
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/test-java/org/alfresco/RepositoryStartStopTest.java
View File

@@ -28,11 +28,9 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.transaction.TransactionService; import org.alfresco.service.transaction.TransactionService;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.BaseApplicationContextHelper; import org.alfresco.util.BaseApplicationContextHelper;
import org.junit.experimental.categories.Category;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.AbstractApplicationContext;
@@ -53,7 +51,6 @@ import junit.framework.TestCase;
* *
* @author Nick Burch * @author Nick Burch
*/ */
@Category(OwnJVMTestsCategory.class)
public class RepositoryStartStopTest extends TestCase public class RepositoryStartStopTest extends TestCase
{ {
private ServiceRegistry serviceRegistry; private ServiceRegistry serviceRegistry;

4
source/test-java/org/alfresco/filesys/FTPServerTest.java
View File

@@ -44,7 +44,7 @@ import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.transaction.TransactionService; 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.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.PropertyMap; import org.alfresco.util.PropertyMap;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@@ -63,7 +63,7 @@ import org.springframework.context.ApplicationContext;
* Uses the commons-net ftp client library to connect to the * Uses the commons-net ftp client library to connect to the
* Alfresco FTP server. * Alfresco FTP server.
*/ */
@Category(BaseSpringTestsCategory.class) @Category(OwnJVMTestsCategory.class)
public class FTPServerTest extends TestCase public class FTPServerTest extends TestCase
{ {

4
source/test-java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java
View File

@@ -60,7 +60,7 @@ import org.alfresco.service.cmr.thumbnail.ThumbnailService;
import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.test_category.BaseSpringTestsCategory; import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.BaseAlfrescoSpringTest; import org.alfresco.util.BaseAlfrescoSpringTest;
import org.alfresco.util.TempFileProvider; import org.alfresco.util.TempFileProvider;
@@ -72,7 +72,7 @@ import org.junit.experimental.categories.Category;
* @author Roy Wetherall * @author Roy Wetherall
* @author Neil McErlean * @author Neil McErlean
*/ */
@Category(BaseSpringTestsCategory.class) @Category(OwnJVMTestsCategory.class)
public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
{ {
private NodeService secureNodeService; private NodeService secureNodeService;