4 files changed, 95 insertions, 0 deletions
diff --git a/tests/examplefiles/demo.cfm b/tests/examplefiles/demo.cfm
index d94a06a0..49690484 100644
--- a/tests/examplefiles/demo.cfm
+++ b/tests/examplefiles/demo.cfm
@@ -1,4 +1,11 @@
 <!--- cfcomment --->
+<!--- nested <!--- cfcomment ---> --->
+<!--- multi-line
+nested
+<!---
+cfcomment
+--->
+--->
 <!-- html comment -->
 <html>
 <head>
@@ -17,6 +24,9 @@
  #IsDate("foo")#<br />
  #DaysInMonth(RightNow)#
 </cfoutput>
+<cfset x="x">
+<cfset y="y">
+<cfset z="z">
 <cfoutput group="x">
     #x#
     <cfoutput>#y#</cfoutput>
@@ -29,6 +39,8 @@
 <cfset greeting = "Hello #person#">
 
 <cfset greeting = "Hello" & " world!">
+<cfset a = 5>
+<cfset b = 10>
 <cfset c = a^b>
 <cfset c = a MOD b>
 <cfset c = a / b>
diff --git a/tests/examplefiles/function_arrows.coffee b/tests/examplefiles/example.coffee
index cd1ef1e8..2cbd1df3 100644
--- a/tests/examplefiles/function_arrows.coffee
+++ b/tests/examplefiles/example.coffee
@@ -1,3 +1,5 @@
+# function arrows
+
 methodA:-> 'A'
 methodB:=> 'B'
 methodC:()=> 'C'
@@ -9,3 +11,17 @@ methodF:(c,d)-> 'F'
 
 (-> 'I')
 (=> 'J')
+
+# strings
+
+"#{wow}"
+"w#{wow}w"
+"#wow"
+"wow#"
+"w#ow"
+
+'#{wow}'
+'w#{wow}w'
+'#wow'
+'wow#'
+'w#ow'
diff --git a/tests/examplefiles/vimrc b/tests/examplefiles/vimrc
new file mode 100644
index 00000000..d2f9cd1b
--- /dev/null
+++ b/tests/examplefiles/vimrc
@@ -0,0 +1,21 @@
+" A comment
+
+:py print "py"
+::pyt print 'pyt'
+  pyth	print '''pyth'''
+ : pytho print "pytho"
+python print """python"""
+
+  : : python<<E OF
+print """my script"""
+
+def MyFunc(str):
+  """ My Function """
+  print str
+E OF
+
+let py = 42
+echo py
+
+let foo = 42
+echo foo
diff --git a/tests/test_cfm.py b/tests/test_cfm.py
new file mode 100644
index 00000000..2ff25bd6
--- /dev/null
+++ b/tests/test_cfm.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+"""
+    Basic ColdfusionHtmlLexer Test
+    ~~~~~~~~~~~~~~~~~
+
+    :copyright: Copyright 2014 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import unittest
+import os
+
+from pygments.token import Token
+from pygments.lexers import ColdfusionHtmlLexer
+
+
+class ColdfusionHtmlLexerTest(unittest.TestCase):
+
+    def setUp(self):
+        self.lexer = ColdfusionHtmlLexer()
+
+    def testBasicComment(self):
+        fragment = u'<!--- cfcomment --->'
+        expected = [
+            (Token.Text, u''),
+            (Token.Comment.Multiline, u'<!---'),
+            (Token.Comment.Multiline, u' cfcomment '),
+            (Token.Comment.Multiline, u'--->'),
+            (Token.Text, u'\n'),
+        ]
+        self.assertEqual(expected, list(self.lexer.get_tokens(fragment)))
+
+    def testNestedComment(self):
+        fragment = u'<!--- nested <!--- cfcomment ---> --->'
+        expected = [
+            (Token.Text, u''),
+            (Token.Comment.Multiline, u'<!---'),
+            (Token.Comment.Multiline, u' nested '),
+            (Token.Comment.Multiline, u'<!---'),
+            (Token.Comment.Multiline, u' cfcomment '),
+            (Token.Comment.Multiline, u'--->'),
+            (Token.Comment.Multiline, u' '),
+            (Token.Comment.Multiline, u'--->'),
+            (Token.Text, u'\n'),
+        ]
+        self.assertEqual(expected, list(self.lexer.get_tokens(fragment)))