Merged 5.2.N (5.2.1) to HEAD (5.2)

124214 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124088 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         123487 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            123142 mward: ACE-5120: further test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 15:54:34 +00:00
parent b7978ab162
commit 5cd5cf6dc0
3 changed files with 62 additions and 63 deletions

View File

@@ -258,7 +258,6 @@ public class ADMLuceneTest extends TestCase implements DictionaryListener
{
// Register the test model
dictionaryDAO.putModel(model);
namespaceDao.addPrefix("test", TEST_NAMESPACE);
}
public void setUp() throws Exception
@@ -1519,7 +1518,7 @@ public class ADMLuceneTest extends TestCase implements DictionaryListener
sp.addQueryTemplate("ANDY", "%cm:content");
sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
sp.excludeDataInTheCurrentTransaction(true);
sp.addSort("test:neverIndexed", false);
sp.addSort("lucene-test:neverIndexed", false);
results = searcher.query(sp);
assertEquals(16, results.length());
results.close();
@@ -1686,7 +1685,7 @@ public class ADMLuceneTest extends TestCase implements DictionaryListener
ftsQueryWithCount(searcher, qname + ":(<3.4 TO 4])", 0);
ftsQueryWithCount(searcher, qname + ":(<3.4 TO 3.4>)", 0);
ftsQueryWithCount(searcher, "test:float_x002D_ista:3.40", 1);
ftsQueryWithCount(searcher, "lucene-test:float_x002D_ista:3.40", 1);
ftsQueryWithCount(searcher, "lazy", 1);
ftsQueryWithCount(searcher, "laz*", 1);
@@ -4228,11 +4227,11 @@ public class ADMLuceneTest extends TestCase implements DictionaryListener
assertEquals(1, results.length());
results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PRIMARYASSOCTYPEQNAME:\"test:assoc\"", null);
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PRIMARYASSOCTYPEQNAME:\"lucene-test:assoc\"", null);
assertEquals(11, results.length());
results.close();
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "ASSOCTYPEQNAME:\"test:assoc\"", null);
results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "ASSOCTYPEQNAME:\"lucene-test:assoc\"", null);
assertEquals(11, results.length());
results.close();