You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2018/01/26 11:14:46 UTC
[sling-org-apache-sling-testing-sling-mock] branch master updated:
SLING-7449 sling-mock: Allow to set SlingScript in SlingScriptHelper
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
The following commit(s) were added to refs/heads/master by this push:
new 1aa0b5b SLING-7449 sling-mock: Allow to set SlingScript in SlingScriptHelper
1aa0b5b is described below
commit 1aa0b5bf04a2f84693dda2388f9d15e0ad3428f5
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Fri Jan 26 12:11:19 2018 +0100
SLING-7449 sling-mock: Allow to set SlingScript in SlingScriptHelper
---
.../sling/testing/mock/sling/MockSlingScriptHelper.java | 17 +++++++++++------
.../apache/sling/testing/mock/sling/package-info.java | 2 +-
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelper.java b/src/main/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelper.java
index 5882d9d..bc68a72 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelper.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelper.java
@@ -35,11 +35,12 @@ import org.osgi.framework.ServiceReference;
/**
* Mock {@link SlingScriptHelper} implementation.
*/
-class MockSlingScriptHelper implements SlingScriptHelper {
+public final class MockSlingScriptHelper implements SlingScriptHelper {
private final SlingHttpServletRequest request;
private final SlingHttpServletResponse response;
private final BundleContext bundleContext;
+ private SlingScript script;
public MockSlingScriptHelper(final SlingHttpServletRequest request, final SlingHttpServletResponse response,
final BundleContext bundleContext) {
@@ -89,6 +90,15 @@ class MockSlingScriptHelper implements SlingScriptHelper {
}
}
+ @Override
+ public SlingScript getScript() {
+ return this.script;
+ }
+
+ public void setScript(SlingScript script) {
+ this.script = script;
+ }
+
// --- unsupported operations ---
@Override
public void dispose() {
@@ -126,11 +136,6 @@ class MockSlingScriptHelper implements SlingScriptHelper {
}
@Override
- public SlingScript getScript() {
- throw new UnsupportedOperationException();
- }
-
- @Override
public void include(final String path, final RequestDispatcherOptions requestDispatcherOptions) {
throw new UnsupportedOperationException();
}
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/package-info.java
index c0dc58f..69cd586 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/package-info.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/package-info.java
@@ -19,5 +19,5 @@
/**
* Mock implementation of selected Sling APIs.
*/
-@org.osgi.annotation.versioning.Version("3.0")
+@org.osgi.annotation.versioning.Version("3.1")
package org.apache.sling.testing.mock.sling;
--
To stop receiving notification emails like this one, please contact
sseifert@apache.org.