Snippets/untitled.tmSnippet
Support/phpunit.rb
@@ -3,11 +3,13 @@
<plist version="1.0">
<dict>
<key>content</key>
- <string>public function setUp() {
+ <string>public function setUp()
+{
$1
}
-${2:public function tearDown() {
+${2:public function tearDown()
+{
$3
\}}
Snippets/fixture.tmSnippet
@@ -6,7 +6,8 @@
<string>/**
* @expectedException ${1:ExceptionClassName}
*/
-public function test${2:TestName}() {
+public function test${2:TestName}()
+{
$0
}</string>
<key>name</key>
Snippets/test (expected exception).tmSnippet
@@ -5,7 +5,8 @@
<key>content</key>
<string>require_once 'PHPUnit/Framework.php';
-class ${1:ClassName}Test extends PHPUnit_Framework_TestCase {
+class ${1:ClassName}Test extends PHPUnit_Framework_TestCase
+{
$0
}</string>
<key>name</key>
Snippets/testcase.tmSnippet
@@ -4,56 +4,56 @@
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<title>
- PHPUnit Results: <%= title %>
+ PHPUnit Results
</title>
<style type="text/css" media="screen">
/* yui - reset */
html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;}
- #head {
+ .head {
padding: 1em;
background: #000;
color: #FFF;
}
- #head h1 .filename {
+ .head h1 .filename {
font-weight: bold;
}
- #summary {
+ .summary {
font-size: .9em;
float: right;
}
- #summary li {
+ .summary li {
display: inline;
padding: 0 .3em;
}
- #body {
+ .body {
padding: 1em;
}
- #results .time {
+ .results .time {
float: right;
}
- #results li {
+ .results li {
padding: 4px;
margin: 0 0 4px 0;
font-size: .9em;
}
- #results li h3 {
+ .results li h3 {
font-weight: bold;
}
- #results li h3 > span {
+ .results li h3 > span {
font-weight: normal;
}
- #results .message {
+ .results .message {
padding: 1em;
margin: 4px 0 0 0;
background: #333;
@@ -63,50 +63,81 @@
font-family: monospace;
}
- #results .message a:link,
- #results .message a:visited,
- #results .message a:active {
+ .results .message a:link,
+ .results .message a:visited,
+ .results .message a:active {
color: #FF0;
font-family: Arial, "MS Trebuchet", sans-serif;
}
.total { background: #999; color: #FFF; }
- #head.pass, .pass { background: #9f6; color: #090; }
- #head.fail, .fail { background: #C00; color: #FFF; }
- #head.skipped, .skipped { background: #CCC; color: #999; }
- #head.incomplete, .incomplete { background: #FC0; color: #960; }
+ .head.pass { background: #090; color: #FFF; }
+ li.pass { background: #9f6; color: #090; border-left: 1em solid #090; }
+ .head.fail, li.fail { background: #C00; color: #FFF; }
+
+ #parent {
+ padding: 2em;
+ }
+
+ #parent .body {
+ padding: 0;
+ }
+
+ #parent .head {
+ padding: 4px;
+ margin: 0 0 4px 0;
+ }
</style>
</head>
<body>
- <div id="head" class="<%= overall_status %>">
- <div id="summary">
+ <% if results[:parent] %>
+ <div class="head <%= results[:parent][:status] %>">
+ <div class="summary">
+ <ul>
+ <% if results[:parent][:counts][:fail] > 0 %><li><%= results[:parent][:counts][:fail] %> Fail</li><% end %>
+ <% if results[:parent][:counts][:pass] > 0 %><li><%= results[:parent][:counts][:pass] %> Pass</li><% end %>
+ <% if results[:parent][:counts][:assertions] > 0 %><li><%= results[:parent][:counts][:assertions] %> Assertions</li><% end %>
+ <li>Total time: <%= results[:parent][:total_time] %> sec</li>
+ </ul>
+ </div>
+ <h1 class="phpunit_results"><span class="filename"><%= results[:parent][:name] %></span></h1>
+ </div>
+ <div id="parent">
+ <% end %>
+ <% for testsuite in results[:suites] %>
+ <div class="head <%= testsuite[:status] %>">
+ <div class="summary">
<ul>
- <% if counts[:fail] > 0 %><li><%= counts[:fail] %> Fail</li><% end %>
- <% if counts[:pass] > 0 %><li><%= counts[:pass] %> Pass</li><% end %>
- <% if counts[:assertions] > 0 %><li><%= counts[:assertions] %> Assertions</li><% end %>
+ <% if testsuite[:counts][:fail] > 0 %><li><%= testsuite[:counts][:fail] %> Fail</li><% end %>
+ <% if testsuite[:counts][:pass] > 0 %><li><%= testsuite[:counts][:pass] %> Pass</li><% end %>
+ <% if testsuite[:counts][:assertions] > 0 %><li><%= testsuite[:counts][:assertions] %> Assertions</li><% end %>
</ul>
</div>
- <h1 id="phpunit_results">PHPUnit Results: <span class="filename"><%= title %></span></h1>
+ <h1 class="phpunit_results"><span class="filename"><%= testsuite[:name] %></span></h1>
</div>
- <div id="body">
- <div id="results">
+ <div class="body">
+ <div class="results">
<ul>
- <% for r in test_results do %>
- <li class="<%= r['status']%>">
- <span class="time"><%= "%01.8f" % r["time"] %> sec</span>
- <h3><span><%= r["status"].capitalize %></span>: <%= r["test"].gsub(/_/," ").gsub(/\([^\)]+\)/,'') %></h3>
- <% if r["status"] == 'fail' %>
-<div class="message"><%= r['message'] %></div>
+ <% for r in testsuite[:cases] do %>
+ <li class="<%= r[:status]%>">
+ <span class="time"><%= "%01.8f" % r[:time] %> sec</span>
+ <h3><%= r[:test].gsub(/_/," ").gsub(/\([^\)]+\)/,'') %></h3>
+ <% if r[:status] == 'fail' %>
+<div class="message"><%= r[:message] %></div>
<% end %>
</li>
<% end %>
<li class="total">
- <span class="time"><%= "%01.8f" % total_time %> sec</span>
+ <span class="time"><%= "%01.8f" % testsuite[:total_time] %> sec</span>
<h3>Total time:</h3>
</li>
</ul>
</div>
</div>
+ <% end %>
+ <% if results[:parent] %>
+ </div>
+ <% end %>
</body>
-</html>
+</html>
\ No newline at end of file
Support/results.html.erb
@@ -3,40 +3,13 @@ require 'rubygems'
require 'xml'
require 'erb'
require "#{ENV['TM_BUNDLE_SUPPORT']}/header.rb"
+require "#{ENV['TM_BUNDLE_SUPPORT']}/phpunit.rb"
test_name = TestFinder.find_last_test_before_line(ENV['TM_FILEPATH'], ENV['TM_LINE_NUMBER'])
is_remote = ENV["REMOTE_HOST"] && ENV["REMOTE_PATH"] && ENV["LOCAL_PATH"]
file = ENV['TM_FILENAME']
dir = is_remote ? ENV['TM_DIRECTORY'].gsub(/#{ENV['LOCAL_PATH']}/,ENV["REMOTE_PATH"]) : ENV['TM_DIRECTORY']
cmd = is_remote ? "ssh #{ENV['REMOTE_HOST']}" : "/bin/sh"
-
output = `#{cmd} "cd \"#{dir}\"; phpunit --log-xml /tmp/#{file}.xml --filter #{test_name} #{file} > /dev/null; cat /tmp/#{file}.xml; rm /tmp/#{file}.xml"`
-
-
-xml = XML::Document.string(output)
-test_results = []
-
-xml.find("/testsuites/testsuite/testcase").each do |tc|
- testcase = {}
- testcase['test'] = tc.attributes.get_attribute('name').value.to_s
- testcase['time'] = tc.attributes.get_attribute('time').value.to_f
- testcase['assertions'] = tc.attributes.get_attribute('assertions').value.to_i
- testcase['status'] = 'pass'
- if tc.children?
- testcase['status'] = 'fail'
- testcase['message'] = tc.find_first('failure/text()').content.gsub(/^\n/, '').gsub(/^\s+\w/, '').gsub(/^.+#{ENV['REMOTE_PATH']}/, ENV['LOCAL_PATH']).escape_html.gsub(/<br>/, '').add_code_links
- end
- test_results << testcase
-end
-
-testsuite = xml.find_first("/testsuites/testsuite")
-title = testsuite.attributes.get_attribute('name').value.gsub(/_/," ")
-
-counts = {}
-counts[:fail] = testsuite.attributes.get_attribute('failures').value.to_i
-counts[:pass] = testsuite.attributes.get_attribute('tests').value.to_i - counts[:fail]
-counts[:assertions] = testsuite.attributes.get_attribute('tests').value.to_i
-overall_status = counts[:fail] > 0 ? 'fail' : 'pass'
-total_time = testsuite.attributes.get_attribute('time').value.to_f
-
+results = PHPUnit::Processor.xml(output)
puts ERB.new(File.read("#{ENV['TM_BUNDLE_SUPPORT']}/results.html.erb")).result(binding)
\ No newline at end of file
Support/run_single_test.rb
@@ -3,39 +3,12 @@ require 'rubygems'
require 'xml'
require 'erb'
require "#{ENV['TM_BUNDLE_SUPPORT']}/header.rb"
+require "#{ENV['TM_BUNDLE_SUPPORT']}/phpunit.rb"
is_remote = ENV["REMOTE_HOST"] && ENV["REMOTE_PATH"] && ENV["LOCAL_PATH"]
file = ENV['TM_FILENAME']
dir = is_remote ? ENV['TM_DIRECTORY'].gsub(/#{ENV['LOCAL_PATH']}/,ENV["REMOTE_PATH"]) : ENV['TM_DIRECTORY']
cmd = is_remote ? "ssh #{ENV['REMOTE_HOST']}" : "/bin/sh"
-
output = `#{cmd} "cd \"#{dir}\"; phpunit --log-xml /tmp/#{file}.xml #{file} > /dev/null; cat /tmp/#{file}.xml; rm /tmp/#{file}.xml"`
-
-
-xml = XML::Document.string(output)
-test_results = []
-
-xml.find("/testsuites/testsuite/testcase").each do |tc|
- testcase = {}
- testcase['test'] = tc.attributes.get_attribute('name').value.to_s
- testcase['time'] = tc.attributes.get_attribute('time').value.to_f
- testcase['assertions'] = tc.attributes.get_attribute('assertions').value.to_i
- testcase['status'] = 'pass'
- if tc.children?
- testcase['status'] = 'fail'
- testcase['message'] = tc.find_first('failure/text()').content.gsub(/^\n/, '').gsub(/^\s+\w/, '').gsub(/^.+#{ENV['REMOTE_PATH']}/, ENV['LOCAL_PATH']).escape_html.gsub(/<br>/, '').add_code_links
- end
- test_results << testcase
-end
-
-testsuite = xml.find_first("/testsuites/testsuite")
-title = testsuite.attributes.get_attribute('name').value.gsub(/_/," ")
-
-counts = {}
-counts[:fail] = testsuite.attributes.get_attribute('failures').value.to_i
-counts[:pass] = testsuite.attributes.get_attribute('tests').value.to_i - counts[:fail]
-counts[:assertions] = testsuite.attributes.get_attribute('tests').value.to_i
-overall_status = counts[:fail] > 0 ? 'fail' : 'pass'
-total_time = testsuite.attributes.get_attribute('time').value.to_f
-
-puts ERB.new(File.read("#{ENV['TM_BUNDLE_SUPPORT']}/results.html.erb")).result(binding)
+results = PHPUnit::Processor.xml(output)
+puts ERB.new(File.read("#{ENV['TM_BUNDLE_SUPPORT']}/results.html.erb")).result(binding)
\ No newline at end of file
Support/run_tests.rb
@@ -54,8 +54,8 @@
<array>
<string>8228ACD2-6C9D-47CE-B4A6-082DAB1C5649</string>
<string>8A605C02-D7F6-43AD-9126-9965C9EB0E21</string>
- <string>BF46602F-3676-44EC-ABF8-225DF9341A9A</string>
<string>46BF4991-44F3-4E95-9055-66E089A159EA</string>
+ <string>8B95FE77-8E5B-4E41-BF27-69B179CD690C</string>
<string>87754C58-78F6-4BD3-9FD4-BC6B49180863</string>
<string>660B663C-F31B-4811-8970-45EE38238082</string>
<string>0A8A8F33-FD92-476A-A965-33ED423FF6DE</string>
info.plist
Snippets/test.tmSnippet
d4dc1fea2b57cc9e358ca0bc442a663e6dbd2803
Christopher Cowan
ccowan@playpeace-lm.corp.yahoo.com
http://github.com/meritt/phpunit-tmbundle/commit/b277f1f072ed4b0960a3707c4e35400c84e0c46b
b277f1f072ed4b0960a3707c4e35400c84e0c46b
2009-06-09T01:03:04-07:00
2009-06-08T22:25:00-07:00
Fixing the the curly braces to my liking; Re-factorig the XML processor; Adding support for test suites.
Signed-off-by: Alexey Simonenko <dwarfman@gmail.com>
f28b21155dc9f5fd878c005362137629b08fd04b
Alexey Simonenko
dwarfman@gmail.com