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

58520: Upped the memory for the sameVM tests and categorised the AVM tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 23:46:49 +00:00
parent 6aac29b931
commit c0de7292bc
32 changed files with 120 additions and 2 deletions

View File

@@ -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;