You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2020/02/22 22:39:28 UTC
[sling-org-apache-sling-scripting-freemarker] 01/02: style
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-freemarker.git
commit 51ad5bcd84900943e7d32884a746d828d0ab51e2
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Feb 22 23:37:01 2020 +0100
style
---
.../apache/sling/scripting/freemarker/it/tests/AdaptToModelIT.java | 7 ++++---
.../freemarker/it/tests/FreemarkerBindingsValuesProviderIT.java | 7 ++++---
.../freemarker/it/tests/FreemarkerScriptEngineFactoryIT.java | 5 +++--
.../org/apache/sling/scripting/freemarker/it/tests/IncludeIT.java | 5 +++--
.../org/apache/sling/scripting/freemarker/it/tests/SimpleIT.java | 7 ++++---
5 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/AdaptToModelIT.java b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/AdaptToModelIT.java
index 08740e7..cdc67ca 100644
--- a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/AdaptToModelIT.java
+++ b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/AdaptToModelIT.java
@@ -38,6 +38,7 @@ import org.ops4j.pax.exam.util.Filter;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
+import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
@RunWith(PaxExam.class)
@@ -52,12 +53,12 @@ public class AdaptToModelIT extends FreemarkerTestSupport {
@Configuration
public Option[] configuration() {
- return new Option[]{
+ return options(
baseConfiguration(),
factoryConfiguration("org.apache.sling.resource.presence.internal.ResourcePresenter")
.put("path", "/apps/freemarker/page/adaptto/html.ftl")
- .asOption(),
- };
+ .asOption()
+ );
}
@Before
diff --git a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerBindingsValuesProviderIT.java b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerBindingsValuesProviderIT.java
index 434fdfa..81fab72 100644
--- a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerBindingsValuesProviderIT.java
+++ b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerBindingsValuesProviderIT.java
@@ -37,6 +37,7 @@ import org.ops4j.pax.exam.util.Filter;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
+import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
@RunWith(PaxExam.class)
@@ -51,12 +52,12 @@ public class FreemarkerBindingsValuesProviderIT extends FreemarkerTestSupport {
@Configuration
public Option[] configuration() {
- return new Option[]{
+ return options(
baseConfiguration(),
factoryConfiguration("org.apache.sling.resource.presence.internal.ResourcePresenter")
.put("path", "/apps/freemarker/page/bindings/html.ftl")
- .asOption(),
- };
+ .asOption()
+ );
}
@Before
diff --git a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerScriptEngineFactoryIT.java b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerScriptEngineFactoryIT.java
index 7b0db77..fe228a5 100644
--- a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerScriptEngineFactoryIT.java
+++ b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerScriptEngineFactoryIT.java
@@ -38,6 +38,7 @@ import static org.hamcrest.Matchers.sameInstance;
import static org.hamcrest.Matchers.startsWith;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
+import static org.ops4j.pax.exam.CoreOptions.options;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
@@ -49,13 +50,13 @@ public class FreemarkerScriptEngineFactoryIT extends FreemarkerTestSupport {
@Configuration
public Option[] configuration() {
- return new Option[]{
+ return options(
baseConfiguration(),
buildBundleWithBnd(
Ranked1Configuration.class,
Ranked2Configuration.class
)
- };
+ );
}
@Test
diff --git a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/IncludeIT.java b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/IncludeIT.java
index 7e0d59b..b90760a 100644
--- a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/IncludeIT.java
+++ b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/IncludeIT.java
@@ -39,6 +39,7 @@ import org.ops4j.pax.exam.util.Filter;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
+import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
@RunWith(PaxExam.class)
@@ -57,12 +58,12 @@ public class IncludeIT extends FreemarkerTestSupport {
@Configuration
public Option[] configuration() {
- return new Option[]{
+ return options(
baseConfiguration(),
factoryConfiguration("org.apache.sling.resource.presence.internal.ResourcePresenter")
.put("path", "/apps/freemarker/page/include/html.ftl")
.asOption()
- };
+ );
}
@Before
diff --git a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/SimpleIT.java b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/SimpleIT.java
index a8c05ca..89075a2 100644
--- a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/SimpleIT.java
+++ b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/SimpleIT.java
@@ -38,6 +38,7 @@ import org.ops4j.pax.exam.util.Filter;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
+import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
@RunWith(PaxExam.class)
@@ -52,12 +53,12 @@ public class SimpleIT extends FreemarkerTestSupport {
@Configuration
public Option[] configuration() {
- return new Option[]{
+ return options(
baseConfiguration(),
factoryConfiguration("org.apache.sling.resource.presence.internal.ResourcePresenter")
.put("path", "/apps/freemarker/page/simple/html.ftl")
- .asOption(),
- };
+ .asOption()
+ );
}
@Before