SLING-11601 support BVPs which provide properties with lazy evaluation (#17)
diff --git a/core/src/main/java/org/apache/sling/testing/mock/sling/context/MockSlingBindings.java b/core/src/main/java/org/apache/sling/testing/mock/sling/context/MockSlingBindings.java
index e177da5..b766d5a 100644
--- a/core/src/main/java/org/apache/sling/testing/mock/sling/context/MockSlingBindings.java
+++ b/core/src/main/java/org/apache/sling/testing/mock/sling/context/MockSlingBindings.java
@@ -20,10 +20,11 @@
import javax.jcr.Node;
import javax.jcr.Session;
-import javax.script.SimpleBindings;
+import javax.script.Bindings;
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.scripting.LazyBindings;
import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.scripting.api.BindingsValuesProvider;
import org.jetbrains.annotations.NotNull;
@@ -73,12 +74,13 @@
* Removes all (non-dynamic) properties from bindings and populates them from all registered {@link BindingsValuesProvider} implementations.
*/
private void populateFromBindingsValuesProvider() {
- SimpleBindings bindings = new SimpleBindings();
+ Bindings bindings = new LazyBindings();
for (BindingsValuesProvider provider : context.getServices(BindingsValuesProvider.class,
"(!(" + SERVICE_PROPERTY_MOCK_SLING_BINDINGS_IGNORE + "=true))")) {
provider.addBindings(bindings);
}
this.clear();
+ // if a provider added properties which are evaluated lazily, they are evaluated here.
this.putAll(bindings);
}
