You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:17:53 UTC
[sling-org-apache-sling-testing-jcr-mock] 15/17: SLING-4230 Add
support for mocking queries and query results
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.jcr-mock-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-jcr-mock.git
commit 86f801a31c946eaebb29cee18c2c88a92f819588
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Dec 9 15:59:35 2014 +0000
SLING-4230 Add support for mocking queries and query results
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/jcr-mock@1644096 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java | 11 +++++++----
.../apache/sling/testing/mock/jcr/MockQueryManagerTest.java | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java b/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
index 221dd1d..0e54f25 100644
--- a/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
+++ b/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
@@ -116,23 +116,26 @@ public final class MockJcr {
* Sets the expected result list for all queries with the given statement executed with the given query manager.
* @param session JCR session
* @param statement Query statement
+ * @param language Query language
* @param resultList Result list
*/
- public static void setQueryResult(final Session session, final String statement, final List<Node> resultList) {
- setQueryResult(getQueryManager(session), statement, resultList);
+ public static void setQueryResult(final Session session, final String statement, final String language, final List<Node> resultList) {
+ setQueryResult(getQueryManager(session), statement, language, resultList);
}
/**
* Sets the expected result list for all queries with the given statement executed with the given query manager.
* @param queryManager Mocked query manager
* @param statement Query statement
+ * @param language Query language
* @param resultList Result list
*/
- public static void setQueryResult(final QueryManager queryManager, final String statement, final List<Node> resultList) {
+ public static void setQueryResult(final QueryManager queryManager, final String statement, final String language, final List<Node> resultList) {
addQueryResultHandler(queryManager, new MockQueryResultHandler() {
@Override
public MockQueryResult executeQuery(MockQuery query) {
- if (StringUtils.equals(query.getStatement(), statement)) {
+ if (StringUtils.equals(query.getStatement(), statement)
+ && StringUtils.equals(query.getLanguage(), language)) {
return new MockQueryResult(resultList);
}
else {
diff --git a/src/test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java b/src/test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java
index 6903e41..8280ab6 100644
--- a/src/test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/jcr/MockQueryManagerTest.java
@@ -95,7 +95,7 @@ public class MockQueryManagerTest {
@SuppressWarnings("unchecked")
@Test
public void testQueryResults_SpecificQuery() throws RepositoryException {
- MockJcr.setQueryResult(queryManager, "query1", sampleNodes);
+ MockJcr.setQueryResult(queryManager, "query1", Query.JCR_SQL2, sampleNodes);
Query query = queryManager.createQuery("query1", Query.JCR_SQL2);
QueryResult result = query.execute();
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.