From 1121af3dd03bb000b935036232b11ae4f284195e Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Fri, 17 Feb 2017 14:34:24 +0100
Subject: Split comparison tests from other operators

---
 testing/templates/operators.html | 54 +++-------------------------------------
 testing/tests/operators.rs       | 17 ++++++++++++-
 2 files changed, 19 insertions(+), 52 deletions(-)

diff --git a/testing/templates/operators.html b/testing/templates/operators.html
index 020126b..750f0aa 100644
--- a/testing/templates/operators.html
+++ b/testing/templates/operators.html
@@ -1,57 +1,9 @@
-{% if a == b -%}
-  t
-{%- endif -%}
-{% if a == c -%}
-  t
-{%- else -%}
-  f
-{%- endif %}
-{% if a != c -%}
-  t
-{%- endif %}
-{%- if a != b -%}
-  t
-{%- else -%}
-  f
-{%- endif %}
-{% if c >= b -%}
-  t
-{%- endif -%}
-{% if b >= c -%}
-  t
-{%- else -%}
-  f
-{%- endif %}
-{% if c > b -%}
-  t
-{%- endif -%}
-{% if a > c -%}
-  t
-{%- else -%}
-  f
-{%- endif %}
-{% if a <= b -%}
-  t
-{%- endif -%}
-{% if c <= b -%}
-  t
-{%- else -%}
-  f
-{%- endif %}
-{% if a < c -%}
-  t
-{%- endif %}
-{%- if a < b -%}
-  t
-{%- else -%}
-  f
-{%- endif %}
 {% if a * c > b -%}
   mul
-{%- endif %}
+{%- endif -%}
 {% if c / c == a -%}
   div
-{%- endif %}
+{%- endif -%}
 {% if a % c == b -%}
   mod
-{%- endif %}
+{%- endif -%}
diff --git a/testing/tests/operators.rs b/testing/tests/operators.rs
index 240fd52..d58492e 100644
--- a/testing/tests/operators.rs
+++ b/testing/tests/operators.rs
@@ -4,6 +4,21 @@ extern crate askama_derive;
 
 use askama::Template;
 
+#[derive(Template)]
+#[template(path = "compare.html")]
+struct CompareTemplate {
+    a: usize,
+    b: usize,
+    c: usize,
+}
+
+#[test]
+fn test_compare() {
+    let t = CompareTemplate { a: 1, b: 1, c: 2 };
+    assert_eq!(t.render(), "tf\ntf\ntf\ntf\ntf\ntf\n");
+}
+
+
 #[derive(Template)]
 #[template(path = "operators.html")]
 struct OperatorsTemplate {
@@ -15,5 +30,5 @@ struct OperatorsTemplate {
 #[test]
 fn test_operators() {
     let t = OperatorsTemplate { a: 1, b: 1, c: 2 };
-    assert_eq!(t.render(), "tf\ntf\ntf\ntf\ntf\ntf\nmul\ndiv\nmod\n");
+    assert_eq!(t.render(), "muldivmod");
 }
-- 
cgit