From c0b9db1c626c88780b2ee5f5a237561a125c54aa Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Jul 2013 14:10:11 -0500
Subject: [ticket/11701] Fix loops var check

PHPBB3-11701
---
 tests/template/template_test.php                  | 32 +++++++++++------------
 tests/template/templates/include_loop.html        |  8 +++---
 tests/template/templates/include_loop_define.html |  6 ++---
 tests/template/templates/loop.html                | 14 +++++-----
 tests/template/templates/loop_advanced.html       | 20 +++++++-------
 tests/template/templates/loop_size.html           | 10 +++----
 tests/template/templates/loop_vars.html           | 18 ++++++-------
 7 files changed, 54 insertions(+), 54 deletions(-)

(limited to 'tests/template')

diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index dd9ba21c26..0a6b680100 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -93,49 +93,49 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 			array(
 				'loop.html',
 				array(),
-				array('loop' => array(array())),
+				array('test_loop' => array(array())),
 				array(),
 				"loop\nloop",
 			),
 			array(
 				'loop.html',
 				array(),
-				array('loop' => array(array(), array()), 'loop.block' => array(array())),
+				array('test_loop' => array(array(), array()), 'test_loop.block' => array(array())),
 				array(),
 				"loop\nloop\nloop\nloop",
 			),
 			array(
 				'loop.html',
 				array(),
-				array('loop' => array(array(), array()), 'loop.block' => array(array()), 'block' => array(array(), array())),
+				array('test_loop' => array(array(), array()), 'test_loop.block' => array(array()), 'block' => array(array(), array())),
 				array(),
 				"loop\nloop\nloop\nloop\nloop#0-block#0\nloop#0-block#1\nloop#1-block#0\nloop#1-block#1",
 			),
 			array(
 				'loop_vars.html',
 				array(),
-				array('loop' => array(array('VARIABLE' => 'x'))),
+				array('test_loop' => array(array('VARIABLE' => 'x'))),
 				array(),
 				"first\n0 - a\nx - b\nset\nlast",
 			),
 			array(
 				'loop_vars.html',
 				array(),
-				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y'))),
+				array('test_loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y'))),
 				array(),
 				"first\n0 - a\nx - b\nset\n1 - a\ny - b\nset\nlast",
 			),
 			array(
 				'loop_vars.html',
 				array(),
-				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),
+				array('test_loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'test_loop.inner' => array(array(), array())),
 				array(),
 				"first\n0 - a\nx - b\nset\n1 - a\ny - b\nset\nlast\n0 - c\n1 - c\nlast inner",
 			),
 			array(
 				'loop_advanced.html',
 				array(),
-				array('loop' => array(array(), array(), array(), array(), array(), array(), array())),
+				array('test_loop' => array(array(), array(), array(), array(), array(), array(), array())),
 				array(),
 				"101234561\nx\n101234561\nx\n101234561\nx\n1234561\nx\n1\nx\n101\nx\n234\nx\n10\nx\n561\nx\n561",
 			),
@@ -149,14 +149,14 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 			array(
 				'define.html',
 				array(),
-				array('loop' => array(array(), array(), array(), array(), array(), array(), array()), 'test' => array(array()), 'test.deep' => array(array()), 'test.deep.defines' => array(array())),
+				array('test_loop' => array(array(), array(), array(), array(), array(), array(), array()), 'test' => array(array()), 'test.deep' => array(array()), 'test.deep.defines' => array(array())),
 				array(),
 				"xyz\nabc\n\$VALUE == 'abc'abc\nbar\nbar\nabc\ntest!@#$%^&*()_-=+{}[]:;\",<.>/?",
 			),
 			array(
 				'define_advanced.html',
 				array(),
-				array('loop' => array(array(), array(), array(), array(), array(), array(), array()), 'test' => array(array()), 'test.deep' => array(array()), 'test.deep.defines' => array(array())),
+				array('test_loop' => array(array(), array(), array(), array(), array(), array(), array()), 'test' => array(array()), 'test.deep' => array(array()), 'test.deep.defines' => array(array())),
 				array(),
 				"abc\nzxc\ncde\nbcd",
 			),
@@ -200,7 +200,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 			array(
 				'include_loop.html',
 				array(),
-				array('loop' => array(array('NESTED_FILE' => 'include_loop1.html')), 'loop.inner' => array(array('NESTED_FILE' => 'include_loop1.html'), array('NESTED_FILE' => 'include_loop2.html'), array('NESTED_FILE' => 'include_loop3.html'))),
+				array('test_loop' => array(array('NESTED_FILE' => 'include_loop1.html')), 'test_loop.inner' => array(array('NESTED_FILE' => 'include_loop1.html'), array('NESTED_FILE' => 'include_loop2.html'), array('NESTED_FILE' => 'include_loop3.html'))),
 				array(),
 				"1\n_1\n_02\n_3",
 			),
