[sling-org-apache-sling-testing-sling-mock] branch release/1.x updated: SLING-7449 sling-mock: Allow to set SlingScript in SlingScriptHelper

[ss...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a commit to branch release/1.x
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/release/1.x by this push:
     new 7409682  SLING-7449 sling-mock: Allow to set SlingScript in SlingScriptHelper
7409682 is described below

commit 7409682fb3f243fe11a2e20ae1d5ae1942d5a8d0
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 85ce5c4..b34a57d 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.
  */
-@aQute.bnd.annotation.Version("1.5")
+@aQute.bnd.annotation.Version("1.6")
 package org.apache.sling.testing.mock.sling;

-- 
To stop receiving notification emails like this one, please contact
sseifert@apache.org.