Author: olli
Date: Sat Sep 17 12:35:36 2016
New Revision: 1761206

URL: http://svn.apache.org/viewvc?rev=1761206&view=rev
Log:
fix positions of actual values and matchers

Modified:
    
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/AdaptToModelIT.java
    
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/SlingIncludeIT.java
    
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafScriptEngineFactoryIT.java
    
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTextIT.java

Modified: 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/AdaptToModelIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/AdaptToModelIT.java?rev=1761206&r1=1761205&r2=1761206&view=diff
==============================================================================
--- 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/AdaptToModelIT.java
 (original)
+++ 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/AdaptToModelIT.java
 Sat Sep 17 12:35:36 2016
@@ -53,7 +53,7 @@ public class AdaptToModelIT extends Thym
     @Test
     public void testPageName() {
         final Element name = document.getElementById("name");
-        assertThat("adaptto", is(name.text()));
+        assertThat(name.text(), is("adaptto"));
     }
 
 }

Modified: 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/SlingIncludeIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/SlingIncludeIT.java?rev=1761206&r1=1761205&r2=1761206&view=diff
==============================================================================
--- 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/SlingIncludeIT.java
 (original)
+++ 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/SlingIncludeIT.java
 Sat Sep 17 12:35:36 2016
@@ -48,21 +48,21 @@ public class SlingIncludeIT extends Thym
     @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"));
     }
 
 }

Modified: 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafScriptEngineFactoryIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafScriptEngineFactoryIT.java?rev=1761206&r1=1761205&r2=1761206&view=diff
==============================================================================
--- 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafScriptEngineFactoryIT.java
 (original)
+++ 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafScriptEngineFactoryIT.java
 Sat Sep 17 12:35:36 2016
@@ -41,12 +41,12 @@ public class ThymeleafScriptEngineFactor
 
     @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

Modified: 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTextIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTextIT.java?rev=1761206&r1=1761205&r2=1761206&view=diff
==============================================================================
--- 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTextIT.java
 (original)
+++ 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTextIT.java
 Sat Sep 17 12:35:36 2016
@@ -53,7 +53,7 @@ public class ThymeleafTextIT extends Thy
     @Test
     public void testResourceName() {
         final Element name = document.getElementById("name");
-        assertThat("text", is(name.text()));
+        assertThat(name.text(), is("text"));
     }
 
 }


Reply via email to