[sling-org-apache-sling-scripting-thymeleaf] 12/39: fix positions of actual values and matchers

[ro...@apache.org]

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

rombert pushed a commit to annotated tag org.apache.sling.scripting.thymeleaf-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-thymeleaf.git

commit 4594cc2b1bedf4b8fad82ba871ede2923e852791
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Sep 17 12:35:36 2016 +0000

    fix positions of actual values and matchers
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf@1761206 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sling/scripting/thymeleaf/it/tests/AdaptToModelIT.java     |  2 +-
 .../sling/scripting/thymeleaf/it/tests/SlingIncludeIT.java     | 10 +++++-----
 .../thymeleaf/it/tests/ThymeleafScriptEngineFactoryIT.java     |  4 ++--
 .../sling/scripting/thymeleaf/it/tests/ThymeleafTextIT.java    |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/AdaptToModelIT.java b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/AdaptToModelIT.java
index 8424ad4..6dcba31 100644
--- a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/AdaptToModelIT.java
+++ b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/AdaptToModelIT.java
@@ -53,7 +53,7 @@ public class AdaptToModelIT extends ThymeleafTestSupport {
     @Test
     public void testPageName() {
         final Element name = document.getElementById("name");
-        assertThat("adaptto", is(name.text()));
+        assertThat(name.text(), is("adaptto"));
     }
 
 }
diff --git a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/SlingIncludeIT.java b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/SlingIncludeIT.java
index d245d43..8c53201 100644
--- a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/SlingIncludeIT.java
+++ b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/SlingIncludeIT.java
@@ -48,21 +48,21 @@ public class SlingIncludeIT extends ThymeleafTestSupport {
     @Test
     public void testJspIncludeSimple() {
         final Element simple = document.getElementById("simple");
-        assertThat("/content/thymeleaf/include", is(simple.text()));
+        assertThat(simple.text(), is("/content/thymeleaf/include"));
     }
 
     @Test
     public void testJspIncludeWrap() {
         final Element wrap = document.getElementById("wrap");
-        assertThat(1, is(wrap.children().size()));
-        assertThat("/content/thymeleaf/include", is(wrap.child(0).text()));
+        assertThat(wrap.children().size(), is(1));
+        assertThat(wrap.child(0).text(), is("/content/thymeleaf/include"));
     }
 
     @Test
     public void testJspIncludeUnwrap() {
         final Element unwrap = document.getElementById("unwrap");
-        assertThat(0, is(unwrap.children().size()));
-        assertThat("/content/thymeleaf/include", is(unwrap.text()));
+        assertThat(unwrap.children().size(), is(0));
+        assertThat(unwrap.text(), is("/content/thymeleaf/include"));
     }
 
 }
diff --git a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafScriptEngineFactoryIT.java b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafScriptEngineFactoryIT.java
index 4b16c7a..de0db6b 100644
--- a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafScriptEngineFactoryIT.java
+++ b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafScriptEngineFactoryIT.java
@@ -41,12 +41,12 @@ public class ThymeleafScriptEngineFactoryIT extends ThymeleafTestSupport {
 
     @Test
     public void testScriptEngineFactoryEngineName() {
-        assertThat("Apache Sling Scripting Thymeleaf", is(scriptEngineFactory.getEngineName()));
+        assertThat(scriptEngineFactory.getEngineName(), is("Apache Sling Scripting Thymeleaf"));
     }
 
     @Test
     public void testScriptEngineFactoryLanguageName() {
-        assertThat("Thymeleaf", is(scriptEngineFactory.getLanguageName()));
+        assertThat(scriptEngineFactory.getLanguageName(), is("Thymeleaf"));
     }
 
     @Test
diff --git a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTextIT.java b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTextIT.java
index dc827bc..6b0798d 100644
--- a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTextIT.java
+++ b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTextIT.java
@@ -53,7 +53,7 @@ public class ThymeleafTextIT extends ThymeleafTestSupport {
     @Test
     public void testResourceName() {
         final Element name = document.getElementById("name");
-        assertThat("text", is(name.text()));
+        assertThat(name.text(), is("text"));
     }
 
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.