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

AVM unit test improvements

Browse Source 
- ensure AVMServiceTest.testSetup can run after AVMServicePermissionsTest.*
- include avm/**/*TestP.java (as per AVMTestSuite, until re-introduced)
- allow PurgeTestP to fail (if orphanReaper does not finish in max cycles)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19056 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-03-04 11:09:03 +00:00
parent 7f66912891
commit 765ee0c581
2 changed files with 61 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source/java/org/alfresco/repo/avm/AVMServicePermissionsTest.java
View File

@@ -52,7 +52,6 @@ import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.AccessPermission;
import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PermissionService;
@@ -1112,8 +1111,9 @@ public class AVMServicePermissionsTest extends TestCase
{
runAs(AuthenticationUtil.getAdminUserName());
String baseStore = "main";
String layeredStore = "layer";
String prefix = "PermissionsTest-" + getName() + "-" + (new Date().getTime());
String baseStore = prefix+"-main";
String layeredStore = prefix+"-layer";
try
{
@@ -1215,8 +1215,9 @@ public class AVMServicePermissionsTest extends TestCase
{
runAs(AuthenticationUtil.getAdminUserName());
String baseStore = "main";
String layeredStore = "layer";
String prefix = "PermissionsTest-" + getName() + "-" + (new Date().getTime());
String baseStore = prefix+"-main";
String layeredStore = prefix+"-layer";
try
{
@@ -1309,8 +1310,9 @@ public class AVMServicePermissionsTest extends TestCase
{
runAs(AuthenticationUtil.getAdminUserName());
String baseStore = "main";
String layeredStore = "layer";
String prefix = "PermissionsTest-" + getName() + "-" + (new Date().getTime());
String baseStore = prefix+"-main";
String layeredStore = prefix+"-layer";
try
{
@@ -1410,8 +1412,9 @@ public class AVMServicePermissionsTest extends TestCase
{
runAs(AuthenticationUtil.getAdminUserName());
String baseStore = "main";
String layeredStore = "layer";
String prefix = "PermissionsTest-" + getName() + "-" + (new Date().getTime());
String baseStore = prefix+"-main";
String layeredStore = prefix+"-layer";
try
{
@@ -1510,8 +1513,9 @@ public class AVMServicePermissionsTest extends TestCase
{
runAs(AuthenticationUtil.getAdminUserName());
String baseStore = "main";
String layeredStore = "layer";
String prefix = "PermissionsTest-" + getName() + "-" + (new Date().getTime());
String baseStore = prefix+"-main";
String layeredStore = prefix+"-layer";
try
{
@@ -1658,8 +1662,9 @@ public class AVMServicePermissionsTest extends TestCase
{
runAs(AuthenticationUtil.getAdminUserName());
String baseStore = "main";
String layeredStore = "layer";
String prefix = "PermissionsTest-" + getName() + "-" + (new Date().getTime());
String baseStore = prefix+"-main";
String layeredStore = prefix+"-layer";
try
{
@@ -1834,8 +1839,9 @@ public class AVMServicePermissionsTest extends TestCase
{
runAs(AuthenticationUtil.getAdminUserName());
String baseStore = "main";
String layeredStore = "layer";
String prefix = "PermissionsTest-" + getName() + "-" + (new Date().getTime());
String baseStore = prefix+"-main";
String layeredStore = prefix+"-layer";
try
{
@@ -1990,8 +1996,9 @@ public class AVMServicePermissionsTest extends TestCase
{
runAs(AuthenticationUtil.getAdminUserName());
String baseStore = "main";
String layeredStore = "layer";
String prefix = "PermissionsTest-" + getName() + "-" + (new Date().getTime());
String baseStore = prefix+"-main";
String layeredStore = prefix+"-layer";
try
{

79
source/java/org/alfresco/repo/avm/PurgeTestP.java
View File

@@ -18,6 +18,7 @@
package org.alfresco.repo.avm;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.avm.util.BulkLoader;
/**
@@ -47,20 +48,8 @@ public class PurgeTestP extends AVMServiceTestBase
fService.createSnapshot("main", null, null);
System.err.println("Load time + snapshot: " + (System.currentTimeMillis() - start) + "ms");
fService.purgeVersion(2, "main");
fReaper.activate();
while (fReaper.isActive())
{
try
{
System.out.print(".");
Thread.sleep(2000);
}
catch (InterruptedException e)
{
// Do nothing.
}
}
System.out.println("\nReaper finished");
runOrphanReaper();
}
catch (Exception e)
{
@@ -97,20 +86,8 @@ public class PurgeTestP extends AVMServiceTestBase
fService.createSnapshot("main", null, null);
fService.purgeVersion(2, "main");
fReaper.activate();
while (fReaper.isActive())
{
try
{
System.out.print(".");
Thread.sleep(2000);
}
catch (InterruptedException e)
{
// Do nothing.
}
}
System.out.println("\nReaper finished");
runOrphanReaper();
}
catch (Exception e)
{
@@ -151,20 +128,8 @@ public class PurgeTestP extends AVMServiceTestBase
fService.createSnapshot("main", null, null);
fService.purgeStore("main");
fReaper.activate();
while (fReaper.isActive())
{
try
{
System.out.print(".");
Thread.sleep(2000);
}
catch (InterruptedException e)
{
// Do nothing.
}
}
System.out.println("\nReaper finished");
runOrphanReaper();
}
catch (Exception e)
{
@@ -172,4 +137,34 @@ public class PurgeTestP extends AVMServiceTestBase
throw e;
}
}
private void runOrphanReaper()
{
fReaper.activate();
final int maxCycles = 50;
int cycles = 0;
while (fReaper.isActive() && (cycles <= maxCycles))
{
try
{
System.out.print(".");
Thread.sleep(2000);
}
catch (InterruptedException e)
{
// Do nothing.
}
cycles++;
}
if (cycles > maxCycles)
{
throw new AlfrescoRuntimeException("Orphan reaper still active - failed to clean orphans in "+cycles+" cycles (max "+maxCycles+")");
}
System.out.println("\nReaper finished (in "+cycles+" cycles)");
}
}