From f4adaef9f160f541b6f21bb4fe2f0c5af16196ab Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 11 May 2017 13:24:58 -0700
Subject: [PATCH] fixed tests

---
 .../Tests/Fixtures/filters/length.legacy.test    | 16 ----------------
 test/Twig/Tests/Fixtures/filters/length.test     |  9 +++++++++
 2 files changed, 9 insertions(+), 16 deletions(-)
 delete mode 100644 test/Twig/Tests/Fixtures/filters/length.legacy.test

diff --git a/test/Twig/Tests/Fixtures/filters/length.legacy.test b/test/Twig/Tests/Fixtures/filters/length.legacy.test
deleted file mode 100644
index 31fc1d915a1..00000000000
--- a/test/Twig/Tests/Fixtures/filters/length.legacy.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"length" filter
---TEMPLATE--
-{{ null|length }}
-{{ magic|length }}
-{{ non_countable|length }}
---DATA--
-return array(
-    'null'          => null,                 /* triggers deprecation error */
-    'magic'         => new MagicCallStub(),  /* used to assert we do *not* call __call, also triggers deprecation */
-    'non_countable' => new \StdClass(),      /* triggers deprecation error */
-);
---EXPECT--
-0
-1
-1
diff --git a/test/Twig/Tests/Fixtures/filters/length.test b/test/Twig/Tests/Fixtures/filters/length.test
index 5a4c4d5dac1..a7f1e50318c 100644
--- a/test/Twig/Tests/Fixtures/filters/length.test
+++ b/test/Twig/Tests/Fixtures/filters/length.test
@@ -6,6 +6,9 @@
 {{ number|length }}
 {{ to_string_able|length }}
 {{ countable|length }}
+{{ null|length }}
+{{ magic|length }}
+{{ non_countable|length }}
 --DATA--
 return array(
     'array' => array(1, 4),
@@ -13,6 +16,9 @@ return array(
     'number' => 1000,
     'to_string_able' => new ToStringStub('foobar'),
     'countable' => new CountableStub(42),       /* also asserts we do *not* call __toString() */
+    'null'          => null,
+    'magic'         => new MagicCallStub(),     /* used to assert we do *not* call __call */
+    'non_countable' => new \StdClass(),
 );
 --EXPECT--
 2
@@ -20,3 +26,6 @@ return array(
 4
 6
 42
+0
+1
+1