inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
84345: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
      << About to revert HBF 78551 so need to revert this first >>
      79277: Merged DEV to HEAD-BUG-FIX
         79272 : MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
            - Fixed failures on V5.0


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84656 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-09-18 17:33:53 +00:00
parent a8cf4f2372
commit 87ff3cd051
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/test-java/org/alfresco/repo/web/scripts/tagging/TaggingServiceTest.java
View File

@@ -195,7 +195,6 @@ public class TaggingServiceTest extends BaseWebScriptTest
public void testTagCountSearch() throws Exception public void testTagCountSearch() throws Exception
{ {
int TAGS_NUM = 1200;
boolean removeTestFolder = false; boolean removeTestFolder = false;
boolean removeTagScope = false; boolean removeTagScope = false;
FileInfo testFolderInfo = null; FileInfo testFolderInfo = null;
@@ -214,7 +213,7 @@ public class TaggingServiceTest extends BaseWebScriptTest
//generate content with tag //generate content with tag
UserTransaction transaction = transactionService.getUserTransaction(); UserTransaction transaction = transactionService.getUserTransaction();
transaction.begin(); transaction.begin();
for (int i = 0; i < TAGS_NUM; i++) for (int i = 0; i < 1200; i++)
{ {
FileInfo file = this.fileFolderService.create(testFolderInfo.getNodeRef(), "testDoc" + i + ".txt", ContentModel.TYPE_CONTENT); FileInfo file = this.fileFolderService.create(testFolderInfo.getNodeRef(), "testDoc" + i + ".txt", ContentModel.TYPE_CONTENT);
this.taggingService.addTag(file.getNodeRef(), tagName); this.taggingService.addTag(file.getNodeRef(), tagName);
@@ -252,22 +251,12 @@ public class TaggingServiceTest extends BaseWebScriptTest
} }
// tag count via tagScope API // tag count via tagScope API
int BREAK_COUNT = 80; response = sendRequest(new GetRequest("api/tagscopes/node/" + testRoot.toString().replace(":/", "") + "/tags"), 200);
int counter = 1; jsonObj = new JSONObject(response.getContentAsString());
do tagsArr = jsonObj.getJSONArray("tags");
{ number = getTagNumber(tagName, tagsArr);
response = sendRequest(new GetRequest("api/tagscopes/node/" + testRoot.toString().replace(":/", "") + "/tags"), 200); assertEquals("Checking a search via tagScope API: Tag number must be 1200, because node is a tag scope.", 1200, number);
jsonObj = new JSONObject(response.getContentAsString());
tagsArr = jsonObj.getJSONArray("tags");
number = getTagNumber(tagName, tagsArr);
if (number == TAGS_NUM)
{
break;
}
Thread.sleep(500);
}
while (counter ++ <= BREAK_COUNT);
assertEquals("Checking a search via tagScope API: Tag number must be "+ TAGS_NUM + ", because node is a tag scope.", TAGS_NUM, number);
} }
finally finally
{ {