From 14892d2f4591fe715520c5dba908770efef926f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Sat, 12 Dec 2020 02:05:21 +0100
Subject: [PATCH] Restructured tests for thymeleaf/thymeleaf#809 (OGNL)

---
 .../templateengine/features/FeaturesTest.java        | 12 ++++++++++++
 .../instancestaticrestrictions01.thtest}             |  2 +-
 .../instancestaticrestrictions02.thtest}             |  2 +-
 .../instancestaticrestrictions03.thtest}             |  2 +-
 .../instancestaticrestrictions04.thtest}             |  2 +-
 .../instancestaticrestrictions05.thtest}             |  2 +-
 .../instancestaticrestrictions06.thtest}             |  2 +-
 .../instancestaticrestrictions07.thtest}             |  2 +-
 .../instancestaticrestrictions08.thtest}             |  2 +-
 .../instancestaticrestrictions09.thtest}             |  2 +-
 .../instancestaticrestrictions10.thtest}             |  2 +-
 .../instancestaticrestrictions11.thtest}             |  2 +-
 .../instancestaticrestrictions12.thtest}             |  2 +-
 13 files changed, 24 insertions(+), 12 deletions(-)
 rename src/test/resources/templateengine/features/{accessrestrictions/accessrestrictions37.thtest => instancestaticrestrictions/instancestaticrestrictions01.thtest} (88%)
 rename src/test/resources/templateengine/features/{accessrestrictions/accessrestrictions38.thtest => instancestaticrestrictions/instancestaticrestrictions02.thtest} (92%)
 rename src/test/resources/templateengine/features/{accessrestrictions/accessrestrictions39.thtest => instancestaticrestrictions/instancestaticrestrictions03.thtest} (92%)
 rename src/test/resources/templateengine/features/{accessrestrictions/accessrestrictions40.thtest => instancestaticrestrictions/instancestaticrestrictions04.thtest} (92%)
 rename src/test/resources/templateengine/features/{accessrestrictions/accessrestrictions41.thtest => instancestaticrestrictions/instancestaticrestrictions05.thtest} (92%)
 rename src/test/resources/templateengine/features/{accessrestrictions/accessrestrictions42.thtest => instancestaticrestrictions/instancestaticrestrictions06.thtest} (92%)
 rename src/test/resources/templateengine/features/{accessrestrictions/accessrestrictions43.thtest => instancestaticrestrictions/instancestaticrestrictions07.thtest} (92%)
 rename src/test/resources/templateengine/features/{accessrestrictions/accessrestrictions44.thtest => instancestaticrestrictions/instancestaticrestrictions08.thtest} (90%)
 rename src/test/resources/templateengine/features/{accessrestrictions/accessrestrictions45.thtest => instancestaticrestrictions/instancestaticrestrictions09.thtest} (92%)
 rename src/test/resources/templateengine/features/{accessrestrictions/accessrestrictions46.thtest => instancestaticrestrictions/instancestaticrestrictions10.thtest} (92%)
 rename src/test/resources/templateengine/features/{accessrestrictions/accessrestrictions47.thtest => instancestaticrestrictions/instancestaticrestrictions11.thtest} (92%)
 rename src/test/resources/templateengine/features/{accessrestrictions/accessrestrictions48.thtest => instancestaticrestrictions/instancestaticrestrictions12.thtest} (92%)

