diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/executable/suite.rb | 4 | ||||
| -rwxr-xr-x | test/functional/basic.rb | 8 | ||||
| -rwxr-xr-x | test/functional/examples.rb | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/test/executable/suite.rb b/test/executable/suite.rb index b3f8025..42fb049 100644 --- a/test/executable/suite.rb +++ b/test/executable/suite.rb @@ -174,7 +174,7 @@ class TestCodeRayExecutable < Test::Unit::TestCase should 'respect the file extension and highlight the input as Python' do target = coderay(command) - assert_equal %w(kw cl kw), target[pre, 1].scan(tag_class).flatten + assert_equal %w(keyword class keyword), target[pre, 1].scan(tag_class).flatten end end @@ -189,7 +189,7 @@ class TestCodeRayExecutable < Test::Unit::TestCase should 'ignore the file extension and highlight the input as Ruby' do target = coderay(command) - assert_equal %w(kw cl), target[pre, 1].scan(tag_class).flatten + assert_equal %w(keyword class), target[pre, 1].scan(tag_class).flatten end end diff --git a/test/functional/basic.rb b/test/functional/basic.rb index 5d82f5f..1702e4e 100755 --- a/test/functional/basic.rb +++ b/test/functional/basic.rb @@ -30,8 +30,8 @@ class BasicTest < Test::Unit::TestCase end end - RUBY_TEST_HTML = 'puts <span class="s"><span class="dl">"</span>' + - '<span class="k">Hello, World!</span><span class="dl">"</span></span>' + RUBY_TEST_HTML = 'puts <span class="string"><span class="delimiter">"</span>' + + '<span class="content">Hello, World!</span><span class="delimiter">"</span></span>' def test_simple_highlight assert_nothing_raised do assert_equal RUBY_TEST_HTML, CodeRay.scan(RUBY_TEST_CODE, :ruby).html @@ -59,7 +59,7 @@ class BasicTest < Test::Unit::TestCase end def test_highlight_file - assert_match "require <span class=\"s\"><span class=\"dl\">'</span><span class=\"k\">test/unit</span><span class=\"dl\">'</span></span>\n", CodeRay.highlight_file(__FILE__) + assert_match "require <span class=\"string\"><span class=\"delimiter\">'</span><span class=\"content\">test/unit</span><span class=\"delimiter\">'</span></span>\n", CodeRay.highlight_file(__FILE__) end def test_duo @@ -147,7 +147,7 @@ more code # and another comment, in-line. assert_kind_of String, css_class, "TokenKinds[%p] == %p" % [kind, css_class] end end - assert_equal 'r', CodeRay::TokenKinds[:reserved] + assert_equal 'reserved', CodeRay::TokenKinds[:reserved] assert_equal false, CodeRay::TokenKinds[:shibboleet] end diff --git a/test/functional/examples.rb b/test/functional/examples.rb index 3de8be5..b13cb55 100755 --- a/test/functional/examples.rb +++ b/test/functional/examples.rb @@ -22,7 +22,7 @@ end CODE assert_equal <<-DIV, div <table class="CodeRay"><tr> - <td class="line_numbers" title="double click to toggle" ondblclick="with (this.firstChild.style) { display = (display == '') ? 'none' : '' }"><pre><a href="#n1" name="n1">1</a> + <td class="line-numbers" title="double click to toggle" ondblclick="with (this.firstChild.style) { display = (display == '') ? 'none' : '' }"><pre><a href="#n1" name="n1">1</a> <a href="#n2" name="n2">2</a> <a href="#n3" name="n3">3</a> </pre></td> @@ -38,9 +38,9 @@ end <body style="background-color: white;"> <table class="CodeRay"><tr> - <td class="line_numbers" title="double click to toggle" ondblclick="with (this.firstChild.style) { display = (display == '') ? 'none' : '' }"><pre> + <td class="line-numbers" title="double click to toggle" ondblclick="with (this.firstChild.style) { display = (display == '') ? 'none' : '' }"><pre> </pre></td> - <td class="code"><pre>puts <span class="s"><span class="dl">"</span><span class="k">Hello, world!</span><span class="dl">"</span></span></pre></td> + <td class="code"><pre>puts <span class="string"><span class="delimiter">"</span><span class="content">Hello, world!</span><span class="delimiter">"</span></span></pre></td> </tr></table> </body> @@ -90,7 +90,7 @@ Token Types (7): div = tokens.div(:css => :class) assert_equal <<-DIV, div <div class="CodeRay"> - <div class="code"><pre>{ <span class="ke"><span class="dl">"</span><span class="k">just</span><span class="dl">"</span></span>: <span class="s"><span class="dl">"</span><span class="k">an</span><span class="dl">"</span></span>, <span class="ke"><span class="dl">"</span><span class="k">example</span><span class="dl">"</span></span>: <span class="i">42</span> }</pre></div> + <div class="code"><pre>{ <span class="key"><span class="delimiter">"</span><span class="content">just</span><span class="delimiter">"</span></span>: <span class="string"><span class="delimiter">"</span><span class="content">an</span><span class="delimiter">"</span></span>, <span class="key"><span class="delimiter">"</span><span class="content">example</span><span class="delimiter">"</span></span>: <span class="integer">42</span> }</pre></div> </div> DIV |