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

Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)

Browse Source 
123488 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123145 mward: ACE-5120: fix ADMLuceneCategoryTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-03-15 14:59:04 +00:00
parent fd2ea599b0
commit df3a28d0cc
1 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
source/test-java/org/alfresco/repo/search/impl/lucene/ADMLuceneCategoryTest.java
View File

@@ -294,15 +294,15 @@ public class ADMLuceneCategoryTest extends TestCase
private void createTestTypes() private void createTestTypes()
{ {
M2Model model = M2Model.createModel("test:lucenecategory"); M2Model model = M2Model.createModel("adm-cat-test:lucenecategory");
model.createNamespace(TEST_NAMESPACE, "test"); model.createNamespace(TEST_NAMESPACE, "adm-cat-test");
model.createImport(NamespaceService.DICTIONARY_MODEL_1_0_URI, NamespaceService.DICTIONARY_MODEL_PREFIX); model.createImport(NamespaceService.DICTIONARY_MODEL_1_0_URI, NamespaceService.DICTIONARY_MODEL_PREFIX);
model.createImport(NamespaceService.CONTENT_MODEL_1_0_URI, NamespaceService.CONTENT_MODEL_PREFIX); model.createImport(NamespaceService.CONTENT_MODEL_1_0_URI, NamespaceService.CONTENT_MODEL_PREFIX);
regionCategorisationQName = QName.createQName(TEST_NAMESPACE, "region"); regionCategorisationQName = QName.createQName(TEST_NAMESPACE, "region");
M2Aspect generalCategorisation = model.createAspect("test:" + regionCategorisationQName.getLocalName()); M2Aspect generalCategorisation = model.createAspect("adm-cat-test:" + regionCategorisationQName.getLocalName());
generalCategorisation.setParentName("cm:" + ContentModel.ASPECT_CLASSIFIABLE.getLocalName()); generalCategorisation.setParentName("cm:" + ContentModel.ASPECT_CLASSIFIABLE.getLocalName());
M2Property genCatProp = generalCategorisation.createProperty("test:region"); M2Property genCatProp = generalCategorisation.createProperty("adm-cat-test:region");
genCatProp.setIndexed(true); genCatProp.setIndexed(true);
genCatProp.setIndexedAtomically(true); genCatProp.setIndexedAtomically(true);
genCatProp.setMandatory(true); genCatProp.setMandatory(true);
@@ -312,9 +312,9 @@ public class ADMLuceneCategoryTest extends TestCase
genCatProp.setType("d:" + DataTypeDefinition.CATEGORY.getLocalName()); genCatProp.setType("d:" + DataTypeDefinition.CATEGORY.getLocalName());
assetClassCategorisationQName = QName.createQName(TEST_NAMESPACE, "assetClass"); assetClassCategorisationQName = QName.createQName(TEST_NAMESPACE, "assetClass");
M2Aspect assetClassCategorisation = model.createAspect("test:" + assetClassCategorisationQName.getLocalName()); M2Aspect assetClassCategorisation = model.createAspect("adm-cat-test:" + assetClassCategorisationQName.getLocalName());
assetClassCategorisation.setParentName("cm:" + ContentModel.ASPECT_CLASSIFIABLE.getLocalName()); assetClassCategorisation.setParentName("cm:" + ContentModel.ASPECT_CLASSIFIABLE.getLocalName());
M2Property acProp = assetClassCategorisation.createProperty("test:assetClass"); M2Property acProp = assetClassCategorisation.createProperty("adm-cat-test:assetClass");
acProp.setIndexed(true); acProp.setIndexed(true);
acProp.setIndexedAtomically(true); acProp.setIndexedAtomically(true);
acProp.setMandatory(true); acProp.setMandatory(true);
@@ -324,9 +324,9 @@ public class ADMLuceneCategoryTest extends TestCase
acProp.setType("d:" + DataTypeDefinition.CATEGORY.getLocalName()); acProp.setType("d:" + DataTypeDefinition.CATEGORY.getLocalName());
investmentRegionCategorisationQName = QName.createQName(TEST_NAMESPACE, "investmentRegion"); investmentRegionCategorisationQName = QName.createQName(TEST_NAMESPACE, "investmentRegion");
M2Aspect investmentRegionCategorisation = model.createAspect("test:" + investmentRegionCategorisationQName.getLocalName()); M2Aspect investmentRegionCategorisation = model.createAspect("adm-cat-test:" + investmentRegionCategorisationQName.getLocalName());
investmentRegionCategorisation.setParentName("cm:" + ContentModel.ASPECT_CLASSIFIABLE.getLocalName()); investmentRegionCategorisation.setParentName("cm:" + ContentModel.ASPECT_CLASSIFIABLE.getLocalName());
M2Property irProp = investmentRegionCategorisation.createProperty("test:investmentRegion"); M2Property irProp = investmentRegionCategorisation.createProperty("adm-cat-test:investmentRegion");
irProp.setIndexed(true); irProp.setIndexed(true);
irProp.setIndexedAtomically(true); irProp.setIndexedAtomically(true);
irProp.setMandatory(true); irProp.setMandatory(true);
@@ -336,9 +336,9 @@ public class ADMLuceneCategoryTest extends TestCase
irProp.setType("d:" + DataTypeDefinition.CATEGORY.getLocalName()); irProp.setType("d:" + DataTypeDefinition.CATEGORY.getLocalName());
marketingRegionCategorisationQName = QName.createQName(TEST_NAMESPACE, "marketingRegion"); marketingRegionCategorisationQName = QName.createQName(TEST_NAMESPACE, "marketingRegion");
M2Aspect marketingRegionCategorisation = model.createAspect("test:" + marketingRegionCategorisationQName.getLocalName()); M2Aspect marketingRegionCategorisation = model.createAspect("adm-cat-test:" + marketingRegionCategorisationQName.getLocalName());
marketingRegionCategorisation.setParentName("cm:" + ContentModel.ASPECT_CLASSIFIABLE.getLocalName()); marketingRegionCategorisation.setParentName("cm:" + ContentModel.ASPECT_CLASSIFIABLE.getLocalName());
M2Property mrProp = marketingRegionCategorisation.createProperty("test:marketingRegion"); M2Property mrProp = marketingRegionCategorisation.createProperty("adm-cat-test:marketingRegion");
mrProp.setIndexed(true); mrProp.setIndexed(true);
mrProp.setIndexedAtomically(true); mrProp.setIndexedAtomically(true);
mrProp.setMandatory(true); mrProp.setMandatory(true);
@@ -416,7 +416,7 @@ public class ADMLuceneCategoryTest extends TestCase
ADMLuceneSearcherImpl searcher = buildSearcher(); ADMLuceneSearcherImpl searcher = buildSearcher();
ResultSet results; ResultSet results;
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//*\" AND (PATH:\"/test:assetClass/test:Equity/member\" PATH:\"/test:marketingRegion/member\")", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//*\" AND (PATH:\"/adm-cat-test:assetClass/adm-cat-test:Equity/member\" PATH:\"/adm-cat-test:marketingRegion/member\")", null);
//printPaths(results); //printPaths(results);
assertEquals(9, results.length()); assertEquals(9, results.length());
results.close(); results.close();
@@ -438,13 +438,13 @@ public class ADMLuceneCategoryTest extends TestCase
ADMLuceneSearcherImpl searcher = buildSearcher(); ADMLuceneSearcherImpl searcher = buildSearcher();
ResultSet results; ResultSet results;
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:marketingRegion\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:marketingRegion\"", null);
//printPaths(results); //printPaths(results);
assertEquals(1, results.length()); assertEquals(1, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:marketingRegion//member\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:marketingRegion//member\"", null);
//printPaths(results); //printPaths(results);
assertEquals(6, results.length()); assertEquals(6, results.length());
results.close(); results.close();
@@ -461,72 +461,72 @@ public class ADMLuceneCategoryTest extends TestCase
assertEquals(1, results.length()); assertEquals(1, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/cm:categoryContainer/cm:categoryRoot/test:assetClass\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/cm:categoryContainer/cm:categoryRoot/adm-cat-test:assetClass\"", null);
assertEquals(1, results.length()); assertEquals(1, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/cm:categoryContainer/cm:categoryRoot/test:assetClass/member\" ", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/cm:categoryContainer/cm:categoryRoot/adm-cat-test:assetClass/member\" ", null);
assertEquals(1, results.length()); assertEquals(1, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/cm:categoryContainer/cm:categoryRoot/test:assetClass/test:Fixed\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/cm:categoryContainer/cm:categoryRoot/adm-cat-test:assetClass/adm-cat-test:Fixed\"", null);
assertEquals(1, results.length()); assertEquals(1, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/cm:categoryContainer/cm:categoryRoot/test:assetClass/test:Equity\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/cm:categoryContainer/cm:categoryRoot/adm-cat-test:assetClass/adm-cat-test:Equity\"", null);
assertEquals(1, results.length()); assertEquals(1, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:assetClass\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:assetClass\"", null);
assertEquals(1, results.length()); assertEquals(1, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:assetClass/test:Fixed\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:assetClass/adm-cat-test:Fixed\"", null);
assertEquals(1, results.length()); assertEquals(1, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:assetClass/test:Equity\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:assetClass/adm-cat-test:Equity\"", null);
assertEquals(1, results.length()); assertEquals(1, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:assetClass/test:*\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:assetClass/adm-cat-test:*\"", null);
assertEquals(2, results.length()); assertEquals(2, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:assetClass//test:*\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:assetClass//adm-cat-test:*\"", null);
assertEquals(3, results.length()); assertEquals(3, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:assetClass/test:Fixed/member\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:assetClass/adm-cat-test:Fixed/member\"", null);
//printPaths(results); //printPaths(results);
assertEquals(8, results.length()); assertEquals(8, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:assetClass/test:Equity/member\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:assetClass/adm-cat-test:Equity/member\"", null);
//printPaths(results); //printPaths(results);
assertEquals(8, results.length()); assertEquals(8, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:assetClass/test:Equity/test:SpecialEquity/member//.\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:assetClass/adm-cat-test:Equity/adm-cat-test:SpecialEquity/member//.\"", null);
assertEquals(1, results.length()); assertEquals(1, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:assetClass/test:Equity/test:SpecialEquity/member//*\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:assetClass/adm-cat-test:Equity/adm-cat-test:SpecialEquity/member//*\"", null);
assertEquals(0, results.length()); assertEquals(0, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:assetClass/test:Equity/test:SpecialEquity/member\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:assetClass/adm-cat-test:Equity/adm-cat-test:SpecialEquity/member\"", null);
assertEquals(1, results.length()); assertEquals(1, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "+PATH:\"/test:assetClass/test:Equity/member\" AND +PATH:\"/test:assetClass/test:Fixed/member\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "+PATH:\"/adm-cat-test:assetClass/adm-cat-test:Equity/member\" AND +PATH:\"/adm-cat-test:assetClass/adm-cat-test:Fixed/member\"", null);
//printPaths(results); //printPaths(results);
assertEquals(3, results.length()); assertEquals(3, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:assetClass/test:Equity/member\" PATH:\"/test:assetClass/test:Fixed/member\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:assetClass/adm-cat-test:Equity/member\" PATH:\"/adm-cat-test:assetClass/adm-cat-test:Fixed/member\"", null);
//printPaths(results); //printPaths(results);
assertEquals(13, results.length()); assertEquals(13, results.length());
results.close(); results.close();
@@ -535,52 +535,52 @@ public class ADMLuceneCategoryTest extends TestCase
assertEquals(4, nodeService.getChildAssocs(catRoot).size()); assertEquals(4, nodeService.getChildAssocs(catRoot).size());
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:region\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:region\"", null);
//printPaths(results); //printPaths(results);
assertEquals(1, results.length()); assertEquals(1, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:region/member\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:region/member\"", null);
//printPaths(results); //printPaths(results);
assertEquals(1, results.length()); assertEquals(1, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:region/test:Europe/member\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:region/adm-cat-test:Europe/member\"", null);
//printPaths(results); //printPaths(results);
assertEquals(2, results.length()); assertEquals(2, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:region/test:RestOfWorld/member\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:region/adm-cat-test:RestOfWorld/member\"", null);
//printPaths(results); //printPaths(results);
assertEquals(2, results.length()); assertEquals(2, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:region//member\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:region//member\"", null);
//printPaths(results); //printPaths(results);
assertEquals(5, results.length()); assertEquals(5, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:investmentRegion//member\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:investmentRegion//member\"", null);
//printPaths(results); //printPaths(results);
assertEquals(5, results.length()); assertEquals(5, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:marketingRegion//member\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:marketingRegion//member\"", null);
//printPaths(results); //printPaths(results);
assertEquals(6, results.length()); assertEquals(6, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "+PATH:\"/test:assetClass/test:Fixed/member\" AND +PATH:\"/test:region/test:Europe/member\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "+PATH:\"/adm-cat-test:assetClass/adm-cat-test:Fixed/member\" AND +PATH:\"/adm-cat-test:region/adm-cat-test:Europe/member\"", null);
//printPaths(results); //printPaths(results);
assertEquals(2, results.length()); assertEquals(2, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "+PATH:\"/cm:categoryContainer/cm:categoryRoot/test:assetClass/test:Fixed/member\" AND +PATH:\"/cm:categoryContainer/cm:categoryRoot/test:region/test:Europe/member\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "+PATH:\"/cm:categoryContainer/cm:categoryRoot/adm-cat-test:assetClass/adm-cat-test:Fixed/member\" AND +PATH:\"/cm:categoryContainer/cm:categoryRoot/adm-cat-test:region/adm-cat-test:Europe/member\"", null);
//printPaths(results); //printPaths(results);
assertEquals(2, results.length()); assertEquals(2, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/test:assetClass/test:Equity/member\" PATH:\"/test:marketingRegion/member\"", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/adm-cat-test:assetClass/adm-cat-test:Equity/member\" PATH:\"/adm-cat-test:marketingRegion/member\"", null);
//printPaths(results); //printPaths(results);
assertEquals(9, results.length()); assertEquals(9, results.length());
results.close(); results.close();
@@ -603,11 +603,11 @@ public class ADMLuceneCategoryTest extends TestCase
ResultSet ResultSet
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/cm:categoryContainer/cm:categoryRoot/test:assetClass/*\" ", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/cm:categoryContainer/cm:categoryRoot/adm-cat-test:assetClass/*\" ", null);
assertEquals(3, results.length()); assertEquals(3, results.length());
results.close(); results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/cm:categoryContainer/cm:categoryRoot/test:assetClass/member\" ", null); results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/cm:categoryContainer/cm:categoryRoot/adm-cat-test:assetClass/member\" ", null);
assertEquals(1, results.length()); assertEquals(1, results.length());
results.close(); results.close();
@@ -710,7 +710,7 @@ public class ADMLuceneCategoryTest extends TestCase
DynamicNamespacePrefixResolver nspr = new DynamicNamespacePrefixResolver(null); DynamicNamespacePrefixResolver nspr = new DynamicNamespacePrefixResolver(null);
nspr.registerNamespace(NamespaceService.CONTENT_MODEL_PREFIX, NamespaceService.CONTENT_MODEL_1_0_URI); nspr.registerNamespace(NamespaceService.CONTENT_MODEL_PREFIX, NamespaceService.CONTENT_MODEL_1_0_URI);
nspr.registerNamespace("namespace", "namespace"); nspr.registerNamespace("namespace", "namespace");
nspr.registerNamespace("test", TEST_NAMESPACE); nspr.registerNamespace("adm-cat-test", TEST_NAMESPACE);
nspr.registerNamespace(NamespaceService.DEFAULT_PREFIX, defaultURI); nspr.registerNamespace(NamespaceService.DEFAULT_PREFIX, defaultURI);
return nspr; return nspr;
} }