diff --git a/src/test/java/org/thymeleaf/templateengine/features/FeaturesTest.java b/src/test/java/org/thymeleaf/templateengine/features/FeaturesTest.java
index 2a72e2f9..7b1b7071 100644
--- 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/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions37.thtest b/src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions01.thtest
similarity index 88%
rename from src/test/resources/templateengine/features/accessrestrictions/accessrestrictions37.thtest
rename to src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions01.thtest
index 5987aa5a..870a4cb5 100644
--- a/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions37.thtest
+++ b/src/test/resources/templateengine/features/instancestaticrestrictions/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/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions38.thtest b/src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions02.thtest
similarity index 92%
rename from src/test/resources/templateengine/features/accessrestrictions/accessrestrictions38.thtest
rename to src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions02.thtest
index 2b609161..ebfc5b35 100644
--- a/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions38.thtest
+++ b/src/test/resources/templateengine/features/instancestaticrestrictions/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/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions39.thtest b/src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions03.thtest
similarity index 92%
rename from src/test/resources/templateengine/features/accessrestrictions/accessrestrictions39.thtest
rename to src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions03.thtest
index 4b36f7dd..1347f153 100644
--- a/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions39.thtest
+++ b/src/test/resources/templateengine/features/instancestaticrestrictions/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/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions40.thtest b/src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions04.thtest
similarity index 92%
rename from src/test/resources/templateengine/features/accessrestrictions/accessrestrictions40.thtest
rename to src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions04.thtest
index d518e31b..b4e56761 100644
--- a/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions40.thtest
+++ b/src/test/resources/templateengine/features/instancestaticrestrictions/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/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions41.thtest b/src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions05.thtest
similarity index 92%
rename from src/test/resources/templateengine/features/accessrestrictions/accessrestrictions41.thtest
rename to src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions05.thtest
index 70ba2b95..15927253 100644
--- a/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions41.thtest
+++ b/src/test/resources/templateengine/features/instancestaticrestrictions/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/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions42.thtest b/src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions06.thtest
similarity index 92%
rename from src/test/resources/templateengine/features/accessrestrictions/accessrestrictions42.thtest
rename to src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions06.thtest
index f685ea66..285ab069 100644
--- a/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions42.thtest
+++ b/src/test/resources/templateengine/features/instancestaticrestrictions/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/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions43.thtest b/src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions07.thtest
similarity index 92%
rename from src/test/resources/templateengine/features/accessrestrictions/accessrestrictions43.thtest
rename to src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions07.thtest
index 31bdf26a..f323c992 100644
--- a/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions43.thtest
+++ b/src/test/resources/templateengine/features/instancestaticrestrictions/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/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions44.thtest b/src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions08.thtest
similarity index 90%
rename from src/test/resources/templateengine/features/accessrestrictions/accessrestrictions44.thtest
rename to src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions08.thtest
index fdd7a8b3..7f833d2f 100644
--- a/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions44.thtest
+++ b/src/test/resources/templateengine/features/instancestaticrestrictions/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/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions45.thtest b/src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions09.thtest
similarity index 92%
rename from src/test/resources/templateengine/features/accessrestrictions/accessrestrictions45.thtest
rename to src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions09.thtest
index e9ae76de..faeaedb8 100644
--- a/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions45.thtest
+++ b/src/test/resources/templateengine/features/instancestaticrestrictions/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/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions46.thtest b/src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions10.thtest
similarity index 92%
rename from src/test/resources/templateengine/features/accessrestrictions/accessrestrictions46.thtest
rename to src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions10.thtest
index 869a8f60..27fc6a61 100644
--- a/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions46.thtest
+++ b/src/test/resources/templateengine/features/instancestaticrestrictions/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/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions47.thtest b/src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions11.thtest
similarity index 92%
rename from src/test/resources/templateengine/features/accessrestrictions/accessrestrictions47.thtest
rename to src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions11.thtest
index 197de58b..3971a5df 100644
--- a/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions47.thtest
+++ b/src/test/resources/templateengine/features/instancestaticrestrictions/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/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions48.thtest b/src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions12.thtest
similarity index 92%
rename from src/test/resources/templateengine/features/accessrestrictions/accessrestrictions48.thtest
rename to src/test/resources/templateengine/features/instancestaticrestrictions/instancestaticrestrictions12.thtest
index cafe12f5..0f535615 100644
--- a/src/test/resources/templateengine/features/accessrestrictions/accessrestrictions48.thtest
+++ b/src/test/resources/templateengine/features/instancestaticrestrictions/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>