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 V3.1 to HEAD

Browse Source 
13033: Back end support for ETHREEOH-1179
   13038: JAWS-436 - refactor WCM submit dialog to use WCM sandbox service + update unit tests
   13046: Merged V3.0 to V3.1
      13043: Merged V2.2 to V3.0
         13016: Fix for ETWOTWO-1088 (reset layer using flatten rather than delete & add, users can flatten in stores they own but not delete)
   13049: Build/test fix (WCM AssetTest)
   13057: Merged V2.1-A to V3.1
      8770: Added Flex SDK module
      8771: Added Flex SDK binary (swc)
      DH: I'm not sure about the svn:eol-style property appearing here.  SVN Clients?
   13059: Added 'AIX' as a platform type, from Adobe V2.1A, missed checkin.
   13060: [no comments]
   13061: [no comments]
   13063: [no comments]
   13064: [no comments]
   13066: [no comments]
   13067: Add NodeService.getChildrenByName
   13072: Added new NodeService.getChildrenByName() method to public-services-security-context.
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r13043
      Merged /alfresco/BRANCHES/V2.2:r13016
      Merged /alfresco/BRANCHES/V3.1:r13033,13038,13046,13049,13057,13059-13061,13063-13064,13066-13067,13072


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-11 04:21:44 +00:00
parent 5fa45757a4
commit 83b091f409
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/java/org/alfresco/repo/web/scripts/wcm/sandbox/AssetTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2008 Alfresco Software Limited.
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -74,6 +74,9 @@ public class AssetTest extends BaseWebScriptTest {
private static final String WEBAPP_ROOT = "ROOT";
private static final String WEBAPP_YELLOW = "YELLOW";
private static final String WEBAPP_GREEN = "GREEN";
private static final long SUBMIT_DELAY = 120000L; // 2 minutes - to allow time for async submit workflow to complete
private List<String> createdWebProjects = new ArrayList<String>(5);
@@ -231,6 +234,8 @@ public class AssetTest extends BaseWebScriptTest {
submitForm.put("all", true);
sendRequest(new PostRequest(submitterURL, submitForm.toString(), "application/json"), Status.STATUS_OK);
Thread.sleep(SUBMIT_DELAY);
/*
* Background set up now create a new file which is our test
*/
@@ -481,6 +486,8 @@ public class AssetTest extends BaseWebScriptTest {
submitForm.put("all", true);
sendRequest(new PostRequest(submitterURL, submitForm.toString(), "application/json"), Status.STATUS_OK);
Thread.sleep(SUBMIT_DELAY);
checkSandboxEmpty(webprojref, sandboxref);
}
@@ -498,7 +505,10 @@ public class AssetTest extends BaseWebScriptTest {
paths.put("/www/avm_webapps/ROOT/myFile3");
submitForm.put("paths", paths);
Response response = sendRequest(new PostRequest(submitterURL, submitForm.toString(), "application/json"), Status.STATUS_OK);
checkSandboxEmpty(webprojref, sandboxref);
Thread.sleep(SUBMIT_DELAY);
checkSandboxEmpty(webprojref, sandboxref);
}
/**
@@ -522,6 +532,9 @@ public class AssetTest extends BaseWebScriptTest {
Response response = sendRequest(new PostRequest(submitterURL, submitForm.toString(), "application/json"), Status.STATUS_OK);
}
Thread.sleep(SUBMIT_DELAY);
checkSandboxEmpty(webprojref, sandboxref);
@@ -556,6 +569,9 @@ public class AssetTest extends BaseWebScriptTest {
Response response = sendRequest(new PostRequest(submitterURL, submitForm.toString(), "application/json"), Status.STATUS_OK);
}
Thread.sleep(SUBMIT_DELAY);
checkSandboxEmpty(webprojref, sandboxref);
}
@@ -621,6 +637,8 @@ public class AssetTest extends BaseWebScriptTest {
Response response = sendRequest(new PostRequest(submitterURL, submitForm.toString(), "application/json"), Status.STATUS_OK);
Thread.sleep(SUBMIT_DELAY);
Response listTwo = sendRequest(new GetRequest(sandboxesURL), Status.STATUS_OK);
JSONObject resultTwo = new JSONObject(listTwo.getContentAsString());
JSONArray lookupResultTwo = resultTwo.getJSONArray("data");
@@ -635,6 +653,9 @@ public class AssetTest extends BaseWebScriptTest {
submitOmitted.put("paths", omitted);
sendRequest(new PostRequest(submitterURL, submitOmitted.toString(), "application/json"), Status.STATUS_OK);
}
Thread.sleep(SUBMIT_DELAY);
checkSandboxEmpty(webprojref, sandboxref);
}
@@ -674,6 +695,8 @@ public class AssetTest extends BaseWebScriptTest {
submitForm.put("all", true);
sendRequest(new PostRequest(submitterURL + "?webApp=" + WEBAPP_YELLOW, submitForm.toString(), "application/json"), Status.STATUS_OK);
Thread.sleep(SUBMIT_DELAY);
/**
* Get the modified asset (yellow should have been submitted leaving root
*/
@@ -852,6 +875,8 @@ public class AssetTest extends BaseWebScriptTest {
String submitterURL = URL_WEB_PROJECT + "/" + webprojref + URI_SANDBOXES + "/" + sandboxref + "/submitter";
sendRequest(new PostRequest(submitterURL, submitForm.toString(), "application/json"), Status.STATUS_OK);
Thread.sleep(SUBMIT_DELAY);
// Now we can set up the data that will get reverted
// single file in existing dir
@@ -945,6 +970,8 @@ public class AssetTest extends BaseWebScriptTest {
submitForm.put("comment", "the comment");
submitForm.put("all", true);
sendRequest(new PostRequest(submitterURL, submitForm.toString(), "application/json"), Status.STATUS_OK);
Thread.sleep(SUBMIT_DELAY);
/**
* Now we can set up our test data