From 4b646c6c80712bbbc0737defc48f6fbb05bac0f3 Mon Sep 17 00:00:00 2001
From: "Marek A. Ruszczynski" <aptx@phpbb.com>
Date: Mon, 7 Mar 2011 16:52:22 +0100
Subject: [feature/template-engine] Update tests.

PHPBB3-9726
---
 tests/template/templates/expressions.html | 29 -----------------------------
 tests/template/templates/if.html          |  4 ++--
 tests/template/templates/loop_nested.html |  2 --
 tests/template/templates/loop_vars.html   | 13 +++----------
 4 files changed, 5 insertions(+), 43 deletions(-)

(limited to 'tests/template/templates')

diff --git a/tests/template/templates/expressions.html b/tests/template/templates/expressions.html
index c40d967dab..e1283f165f 100644
--- a/tests/template/templates/expressions.html
+++ b/tests/template/templates/expressions.html
@@ -1,86 +1,57 @@
 <!-- IF 10 is even -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 9 is even -->fail<!-- ELSE -->pass<!-- ENDIF -->
-
 <!-- IF not 390 is even -->fail<!-- ELSE -->pass<!-- ENDIF -->
-
 <!-- IF 9 is odd -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 32 is odd -->fail<!-- ELSE -->pass<!-- ENDIF -->
-
 <!-- IF 32 is div by 16 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 10 is not even -->fail<!-- ELSE -->pass<!-- ENDIF -->
-
 <!-- IF 24 == 24 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 24 eq 24 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF ((((((24 == 24)))))) -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF 24 != 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 24 <> 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 24 ne 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 24 neq 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF 10 lt 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 10 < 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF 10 le 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 10 lte 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 10 <= 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 20 le 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 20 lte 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 20 <= 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF 9 gt 1 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 9 > 1 -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF 9 >= 1 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 9 gte 1 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 9 ge 1 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 9 >= 9 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 9 gte 9 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 9 ge 9 -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF true && (10 > 4) -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF true and (10 > 4) -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF false || true -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF false or true -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF !false -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF not false -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF not not not false -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF 6 % 4 == 2 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 24 mod 12 == 0 -->pass<!-- ELSE -->fail<!-- ENDIF -->
diff --git a/tests/template/templates/if.html b/tests/template/templates/if.html
index c502e52f51..41ff024779 100644
--- a/tests/template/templates/if.html
+++ b/tests/template/templates/if.html
@@ -3,9 +3,9 @@
 <!-- ELSEIF S_OTHER_VALUE -->
 2
 <!-- ELSE -->
-0
+03
 <!-- ENDIF -->
 
 <!-- IF (S_VALUE > S_OTHER_VALUE) -->
-0
+04
 <!-- ENDIF -->
diff --git a/tests/template/templates/loop_nested.html b/tests/template/templates/loop_nested.html
index 9b251cd453..45b1ef85d4 100644
--- a/tests/template/templates/loop_nested.html
+++ b/tests/template/templates/loop_nested.html
@@ -1,8 +1,6 @@
 <!-- BEGIN outer -->
 	outer - {outer.S_ROW_COUNT}<!-- IF outer.VARIABLE --> - {outer.VARIABLE}<!-- ENDIF -->
-
 	<!-- BEGIN middle -->
 		middle - {middle.S_ROW_COUNT}<!-- IF middle.VARIABLE --> - {middle.VARIABLE}<!-- ENDIF -->
-
 	<!-- END middle -->
 <!-- END outer -->
diff --git a/tests/template/templates/loop_vars.html b/tests/template/templates/loop_vars.html
index 4f02fd2e6c..d94a0ae0f7 100644
--- a/tests/template/templates/loop_vars.html
+++ b/tests/template/templates/loop_vars.html
@@ -1,21 +1,14 @@
 <!-- BEGIN loop -->
 <!-- IF loop.S_FIRST_ROW -->first<!-- ENDIF -->
-
-{loop.S_ROW_COUNT}
-
-{loop.VARIABLE}
-
+{loop.S_ROW_NUM} - a
+{loop.VARIABLE} - b
 <!-- IF loop.VARIABLE -->set<!-- ENDIF -->
-
 <!-- IF loop.S_LAST_ROW -->
 last
 <!-- ENDIF -->
 <!-- BEGIN inner -->
-
-{inner.S_ROW_COUNT}
-
+{inner.S_ROW_NUM} - c
 <!-- IF inner.S_LAST_ROW and inner.S_ROW_COUNT and inner.S_NUM_ROWS -->last inner<!-- ENDIF -->
-
 <!-- END inner -->
 <!-- END loop -->
 <!-- IF .loop.inner -->inner loop<!-- ENDIF -->
-- 
cgit v1.2.1