Merged V2.2 to HEAD

10953: Merged V2.1 to V2.2
      10904: AVM - add test suite wrapper, update existing tests to purge test stores (rather than all stores)
      10909: AVM - unit test updates only (exposed further tests via test suite)
      10947: AVM - unit test update only (extra checks)
   10969: Merged V2.1 to V2.2 (cont)
      10904: AVM - add test suite wrapper, update existing tests to purge test stores (rather than all stores)
   11054: Fixed blind failures in AVM unit tests
   11064: AVM - unit test error handling
   11068: Temporarily remove AvmTestSuite from the build
   11074: AVM - unit tests - added error stack on concurrency tests (to show failure in build output), removed 1 hour freeze, put back AVM test suite
   11218: Merged V2.1 to V2.2
      11217: AVM - unit test fix ("n must be positive")


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-10-07 00:57:23 +00:00
parent 2f2af720da
commit 5407e7ff37
13 changed files with 675 additions and 289 deletions

View File

@@ -34,14 +34,40 @@ import org.alfresco.repo.avm.util.BulkReader;
*/
public class AVMScaleTestP extends AVMServiceTestBase
{
public void testScaling()
public void testScaleA()
{
testScaling(1,
"source/java/org/alfresco/repo/avm/actions", // relative from .../repository
1);
}
public void testScaleB()
{
testScaling(2,
"source/java/org/alfresco/repo/avm", // relative from .../repository
2);
}
/*
public void xtestScaleZ()
{
testScaling(250,
"/Users/britt/hibernate-3.1",
10);
}
*/
/**
* Do the scale test
*
* @param n Number of bulkloads to do
* @param fsPath The path in the filesystem to load (tree of stuff) from
* @param futzCount The number of post snapshot modifications to make after each load
*/
private void testScaling(int n, String fsPath, int futzCount)
{
int n = 250; // The number of BulkLoads to do.
try
{
int futzCount = 10; // The number of post snapshot modifications to make after each load.
String load = "config/alfresco"; // The tree of stuff to load.
BulkLoader loader = new BulkLoader();
loader.setAvmService(fService);
loader.setPropertyCount(50);
@@ -52,7 +78,7 @@ public class AVMScaleTestP extends AVMServiceTestBase
{
System.out.println("Round " + (i + 1));
fService.createStore("store" + i);
loader.recursiveLoad(load, "store" + i + ":/");
loader.recursiveLoad(fsPath, "store" + i + ":/");
fService.createSnapshot("store" + i, null, null);
long now = System.currentTimeMillis();
System.out.println("Load Time: " + (now - lastTime) + "ms");
@@ -68,7 +94,10 @@ public class AVMScaleTestP extends AVMServiceTestBase
{
for (int i = 0; i < n; i++)
{
if (fService.getStore("store" + i) != null) { fService.purgeStore("store" + i); }
if (fService.getStore("store" + i) != null)
{
fService.purgeStore("store" + i);
}
}
}
}