@@ -221,8 +221,8 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 			array(
 				'loop_vars.html',
 				array(),
-				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),
-				array('loop'),
+				array('test_loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'test_loop.inner' => array(array(), array())),
+				array('test_loop'),
 				'',
 			),
 			array(
@@ -235,7 +235,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 			array(
 				'include_loop_define.html',
 				array('VARIABLE' => 'value'),
-				array('loop' => array(array('NESTED_FILE' => 'variable.html'))),
+				array('test_loop' => array(array('NESTED_FILE' => 'variable.html'))),
 				array(),
 				'value',
 			),
@@ -243,8 +243,8 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 			array(
 				'loop_vars.html',
 				array(),
-				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),
-				array('loop.inner'),
+				array('test_loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'test_loop.inner' => array(array(), array())),
+				array('test_loop.inner'),
 				"first\n0\n0\n2\nx\nset\n1\n1\n2\ny\nset\nlast",
 			),*/
 			array(
@@ -295,7 +295,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 			array(
 				'loop_size.html',
 				array(),
-				array('loop' => array(array()), 'empty_loop' => array()),
+				array('test_loop' => array(array()), 'empty_loop' => array()),
 				array(),
 				"nonexistent = 0\n! nonexistent\n\nempty = 0\n! empty\nloop\n\nin loop",
 			),
diff --git a/tests/template/templates/include_loop.html b/tests/template/templates/include_loop.html
index d5c3d9bc82..5cad34b363 100644
--- a/tests/template/templates/include_loop.html
+++ b/tests/template/templates/include_loop.html
@@ -1,4 +1,4 @@
-<!-- BEGIN loop -->
-<!-- INCLUDE {loop.NESTED_FILE} -->
-<!-- BEGIN inner -->_<!-- INCLUDE {inner.NESTED_FILE} --><!-- END inner -->
-<!-- END loop -->
+<!-- BEGIN test_loop -->
+<!-- INCLUDE {test_loop.NESTED_FILE} -->
+<!-- BEGIN inner -->_<!-- INCLUDE {test_loop.inner.NESTED_FILE} --><!-- END inner -->
+<!-- END test_loop -->
diff --git a/tests/template/templates/include_loop_define.html b/tests/template/templates/include_loop_define.html
index f539b21396..4bab09422e 100644
--- a/tests/template/templates/include_loop_define.html
+++ b/tests/template/templates/include_loop_define.html
@@ -1,4 +1,4 @@
-<!-- BEGIN loop -->
-<!-- DEFINE $DEF = '{loop.NESTED_FILE}' -->
+<!-- BEGIN test_loop -->
+<!-- DEFINE $DEF = '{test_loop.NESTED_FILE}' -->
 <!-- INCLUDE {$DEF} -->
-<!-- END loop -->
+<!-- END test_loop -->
diff --git a/tests/template/templates/loop.html b/tests/template/templates/loop.html
index de1a10004d..f541e934df 100644
--- a/tests/template/templates/loop.html
+++ b/tests/template/templates/loop.html
@@ -1,21 +1,21 @@
-<!-- BEGIN loop -->
+<!-- BEGIN test_loop -->
 loop
 <!-- BEGINELSE -->
 noloop
-<!-- END loop -->
+<!-- END test_loop -->
 
-<!-- IF .loop -->
+<!-- IF .test_loop -->
 loop
 <!-- ELSE -->
 noloop
 <!-- ENDIF -->
 
-<!-- IF .loop == 2 -->
+<!-- IF .test_loop == 2 -->
 loop
 <!-- ENDIF -->
 
-<!-- BEGIN loop -->
+<!-- BEGIN test_loop -->
 <!-- BEGIN !block -->
-loop#{loop.S_ROW_COUNT}-block#{block.S_ROW_COUNT}
+loop#{test_loop.S_ROW_COUNT}-block#{block.S_ROW_COUNT}
 <!-- END !block -->
-<!-- END loop -->
+<!-- END test_loop -->
diff --git a/tests/template/templates/loop_advanced.html b/tests/template/templates/loop_advanced.html
index c75fe55f03..1f56686eaa 100644
--- a/tests/template/templates/loop_advanced.html
+++ b/tests/template/templates/loop_advanced.html
@@ -1,19 +1,19 @@
-<!-- BEGIN loop -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
+<!-- BEGIN test_loop -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
 x
-<!-- BEGIN loop(0) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
+<!-- BEGIN test_loop(0) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
 x
-<!-- BEGIN loop(0,-1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
+<!-- BEGIN test_loop(0,-1) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
 x
-<!-- BEGIN loop(1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
+<!-- BEGIN test_loop(1) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
 x
-<!-- BEGIN loop(1,1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
+<!-- BEGIN test_loop(1,1) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
 x
-<!-- BEGIN loop(0,1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
+<!-- BEGIN test_loop(0,1) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
 x
-<!-- BEGIN loop(2,4) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
+<!-- BEGIN test_loop(2,4) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
 x
-<!-- BEGIN loop(0,-7) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
+<!-- BEGIN test_loop(0,-7) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
 x
-<!-- BEGIN loop(-2,6) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
+<!-- BEGIN test_loop(-2,6) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
 x
-<!-- BEGIN loop(-2,-1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
+<!-- BEGIN test_loop(-2,-1) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
diff --git a/tests/template/templates/loop_size.html b/tests/template/templates/loop_size.html
index 8f581cef10..2b1fcd2dd4 100644
--- a/tests/template/templates/loop_size.html
+++ b/tests/template/templates/loop_size.html
@@ -22,18 +22,18 @@
 	! empty
 <!-- ENDIF -->
 
-<!-- IF .loop -->
+<!-- IF .test_loop -->
 	loop
 <!-- ENDIF -->
 
-<!-- IF .loop == 0 -->
+<!-- IF .test_loop == 0 -->
 	loop = 0
 <!-- ENDIF -->
 
-<!-- IF ! .loop -->
+<!-- IF ! .test_loop -->
 	! loop
 <!-- ENDIF -->
 
-<!-- BEGIN loop -->
+<!-- BEGIN test_loop -->
 	in loop
-<!-- END loop -->
+<!-- END test_loop -->
diff --git a/tests/template/templates/loop_vars.html b/tests/template/templates/loop_vars.html
index 7d86d4b7b6..70a3eb2cec 100644
--- a/tests/template/templates/loop_vars.html
+++ b/tests/template/templates/loop_vars.html
@@ -1,13 +1,13 @@
-<!-- BEGIN loop -->
-<!-- IF loop.S_FIRST_ROW -->first<!-- ENDIF -->
-{loop.S_ROW_NUM} - a
-{loop.VARIABLE} - b
-<!-- IF loop.VARIABLE -->set<!-- ENDIF -->
-<!-- IF loop.S_LAST_ROW -->
+<!-- BEGIN test_loop -->
+<!-- IF test_loop.S_FIRST_ROW -->first<!-- ENDIF -->
+{test_loop.S_ROW_NUM} - a
+{test_loop.VARIABLE} - b
+<!-- IF test_loop.VARIABLE -->set<!-- ENDIF -->
+<!-- IF test_loop.S_LAST_ROW -->
 last
 <!-- ENDIF -->
 <!-- BEGIN inner -->
-{inner.S_ROW_NUM} - c
-<!-- IF inner.S_LAST_ROW and inner.S_ROW_COUNT and inner.S_NUM_ROWS -->last inner<!-- ENDIF -->
+{test_loop.inner.S_ROW_NUM} - c
+<!-- IF test_loop.inner.S_LAST_ROW and test_loop.inner.S_ROW_COUNT and test_loop.inner.S_NUM_ROWS -->last inner<!-- ENDIF -->
 <!-- END inner -->
-<!-- END loop -->
+<!-- END test_loop -->
-- 
cgit v1.2.1


From 30bfd7fb61bbe1d7ca50290730d8c4b6094c41a4 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 19 Jul 2013 13:25:53 -0500
Subject: [ticket/11701] Test events in loops

PHPBB3-11701
---
 .../ext/trivial/styles/all/template/test_event_loop.html       |  1 +
 .../ext_trivial/styles/silver/template/event_loop.html         |  3 +++
 tests/template/template_events_test.php                        | 10 ++++++++++
 3 files changed, 14 insertions(+)
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/test_event_loop.html
 create mode 100644 tests/template/datasets/ext_trivial/styles/silver/template/event_loop.html

(limited to 'tests/template')

diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/test_event_loop.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/test_event_loop.html
new file mode 100644
index 0000000000..149398d6bd
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/test_event_loop.html
@@ -0,0 +1 @@
+{event_loop.S_ROW_COUNT}<!-- IF not event_loop.S_LAST_ROW -->|<!-- ENDIF -->
\ No newline at end of file
diff --git a/tests/template/datasets/ext_trivial/styles/silver/template/event_loop.html b/tests/template/datasets/ext_trivial/styles/silver/template/event_loop.html
new file mode 100644
index 0000000000..c70d8f86d7
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/styles/silver/template/event_loop.html
@@ -0,0 +1,3 @@
+<!-- BEGIN event_loop -->
+event_loop<!-- EVENT test_event_loop -->
+<!-- END event_loop -->
diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php
index f7bcd2dcc6..d3b65e763a 100644
--- a/tests/template/template_events_test.php
+++ b/tests/template/template_events_test.php
@@ -80,6 +80,16 @@ Zeta test event in all',
 				array(),
 'two in silver in omega',
 			),
+			array(
+				'EVENT in loop',
+				'ext_trivial',
+				array('silver'),
+				'event_loop.html',
+				array(),
+				array('event_loop' => array(array(), array(), array())),
+				array(),
+				'event_loop0|event_loop1|event_loop2',
+			),
 		);
 	}
 
-- 
cgit v1.2.1


From 0f83d7fd6cf6819c0fe2f4bfa9f65873f7124b72 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 19 Jul 2013 13:36:28 -0500
Subject: [ticket/11701] New line at EOF

PHPBB3-11701
---
 .../ext_trivial/ext/trivial/styles/all/template/test_event_loop.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/template')

diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/test_event_loop.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/test_event_loop.html
index 149398d6bd..235e129f85 100644
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/test_event_loop.html
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/test_event_loop.html
@@ -1 +1 @@
-{event_loop.S_ROW_COUNT}<!-- IF not event_loop.S_LAST_ROW -->|<!-- ENDIF -->
\ No newline at end of file
+{event_loop.S_ROW_COUNT}<!-- IF not event_loop.S_LAST_ROW -->|<!-- ENDIF -->
-- 
cgit v1.2.1


From e1c9a875867953f6bfd4e442ae804c85377f8360 Mon Sep 17 00:00:00 2001
From: rechosen <rechosen@gmail.com>
Date: Thu, 8 Aug 2013 14:00:44 +0200
Subject: [ticket/11777] Move the testing template events to 'events/'
 subdirectories

The tests written for extension template events did not follow the convention
and documentation of placing template event files in the events/ subdirectory.
Moved the files to this subdirectory so the tests succeed again.

PHPBB3-11777
---
 .../ext/kappa/styles/all/template/events/test.html                  | 1 +
 .../event_inheritance/ext/kappa/styles/all/template/test.html       | 1 -
 .../ext/kappa/styles/silver/template/events/test.html               | 1 +
 .../event_inheritance/ext/kappa/styles/silver/template/test.html    | 1 -
 .../ext/kappa/styles/silver_inherit/template/events/test.html       | 1 +
 .../ext/kappa/styles/silver_inherit/template/test.html              | 1 -
 .../ext/omega/styles/all/template/events/test.html                  | 1 +
 .../event_inheritance/ext/omega/styles/all/template/test.html       | 1 -
 .../ext/omega/styles/silver/template/events/test.html               | 1 +
 .../ext/omega/styles/silver/template/events/two.html                | 1 +
 .../event_inheritance/ext/omega/styles/silver/template/test.html    | 1 -
 .../event_inheritance/ext/omega/styles/silver/template/two.html     | 1 -
 .../event_inheritance/ext/zeta/styles/all/template/events/test.html | 1 +
 .../event_inheritance/ext/zeta/styles/all/template/test.html        | 1 -
 .../ext/trivial/styles/all/template/event_variable_spacing.html     | 6 ------
 .../trivial/styles/all/template/events/event_variable_spacing.html  | 6 ++++++
 .../ext/trivial/styles/all/template/events/universal.html           | 1 +
 .../ext_trivial/ext/trivial/styles/all/template/universal.html      | 1 -
 .../ext/trivial/styles/silver/template/events/simple.html           | 1 +
 .../ext_trivial/ext/trivial/styles/silver/template/simple.html      | 1 -
 20 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/events/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/events/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/events/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/all/template/events/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/all/template/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/two.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/two.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/events/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/test.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event_variable_spacing.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/event_variable_spacing.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/universal.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/universal.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/events/simple.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/simple.html

(limited to 'tests/template')

diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/events/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/events/test.html
new file mode 100644
index 0000000000..3eb906a09e
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/events/test.html
@@ -0,0 +1 @@
+Kappa test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/test.html
deleted file mode 100644
index 3eb906a09e..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Kappa test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/events/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/events/test.html
new file mode 100644
index 0000000000..3b65d80a6d
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/events/test.html
@@ -0,0 +1 @@
+Kappa test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/test.html
deleted file mode 100644
index 3b65d80a6d..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Kappa test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/events/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/events/test.html
new file mode 100644
index 0000000000..26826d59e3
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/events/test.html
@@ -0,0 +1 @@
+Kappa test event in silver_inherit
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/test.html
deleted file mode 100644
index 26826d59e3..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Kappa test event in silver_inherit
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/events/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/events/test.html
new file mode 100644
index 0000000000..003d193dc3
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/events/test.html
@@ -0,0 +1 @@
+Omega test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/test.html
deleted file mode 100644
index 003d193dc3..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Omega test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/test.html
new file mode 100644
index 0000000000..6bf06f5457
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/test.html
@@ -0,0 +1 @@
+Omega test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/two.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/two.html
new file mode 100644
index 0000000000..7f8058f4e4
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/two.html
@@ -0,0 +1 @@
+two in silver in omega
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/test.html
deleted file mode 100644
index 6bf06f5457..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Omega test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/two.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/two.html
deleted file mode 100644
index 7f8058f4e4..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/two.html
+++ /dev/null
@@ -1 +0,0 @@
-two in silver in omega
diff --git a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/events/test.html b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/events/test.html
new file mode 100644
index 0000000000..5fc7e5ac12
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/events/test.html
@@ -0,0 +1 @@
+Zeta test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/test.html b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/test.html
deleted file mode 100644
index 5fc7e5ac12..0000000000
--- a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Zeta test event in all
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event_variable_spacing.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event_variable_spacing.html
deleted file mode 100644
index 028f8aa0d1..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event_variable_spacing.html
+++ /dev/null
@@ -1,6 +0,0 @@
-|{VARIABLE}|
-{VARIABLE}|{VARIABLE}|
-
-|{VARIABLE}
-
-<div class="{VARIABLE}">test</div>
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/event_variable_spacing.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/event_variable_spacing.html
new file mode 100644
index 0000000000..028f8aa0d1
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/event_variable_spacing.html
@@ -0,0 +1,6 @@
+|{VARIABLE}|
+{VARIABLE}|{VARIABLE}|
+
+|{VARIABLE}
+
+<div class="{VARIABLE}">test</div>
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/universal.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/universal.html
new file mode 100644
index 0000000000..f2c5762ade
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/universal.html
@@ -0,0 +1 @@
+Universal in trivial extension.
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/universal.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/universal.html
deleted file mode 100644
index f2c5762ade..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/universal.html
+++ /dev/null
@@ -1 +0,0 @@
-Universal in trivial extension.
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/events/simple.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/events/simple.html
new file mode 100644
index 0000000000..fe32a1ed3f
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/events/simple.html
@@ -0,0 +1 @@
+Simple in trivial extension.
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/simple.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/simple.html
deleted file mode 100644
index fe32a1ed3f..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/simple.html
+++ /dev/null
@@ -1 +0,0 @@
-Simple in trivial extension.
-- 
cgit v1.2.1


From 7f76c9f9c7d9014f313f150a9596bec030f39915 Mon Sep 17 00:00:00 2001
From: rechosen <rechosen@gmail.com>
Date: Fri, 9 Aug 2013 11:33:24 +0200
Subject: [ticket/11777] Rename the extension template listener subdirectory to
 'event/'

Per suggestion of EXreaction and nickvergessen, do not look for extension
template event listeners in styles/[style]/template/events/ but in
styles/[style]/template/event/ (without the trailing 's') to match the way
phpBB looks for php template event listeners.

PHPBB3-11777
---
 .../event_inheritance/ext/kappa/styles/all/template/event/test.html | 1 +
 .../ext/kappa/styles/all/template/events/test.html                  | 1 -
 .../ext/kappa/styles/silver/template/event/test.html                | 1 +
 .../ext/kappa/styles/silver/template/events/test.html               | 1 -
 .../ext/kappa/styles/silver_inherit/template/event/test.html        | 1 +
 .../ext/kappa/styles/silver_inherit/template/events/test.html       | 1 -
 .../event_inheritance/ext/omega/styles/all/template/event/test.html | 1 +
 .../ext/omega/styles/all/template/events/test.html                  | 1 -
 .../ext/omega/styles/silver/template/event/test.html                | 1 +
 .../ext/omega/styles/silver/template/event/two.html                 | 1 +
 .../ext/omega/styles/silver/template/events/test.html               | 1 -
 .../ext/omega/styles/silver/template/events/two.html                | 1 -
 .../event_inheritance/ext/zeta/styles/all/template/event/test.html  | 1 +
 .../event_inheritance/ext/zeta/styles/all/template/events/test.html | 1 -
 .../trivial/styles/all/template/event/event_variable_spacing.html   | 6 ++++++
 .../ext/trivial/styles/all/template/event/universal.html            | 1 +
 .../trivial/styles/all/template/events/event_variable_spacing.html  | 6 ------
 .../ext/trivial/styles/all/template/events/universal.html           | 1 -
 .../ext/trivial/styles/silver/template/event/simple.html            | 1 +
 .../ext/trivial/styles/silver/template/events/simple.html           | 1 -
 20 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/events/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/events/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/events/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/all/template/events/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/two.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/events/test.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/event_variable_spacing.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/universal.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/events/simple.html

(limited to 'tests/template')

diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html
new file mode 100644
index 0000000000..3eb906a09e
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html
@@ -0,0 +1 @@
+Kappa test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/events/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/events/test.html
deleted file mode 100644
index 3eb906a09e..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/events/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Kappa test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html
new file mode 100644
index 0000000000..3b65d80a6d
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html
@@ -0,0 +1 @@
+Kappa test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/events/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/events/test.html
deleted file mode 100644
index 3b65d80a6d..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/events/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Kappa test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html
new file mode 100644
index 0000000000..26826d59e3
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html
@@ -0,0 +1 @@
+Kappa test event in silver_inherit
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/events/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/events/test.html
deleted file mode 100644
index 26826d59e3..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/events/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Kappa test event in silver_inherit
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html
new file mode 100644
index 0000000000..003d193dc3
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html
@@ -0,0 +1 @@
+Omega test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/events/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/events/test.html
deleted file mode 100644
index 003d193dc3..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/events/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Omega test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html
new file mode 100644
index 0000000000..6bf06f5457
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html
@@ -0,0 +1 @@
+Omega test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html
new file mode 100644
index 0000000000..7f8058f4e4
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html
@@ -0,0 +1 @@
+two in silver in omega
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/test.html
deleted file mode 100644
index 6bf06f5457..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Omega test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/two.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/two.html
deleted file mode 100644
index 7f8058f4e4..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/two.html
+++ /dev/null
@@ -1 +0,0 @@
-two in silver in omega
diff --git a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html
new file mode 100644
index 0000000000..5fc7e5ac12
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html
@@ -0,0 +1 @@
+Zeta test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/events/test.html b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/events/test.html
deleted file mode 100644
index 5fc7e5ac12..0000000000
--- a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/events/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Zeta test event in all
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html
new file mode 100644
index 0000000000..028f8aa0d1
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html
@@ -0,0 +1,6 @@
+|{VARIABLE}|
+{VARIABLE}|{VARIABLE}|
+
+|{VARIABLE}
+
+<div class="{VARIABLE}">test</div>
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html
new file mode 100644
index 0000000000..f2c5762ade
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html
@@ -0,0 +1 @@
+Universal in trivial extension.
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/event_variable_spacing.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/event_variable_spacing.html
deleted file mode 100644
index 028f8aa0d1..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/event_variable_spacing.html
+++ /dev/null
@@ -1,6 +0,0 @@
-|{VARIABLE}|
-{VARIABLE}|{VARIABLE}|
-
-|{VARIABLE}
-
-<div class="{VARIABLE}">test</div>
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/universal.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/universal.html
deleted file mode 100644
index f2c5762ade..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/universal.html
+++ /dev/null
@@ -1 +0,0 @@
-Universal in trivial extension.
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html
new file mode 100644
index 0000000000..fe32a1ed3f
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html
@@ -0,0 +1 @@
+Simple in trivial extension.
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/events/simple.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/events/simple.html
deleted file mode 100644
index fe32a1ed3f..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/events/simple.html
+++ /dev/null
@@ -1 +0,0 @@
-Simple in trivial extension.
-- 
cgit v1.2.1


From 08e6c6118036700f5d4196aa09d9d1a34b840514 Mon Sep 17 00:00:00 2001
From: rechosen <rechosen@gmail.com>
Date: Fri, 9 Aug 2013 11:39:43 +0200
Subject: [ticket/11777] Require a suffix of '_listener' on extension template
 listeners

To further mirror the file name and location requirements for php template
event listeners, require extension template event listener files to follow the
'<event name>_listener.html' naming format.

PHPBB3-11777
---
 .../event_inheritance/ext/kappa/styles/all/template/event/test.html | 1 -
 .../ext/kappa/styles/all/template/event/test_listener.html          | 1 +
 .../ext/kappa/styles/silver/template/event/test.html                | 1 -
 .../ext/kappa/styles/silver/template/event/test_listener.html       | 1 +
 .../ext/kappa/styles/silver_inherit/template/event/test.html        | 1 -
 .../kappa/styles/silver_inherit/template/event/test_listener.html   | 1 +
 .../event_inheritance/ext/omega/styles/all/template/event/test.html | 1 -
 .../ext/omega/styles/all/template/event/test_listener.html          | 1 +
 .../ext/omega/styles/silver/template/event/test.html                | 1 -
 .../ext/omega/styles/silver/template/event/test_listener.html       | 1 +
 .../ext/omega/styles/silver/template/event/two.html                 | 1 -
 .../ext/omega/styles/silver/template/event/two_listener.html        | 1 +
 .../event_inheritance/ext/zeta/styles/all/template/event/test.html  | 1 -
 .../ext/zeta/styles/all/template/event/test_listener.html           | 1 +
 .../trivial/styles/all/template/event/event_variable_spacing.html   | 6 ------
 .../styles/all/template/event/event_variable_spacing_listener.html  | 6 ++++++
 .../ext/trivial/styles/all/template/event/universal.html            | 1 -
 .../ext/trivial/styles/all/template/event/universal_listener.html   | 1 +
 .../ext/trivial/styles/silver/template/event/simple.html            | 1 -
 .../ext/trivial/styles/silver/template/event/simple_listener.html   | 1 +
 20 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test_listener.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test_listener.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test_listener.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test_listener.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test_listener.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two_listener.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test_listener.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing_listener.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal_listener.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple_listener.html

(limited to 'tests/template')

diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html
deleted file mode 100644
index 3eb906a09e..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Kappa test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test_listener.html
new file mode 100644
index 0000000000..3eb906a09e
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test_listener.html
@@ -0,0 +1 @@
+Kappa test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html
deleted file mode 100644
index 3b65d80a6d..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Kappa test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test_listener.html
new file mode 100644
index 0000000000..3b65d80a6d
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test_listener.html
@@ -0,0 +1 @@
+Kappa test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html
deleted file mode 100644
index 26826d59e3..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Kappa test event in silver_inherit
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test_listener.html
new file mode 100644
index 0000000000..26826d59e3
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test_listener.html
@@ -0,0 +1 @@
+Kappa test event in silver_inherit
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html
deleted file mode 100644
index 003d193dc3..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Omega test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test_listener.html
new file mode 100644
index 0000000000..003d193dc3
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test_listener.html
@@ -0,0 +1 @@
+Omega test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html
deleted file mode 100644
index 6bf06f5457..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Omega test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test_listener.html
new file mode 100644
index 0000000000..6bf06f5457
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test_listener.html
@@ -0,0 +1 @@
+Omega test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html
deleted file mode 100644
index 7f8058f4e4..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html
+++ /dev/null
@@ -1 +0,0 @@
-two in silver in omega
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two_listener.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two_listener.html
new file mode 100644
index 0000000000..7f8058f4e4
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two_listener.html
@@ -0,0 +1 @@
+two in silver in omega
diff --git a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html
deleted file mode 100644
index 5fc7e5ac12..0000000000
--- a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Zeta test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test_listener.html
new file mode 100644
index 0000000000..5fc7e5ac12
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test_listener.html
@@ -0,0 +1 @@
+Zeta test event in all
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html
deleted file mode 100644
index 028f8aa0d1..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html
+++ /dev/null
@@ -1,6 +0,0 @@
-|{VARIABLE}|
-{VARIABLE}|{VARIABLE}|
-
-|{VARIABLE}
-
-<div class="{VARIABLE}">test</div>
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing_listener.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing_listener.html
new file mode 100644
index 0000000000..028f8aa0d1
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing_listener.html
@@ -0,0 +1,6 @@
+|{VARIABLE}|
+{VARIABLE}|{VARIABLE}|
+
+|{VARIABLE}
+
+<div class="{VARIABLE}">test</div>
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html
deleted file mode 100644
index f2c5762ade..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html
+++ /dev/null
@@ -1 +0,0 @@
-Universal in trivial extension.
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal_listener.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal_listener.html
new file mode 100644
index 0000000000..f2c5762ade
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal_listener.html
@@ -0,0 +1 @@
+Universal in trivial extension.
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html
deleted file mode 100644
index fe32a1ed3f..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html
+++ /dev/null
@@ -1 +0,0 @@
-Simple in trivial extension.
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple_listener.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple_listener.html
new file mode 100644
index 0000000000..fe32a1ed3f
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple_listener.html
@@ -0,0 +1 @@
+Simple in trivial extension.
-- 
cgit v1.2.1


From 4b1c5879eb64006c57d94bf534d4a382d9ba5c41 Mon Sep 17 00:00:00 2001
From: rechosen <rechosen@gmail.com>
Date: Mon, 12 Aug 2013 10:21:40 +0200
Subject: [ticket/11777] Fix new test for loop variables in extension template
 listeners

With the merge of https://github.com/phpbb/phpbb3/pull/1564 a new test has
been added. Renamed and moved the template listener file of that test to
comply with the new requirements.

PHPBB3-11777
---
 .../ext/trivial/styles/all/template/event/test_event_loop_listener.html  | 1 +
 .../ext_trivial/ext/trivial/styles/all/template/test_event_loop.html     | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop_listener.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/test_event_loop.html

(limited to 'tests/template')

diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop_listener.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop_listener.html
new file mode 100644
index 0000000000..235e129f85
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop_listener.html
@@ -0,0 +1 @@
+{event_loop.S_ROW_COUNT}<!-- IF not event_loop.S_LAST_ROW -->|<!-- ENDIF -->
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/test_event_loop.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/test_event_loop.html
deleted file mode 100644
index 235e129f85..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/test_event_loop.html
+++ /dev/null
@@ -1 +0,0 @@
-{event_loop.S_ROW_COUNT}<!-- IF not event_loop.S_LAST_ROW -->|<!-- ENDIF -->
-- 
cgit v1.2.1


From 65d8cd63022d688fe618f128768b78a6214db166 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 13 Aug 2013 02:14:22 -0700
Subject: [ticket/11784] Remove naming redundancy for event listeners

PHPBB3-11784
---
 .../event_inheritance/ext/kappa/styles/all/template/event/test.html | 1 +
 .../ext/kappa/styles/all/template/event/test_listener.html          | 1 -
 .../ext/kappa/styles/silver/template/event/test.html                | 1 +
 .../ext/kappa/styles/silver/template/event/test_listener.html       | 1 -
 .../ext/kappa/styles/silver_inherit/template/event/test.html        | 1 +
 .../kappa/styles/silver_inherit/template/event/test_listener.html   | 1 -
 .../event_inheritance/ext/omega/styles/all/template/event/test.html | 1 +
 .../ext/omega/styles/all/template/event/test_listener.html          | 1 -
 .../ext/omega/styles/silver/template/event/test.html                | 1 +
 .../ext/omega/styles/silver/template/event/test_listener.html       | 1 -
 .../ext/omega/styles/silver/template/event/two.html                 | 1 +
 .../ext/omega/styles/silver/template/event/two_listener.html        | 1 -
 .../event_inheritance/ext/zeta/styles/all/template/event/test.html  | 1 +
 .../ext/zeta/styles/all/template/event/test_listener.html           | 1 -
 .../trivial/styles/all/template/event/event_variable_spacing.html   | 6 ++++++
 .../styles/all/template/event/event_variable_spacing_listener.html  | 6 ------
 .../ext/trivial/styles/all/template/event/test_event_loop.html      | 1 +
 .../trivial/styles/all/template/event/test_event_loop_listener.html | 1 -
 .../ext/trivial/styles/all/template/event/universal.html            | 1 +
 .../ext/trivial/styles/all/template/event/universal_listener.html   | 1 -
 .../ext/trivial/styles/silver/template/event/simple.html            | 1 +
 .../ext/trivial/styles/silver/template/event/simple_listener.html   | 1 -
 22 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test_listener.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test_listener.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test_listener.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test_listener.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test_listener.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two_listener.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test_listener.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing_listener.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop_listener.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal_listener.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple_listener.html

(limited to 'tests/template')

diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html
new file mode 100644
index 0000000000..3eb906a09e
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html
@@ -0,0 +1 @@
+Kappa test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test_listener.html
deleted file mode 100644
index 3eb906a09e..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Kappa test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html
new file mode 100644
index 0000000000..3b65d80a6d
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html
@@ -0,0 +1 @@
+Kappa test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test_listener.html
deleted file mode 100644
index 3b65d80a6d..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Kappa test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html
new file mode 100644
index 0000000000..26826d59e3
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html
@@ -0,0 +1 @@
+Kappa test event in silver_inherit
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test_listener.html
deleted file mode 100644
index 26826d59e3..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Kappa test event in silver_inherit
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html
new file mode 100644
index 0000000000..003d193dc3
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html
@@ -0,0 +1 @@
+Omega test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test_listener.html
deleted file mode 100644
index 003d193dc3..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Omega test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html
new file mode 100644
index 0000000000..6bf06f5457
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html
@@ -0,0 +1 @@
+Omega test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test_listener.html
deleted file mode 100644
index 6bf06f5457..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Omega test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html
new file mode 100644
index 0000000000..7f8058f4e4
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html
@@ -0,0 +1 @@
+two in silver in omega
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two_listener.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two_listener.html
deleted file mode 100644
index 7f8058f4e4..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-two in silver in omega
diff --git a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html
new file mode 100644
index 0000000000..5fc7e5ac12
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html
@@ -0,0 +1 @@
+Zeta test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test_listener.html
deleted file mode 100644
index 5fc7e5ac12..0000000000
--- a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Zeta test event in all
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html
new file mode 100644
index 0000000000..028f8aa0d1
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html
@@ -0,0 +1,6 @@
+|{VARIABLE}|
+{VARIABLE}|{VARIABLE}|
+
+|{VARIABLE}
+
+<div class="{VARIABLE}">test</div>
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing_listener.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing_listener.html
deleted file mode 100644
index 028f8aa0d1..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing_listener.html
+++ /dev/null
@@ -1,6 +0,0 @@
-|{VARIABLE}|
-{VARIABLE}|{VARIABLE}|
-
-|{VARIABLE}
-
-<div class="{VARIABLE}">test</div>
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop.html
new file mode 100644
index 0000000000..235e129f85
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop.html
@@ -0,0 +1 @@
+{event_loop.S_ROW_COUNT}<!-- IF not event_loop.S_LAST_ROW -->|<!-- ENDIF -->
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop_listener.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop_listener.html
deleted file mode 100644
index 235e129f85..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-{event_loop.S_ROW_COUNT}<!-- IF not event_loop.S_LAST_ROW -->|<!-- ENDIF -->
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html
new file mode 100644
index 0000000000..f2c5762ade
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html
@@ -0,0 +1 @@
+Universal in trivial extension.
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal_listener.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal_listener.html
deleted file mode 100644
index f2c5762ade..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Universal in trivial extension.
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html
new file mode 100644
index 0000000000..fe32a1ed3f
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html
@@ -0,0 +1 @@
+Simple in trivial extension.
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple_listener.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple_listener.html
deleted file mode 100644
index fe32a1ed3f..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Simple in trivial extension.
-- 
cgit v1.2.1