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

61048: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60930: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60804: MNT-9595: Merged DEV to V4.1-BUG-FIX (4.1.8)
            57553: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               - Tag queries are unlimited. Make paginator in ConsoleTagManagement to fetch data by portions for tags actually displayed.
            57586: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               -  Do filter by tag name on SOLR side.
            60643: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               -  Prepend wildcard to the filter to match the old contains behaviour. Add unit tests for the tag and category filtering.
            60765: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               -  Add test for wildcard matches support.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62380 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 14:48:36 +00:00
parent d62668db53
commit c66a25e95d
8 changed files with 235 additions and 7 deletions

View File

@@ -740,6 +740,18 @@ public class ADMLuceneCategoryTest extends TestCase
tx = transactionService.getUserTransaction();
tx.begin();
assertEquals(3, categoryService.getRootCategories(rootNodeRef.getStoreRef(), QName.createQName(TEST_NAMESPACE, "assetClass")).size());
Collection<ChildAssociationRef> fruitCategories = categoryService.getRootCategories(rootNodeRef.getStoreRef(), QName.createQName(TEST_NAMESPACE, "assetClass"), "Fruit");
assertEquals(1, fruitCategories.size());
assertTrue(fruitCategories.iterator().next().getQName().toString().contains("Fruit"));
fruitCategories = categoryService.getRootCategories(rootNodeRef.getStoreRef(), QName.createQName(TEST_NAMESPACE, "assetClass"), "Fru");
assertEquals(1, fruitCategories.size());
assertTrue(fruitCategories.iterator().next().getQName().toString().contains("Fruit"));
fruitCategories = categoryService.getRootCategories(rootNodeRef.getStoreRef(), QName.createQName(TEST_NAMESPACE, "assetClass"), "rui");
assertEquals(1, fruitCategories.size());
assertTrue(fruitCategories.iterator().next().getQName().toString().contains("Fruit"));
fruitCategories = categoryService.getRootCategories(rootNodeRef.getStoreRef(), QName.createQName(TEST_NAMESPACE, "assetClass"), "uit");
assertEquals(1, fruitCategories.size());
assertTrue(fruitCategories.iterator().next().getQName().toString().contains("Fruit"));
assertEquals(3, categoryService.getCategories(rootNodeRef.getStoreRef(), QName.createQName(TEST_NAMESPACE, "assetClass"), CategoryService.Depth.IMMEDIATE).size());
assertEquals(4, categoryService.getCategories(rootNodeRef.getStoreRef(), QName.createQName(TEST_NAMESPACE, "assetClass"), CategoryService.Depth.ANY).size());

View File

@@ -66,6 +66,7 @@ import org.alfresco.service.transaction.TransactionService;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.GUID;
import org.alfresco.util.Pair;
import org.alfresco.util.PropertyMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -337,6 +338,15 @@ public class TaggingServiceImplTest extends TestCase
assertTrue(tags.contains(TAG_1));
assertTrue(tags.contains(LOWER_TAG));
// Get Paged tags with filter
Pair<List<String>, Integer> pagedTags = taggingService.getPagedTags(TaggingServiceImplTest.storeRef, "one", 0 ,10);
assertNotNull(pagedTags);
List<String> tagPage = pagedTags.getFirst();
int allFilteredTagsCount = pagedTags.getSecond();
assertEquals(1, allFilteredTagsCount);
assertEquals(1, tagPage.size());
assertTrue(tagPage.get(0).contains("one"));
// Check isTag method
assertFalse(taggingService.isTag(TaggingServiceImplTest.storeRef, TAG_2));
assertTrue(taggingService.isTag(TaggingServiceImplTest.storeRef, TAG_1));