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

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

Browse Source 
60606: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60485: Increased ThumbnailServiceTest retry count during async. checking.  Fixed spelling and removed unused code.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62339 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 14:17:03 +00:00
parent 94d38928d4
commit dfa6af3f08
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/test-java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java
View File

@@ -32,18 +32,17 @@ import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.repository.ContentService; import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.GUID; import org.alfresco.util.GUID;
import org.alfresco.util.PropertyMap; import org.alfresco.util.PropertyMap;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest; import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest; import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.Response; import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
import org.json.JSONArray;
import org.json.JSONObject;
/** /**
* Unit test to test thumbnail web script API * Unit test to test thumbnail web script API
@@ -57,7 +56,6 @@ public class ThumbnailServiceTest extends BaseWebScriptTest
private NodeRef pdfNode; private NodeRef pdfNode;
private NodeRef jpgNode; private NodeRef jpgNode;
private NodeService nodeService;
private FileFolderService fileFolderService; private FileFolderService fileFolderService;
private ContentService contentService; private ContentService contentService;
private Repository repositoryHelper; private Repository repositoryHelper;
@@ -72,7 +70,6 @@ public class ThumbnailServiceTest extends BaseWebScriptTest
{ {
super.setUp(); super.setUp();
this.nodeService = (NodeService)getServer().getApplicationContext().getBean("NodeService");
this.fileFolderService = (FileFolderService)getServer().getApplicationContext().getBean("FileFolderService"); this.fileFolderService = (FileFolderService)getServer().getApplicationContext().getBean("FileFolderService");
this.contentService = (ContentService)getServer().getApplicationContext().getBean("ContentService"); this.contentService = (ContentService)getServer().getApplicationContext().getBean("ContentService");
this.repositoryHelper = (Repository)getServer().getApplicationContext().getBean("repositoryHelper"); this.repositoryHelper = (Repository)getServer().getApplicationContext().getBean("repositoryHelper");
@@ -296,11 +293,11 @@ public class ThumbnailServiceTest extends BaseWebScriptTest
{ {
String url = "/api/node/" + node.getStoreRef().getProtocol() + "/" + node.getStoreRef().getIdentifier() + "/" + node.getId() + "/content/thumbnails/" + thumbnailName; String url = "/api/node/" + node.getStoreRef().getProtocol() + "/" + node.getStoreRef().getIdentifier() + "/" + node.getId() + "/content/thumbnails/" + thumbnailName;
int retrys = 10; int retries = 50;
int trys = 0; int tries = 0;
while (true) while (true)
{ {
if (trys >= retrys) if (tries >= retries)
{ {
fail("Thumbnail never gets created " + thumbnailName); fail("Thumbnail never gets created " + thumbnailName);
} }
@@ -320,7 +317,7 @@ public class ThumbnailServiceTest extends BaseWebScriptTest
Thread.sleep(100); Thread.sleep(100);
} }
trys++; tries++;
} }
} }