From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 tests/Framework/Html.php |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/tests/Framework/Html.php b/tests/Framework/Html.php
index 107f828..60284de 100644
--- a/tests/Framework/Html.php
+++ b/tests/Framework/Html.php
@@ -17,4 +17,29 @@
 
         $this->assertInstanceOf('html', $object, "Class constructor");
     }
+
+    /**
+     * Data for test_quote()
+     */
+    function data_quote()
+    {
+        return array(
+            array('abc', 'abc'),
+            array('?', '?'),
+            array('"', '&quot;'),
+            array('<', '&lt;'),
+            array('>', '&gt;'),
+            array('&', '&amp;'),
+            array('&amp;', '&amp;amp;'),
+        );
+    }
+
+    /**
+     * Test for quote()
+     * @dataProvider data_quote
+     */
+    function test_quote($str, $result)
+    {
+        $this->assertEquals(html::quote($str), $result);
+    }
 }

--
Gitblit v1.9.1