Restructured tests for thymeleaf/thymeleaf#809 (OGNL)

thymeleaf · Dec 15, 2020 · 14892d2 · 14892d2
1 parent 838855c
commit 14892d2
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 12 deletions.
diff --git a/src/test/java/org/thymeleaf/templateengine/features/FeaturesTest.java b/src/test/java/org/thymeleaf/templateengine/features/FeaturesTest.java
@@ -211,6 +211,18 @@ public void testAccessRestrictions() throws Exception {
     }
 
 
+    @Test
+    public void testInstanceStaticRestrictions() throws Exception {
+
+        final TestExecutor executor = TestExecutorFactory.createTestExecutor();
+        executor.setThrottleStep(this.throttleStep);
+        executor.execute("classpath:templateengine/features/instancestaticrestrictions");
+
+        Assert.assertTrue(executor.isAllOK());
+
+    }
+
+
     @Test
     public void testInliningStandard() throws Exception {
 

diff --git a/...srestrictions/accessrestrictions37.thtest → ...tions/instancestaticrestrictions01.thtest b/...srestrictions/accessrestrictions37.thtest → ...tions/instancestaticrestrictions01.thtest
@@ -1,4 +1,4 @@
-%EXTENDS ../html5.01.common
+%TEMPLATE_MODE HTML
 # ------------------------------------------------------------
 %INPUT
 <p th:text="${new java.lang.String('hello')}">ALLOWED</p>

diff --git a/...srestrictions/accessrestrictions38.thtest → ...tions/instancestaticrestrictions02.thtest b/...srestrictions/accessrestrictions38.thtest → ...tions/instancestaticrestrictions02.thtest
@@ -1,4 +1,4 @@
-%EXTENDS ../html5.01.common
+%TEMPLATE_MODE HTML
 # ------------------------------------------------------------
 %INPUT
 <p th:text="${__${new java.lang.String('hello')}__}">NOT ALLOWED</p>

diff --git a/...srestrictions/accessrestrictions39.thtest → ...tions/instancestaticrestrictions03.thtest b/...srestrictions/accessrestrictions39.thtest → ...tions/instancestaticrestrictions03.thtest
@@ -1,4 +1,4 @@
-%EXTENDS ../html5.01.common
+%TEMPLATE_MODE HTML
 # ------------------------------------------------------------
 %INPUT
 <p th:at0="${new java.lang.String('hello')}">NOT ALLOWED</p>

diff --git a/...srestrictions/accessrestrictions40.thtest → ...tions/instancestaticrestrictions04.thtest b/...srestrictions/accessrestrictions40.thtest → ...tions/instancestaticrestrictions04.thtest
@@ -1,4 +1,4 @@
-%EXTENDS ../html5.01.common
+%TEMPLATE_MODE HTML
 # ------------------------------------------------------------
 %INPUT
 <p th:attr="at0=${new java.lang.String('hello')}">NOT ALLOWED</p>

diff --git a/...srestrictions/accessrestrictions41.thtest → ...tions/instancestaticrestrictions05.thtest b/...srestrictions/accessrestrictions41.thtest → ...tions/instancestaticrestrictions05.thtest
@@ -1,4 +1,4 @@
-%EXTENDS ../html5.01.common
+%TEMPLATE_MODE HTML
 # ------------------------------------------------------------
 %INPUT
 <p th:href="~{${new java.lang.String('hello')}}">NOT ALLOWED</p>

diff --git a/...srestrictions/accessrestrictions42.thtest → ...tions/instancestaticrestrictions06.thtest b/...srestrictions/accessrestrictions42.thtest → ...tions/instancestaticrestrictions06.thtest
@@ -1,4 +1,4 @@
-%EXTENDS ../html5.01.common
+%TEMPLATE_MODE HTML
 # ------------------------------------------------------------
 %INPUT
 <p th:insert="${new java.lang.String('hello')}">NOT ALLOWED</p>

diff --git a/...srestrictions/accessrestrictions43.thtest → ...tions/instancestaticrestrictions07.thtest b/...srestrictions/accessrestrictions43.thtest → ...tions/instancestaticrestrictions07.thtest
@@ -1,4 +1,4 @@
-%EXTENDS ../html5.01.common
+%TEMPLATE_MODE HTML
 # ------------------------------------------------------------
 %INPUT
 <p th:text="@{${new java.lang.String('hello')}}">NOT ALLOWED</p>

diff --git a/...srestrictions/accessrestrictions44.thtest → ...tions/instancestaticrestrictions08.thtest b/...srestrictions/accessrestrictions44.thtest → ...tions/instancestaticrestrictions08.thtest
@@ -1,4 +1,4 @@
-%EXTENDS ../html5.01.common
+%TEMPLATE_MODE HTML
 # ------------------------------------------------------------
 %INPUT
 <p th:text="${@org.thymeleaf.TemplateEngine@TIMER_LOGGER_NAME}">ALLOWED</p>

diff --git a/...srestrictions/accessrestrictions45.thtest → ...tions/instancestaticrestrictions09.thtest b/...srestrictions/accessrestrictions45.thtest → ...tions/instancestaticrestrictions09.thtest
@@ -1,4 +1,4 @@
-%EXTENDS ../html5.01.common
+%TEMPLATE_MODE HTML
 # ------------------------------------------------------------
 %INPUT
 <p th:text="${__${@org.thymeleaf.TemplateEngine@TIMER_LOGGER_NAME}__}">NOT ALLOWED</p>

diff --git a/...srestrictions/accessrestrictions46.thtest → ...tions/instancestaticrestrictions10.thtest b/...srestrictions/accessrestrictions46.thtest → ...tions/instancestaticrestrictions10.thtest
@@ -1,4 +1,4 @@
-%EXTENDS ../html5.01.common
+%TEMPLATE_MODE HTML
 # ------------------------------------------------------------
 %INPUT
 <p th:at0="${@org.thymeleaf.TemplateEngine@TIMER_LOGGER_NAME}">NOT ALLOWED</p>

diff --git a/...srestrictions/accessrestrictions47.thtest → ...tions/instancestaticrestrictions11.thtest b/...srestrictions/accessrestrictions47.thtest → ...tions/instancestaticrestrictions11.thtest
@@ -1,4 +1,4 @@
-%EXTENDS ../html5.01.common
+%TEMPLATE_MODE HTML
 # ------------------------------------------------------------
 %INPUT
 <p th:href="~{${@org.thymeleaf.TemplateEngine@TIMER_LOGGER_NAME}}">NOT ALLOWED</p>

diff --git a/...srestrictions/accessrestrictions48.thtest → ...tions/instancestaticrestrictions12.thtest b/...srestrictions/accessrestrictions48.thtest → ...tions/instancestaticrestrictions12.thtest
@@ -1,4 +1,4 @@
-%EXTENDS ../html5.01.common
+%TEMPLATE_MODE HTML
 # ------------------------------------------------------------
 %INPUT
 <p th:text="@{${@org.thymeleaf.TemplateEngine@TIMER_LOGGER_NAME}}">NOT ALLOWED</p>