From: <dfr...@us...> - 2007-09-13 05:46:18
|
Revision: 13570 http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=13570&view=rev Author: dframpton-oss Date: 2007-09-12 22:46:02 -0700 (Wed, 12 Sep 2007) Log Message: ----------- Add legend for graphs courtesy of Steve, and improve consistency of UI Modified Paths: -------------- cattrack/trunk/app/helpers/results/test_run_helper.rb cattrack/trunk/app/views/report/regression_report_mailer/report.rhtml cattrack/trunk/app/views/results/test_run/performance_report.haml cattrack/trunk/app/views/results/test_run/regression_report.haml cattrack/trunk/app/views/results/test_run/show.haml cattrack/trunk/app/views/results/test_run/show_summary.haml cattrack/trunk/app/views/results/test_run/statistics_report.haml Added Paths: ----------- cattrack/trunk/public/images/legend.png Modified: cattrack/trunk/app/helpers/results/test_run_helper.rb =================================================================== --- cattrack/trunk/app/helpers/results/test_run_helper.rb 2007-09-13 02:57:21 UTC (rev 13569) +++ cattrack/trunk/app/helpers/results/test_run_helper.rb 2007-09-13 05:46:02 UTC (rev 13570) @@ -20,6 +20,10 @@ "<a href=\"#\" id=\"#{name}_toggle\" class=\"toggle_visibility open\" onclick=\"#{hide_tests_javascript(name)}; return false;\">#{label}</a>" end + def legend_header() + "<a href=\"#\" id=\"legend_toggle\" class=\"toggle_visibility open\" onclick=\"#{hide_tests_javascript('legend')}; return false;\">Click for Image Legend</a><div id='legend' width='100%'><center><img src='#{image_path('legend.png')}'></center></div><script type='text/javascript'> #{hide_tests_javascript('legend')} </script>" + end + def test_link(row, only_path = true) options = {:controller => "/results/test_case", :action => 'show'} options[:host_name] = @report.test_run.host.name @@ -31,7 +35,7 @@ options[:test_case_name] = row['test_case_name'] options[:only_path] = only_path - link_to('Show', options) + link_to('Details', options) end def stat_img(row,large) Modified: cattrack/trunk/app/views/report/regression_report_mailer/report.rhtml =================================================================== --- cattrack/trunk/app/views/report/regression_report_mailer/report.rhtml 2007-09-13 02:57:21 UTC (rev 13569) +++ cattrack/trunk/app/views/report/regression_report_mailer/report.rhtml 2007-09-13 05:46:02 UTC (rev 13570) @@ -5,7 +5,14 @@ <body style="margin: 10px 10px 10px 10px; background-color: #FFFFFF; color: #000000; font-family: verdana, arial, helvetica, sans-serif;"> <h2>Regression summary for <%= h(@test_run.variant) %> (r<%= h(@test_run.revision) %>) on <%= h(@host.name) %>, <%= h(@test_run.start_time) %></h2> <% report_url = url_for(:controller => 'results/test_run', :action => 'regression_report', :host_name => @host.name, :test_run_variant => @test_run.variant, :test_run_id => @test_run.id, :only_path => false) %> -<p>See the <a href="<%= report_url %>">Full Report</a></p> +<p>See the <a href="<%= report_url %>">Full Report</a> +<% stats_url = url_for(:controller => 'results/test_run', :action => 'statistics_report', :host_name => @host.name, :test_run_variant => @test_run.variant, :test_run_id => @test_run.id, :only_path => false) %> + <a href="<%= report_url %>">Statistics Report</a> +<% if @test_run.variant == 'perf' %> +<% perf_url = url_for(:controller => 'results/test_run', :action => 'performance_report', :host_name => @host.name, :test_run_variant => @test_run.variant, :test_run_id => @test_run.id, :only_path => false) %> + <a href="<%= report_url %>">Performance Report</a> +<% end %> +</p> <% if @report.test_runs.size > 1 %> <% scm_url = SystemSetting['scm.url'] %> <p>Revisions covered by this test run: <%= ((@report.test_runs[@report.test_runs.size - 2].revision)..(@report.test_runs[@report.test_runs.size - 1].revision)).collect {|r| revision_link_for_url(scm_url, r)}.join(",\n") %></p> Modified: cattrack/trunk/app/views/results/test_run/performance_report.haml =================================================================== --- cattrack/trunk/app/views/results/test_run/performance_report.haml 2007-09-13 02:57:21 UTC (rev 13569) +++ cattrack/trunk/app/views/results/test_run/performance_report.haml 2007-09-13 05:46:02 UTC (rev 13570) @@ -5,6 +5,13 @@ - scm_url = SystemSetting['scm.url'] %h1.page-title= @page_title +%ul.actions + %li= link_for(@report.test_run, :label => 'Summary', :action => 'show_summary') + %li= link_for(@report.test_run, :label => 'Regression Report', :controller => '/results/test_run', :action => 'regression_report') + %li= link_for(@report.test_run, :label => 'Statistics Report', :controller => '/results/test_run', :action => 'statistics_report') +.clearer += legend_header() + %h2 Scores for SPECjbb2000/2005 %table.perf %tr Modified: cattrack/trunk/app/views/results/test_run/regression_report.haml =================================================================== --- cattrack/trunk/app/views/results/test_run/regression_report.haml 2007-09-13 02:57:21 UTC (rev 13569) +++ cattrack/trunk/app/views/results/test_run/regression_report.haml 2007-09-13 05:46:02 UTC (rev 13570) @@ -3,6 +3,13 @@ - scm_url = SystemSetting['scm.url'] %h1.page-title= @page_title +%ul.actions + %li= link_for(@report.test_run, :label => 'Summary', :action => 'show_summary') + %li= link_for(@report.test_run, :label => 'Statistics Report', :controller => '/results/test_run', :action => 'statistics_report') + - if @report.test_run.variant == 'perf' + %li= link_for(@report.test_run, :label => 'Performance Report', :controller => '/results/test_run', :action => 'performance_report') +.clearer + - if @report.missing_tests.size > 0 = tests_header('missing_tests', pluralize(@report.missing_tests.size, 'Missing Tests')) %table#missing_tests.list @@ -23,62 +30,62 @@ = tests_header('new_failures', pluralize(@report.new_failures.size, 'New Failures')) %table#new_failures.list %tr + %th %th Build Configuration %th Test Configuration %th Group %th Test %th Result - %th Operations - @report.new_failures.each do |t| %tr{:class => cycle('odd','even')} + %td + %ul.actions + %li= test_link(t) %td= h(t['build_configuration_name']) %td= h(t['test_configuration_name']) %td= h(t['group_name']) %td= h(t['test_case_name']) %td= h(t['test_case_execution']) - %td - %ul.actions - %li= test_link(t) - if @report.new_successes.size > 0 = tests_header('new_successes', pluralize(@report.new_successes.size, 'New Successes')) %table#new_successes.list %tr + %th %th Build Configuration %th Test Configuration %th Group %th Test - %th Operations - @report.new_successes.each do |t| %tr{:class => cycle('odd','even')} + %td + %ul.actions + %li= test_link(t) %td= h(t['build_configuration_name']) %td= h(t['test_configuration_name']) %td= h(t['group_name']) %td= h(t['test_case_name']) - %td - %ul.actions - %li= test_link(t) - if @report.intermittent_failures.size > 0 = tests_header('intermittent_failures', pluralize(@report.intermittent_failures.size, 'Intermittent Failures')) %table#intermittent_failures.list %tr + %th %th Build Configuration %th Test Configuration %th Group %th Test %th Result - %th Operations - @report.intermittent_failures.each do |t| %tr{:class => cycle('odd','even')} + %td + %ul.actions + %li= test_link(t) %td= h(t['build_configuration_name']) %td= h(t['test_configuration_name']) %td= h(t['group_name']) %td= h(t['test_case_name']) %td= h(t['test_case_execution']) - %td - %ul.actions - %li= test_link(t) %script{ :type => 'text/javascript' } = hide_tests_javascript('intermittent_failures'); @@ -86,22 +93,22 @@ = tests_header('consistent_failures', pluralize(@report.consistent_failures.size, 'Consistent Failures')) %table#consistent_failures.list %tr + %th %th Build Configuration %th Test Configuration %th Group %th Test %th Result - %th Operations - @report.consistent_failures.each do |t| %tr{:class => cycle('odd','even')} + %td + %ul.actions + %li= test_link(t) %td= h(t['build_configuration_name']) %td= h(t['test_configuration_name']) %td= h(t['group_name']) %td= h(t['test_case_name']) %td= h(t['test_case_execution']) - %td - %ul.actions - %li= test_link(t) %script{ :type => 'text/javascript' } = hide_tests_javascript('consistent_failures'); @@ -113,18 +120,18 @@ %h2 Test Runs Covered By Report %table.list %tr + %th %th Name %th Revision %th Time - %th Operations - @report.test_runs.each do |t| %tr{:class => cycle('odd','even')} + %td + %ul.actions + %li= link_for(t, :label => "Show") %td= h(t.label) %td= revision_link_for_url(scm_url, t.revision) %td= t.start_time - %td - %ul.actions - %li= link_for(t, :label => "Show") - if @report.statistics.size > 0 or @report.test_runs.size > 1 %h2 Performance Statistics Modified: cattrack/trunk/app/views/results/test_run/show.haml =================================================================== --- cattrack/trunk/app/views/results/test_run/show.haml 2007-09-13 02:57:21 UTC (rev 13569) +++ cattrack/trunk/app/views/results/test_run/show.haml 2007-09-13 05:46:02 UTC (rev 13570) @@ -34,26 +34,26 @@ %h3 Build Runs %table.list %tr + %th %th Build %th Result - %th Operations - @record.build_configurations.each do |bc| %tr{:class => cycle('odd','even')} + %td= link_for(bc, :label => 'Details') %td= h(bc.label) %td= h(bc.result) - %td= link_for(bc, :label => 'Show') %h3 Test Configurations %table.list %tr + %th %th Build Configuration %th Name %th Success Rate - %th Operations - @record.build_configurations.each do |bc| - bc.test_configurations.each do |tc| %tr{:class => cycle('odd','even')} + %td= link_for(tc, :label => 'Details') %td= link_for(bc) %td= h(tc.label) %td= tc.success_rate - %td= link_for(tc, :label => 'Show') Modified: cattrack/trunk/app/views/results/test_run/show_summary.haml =================================================================== --- cattrack/trunk/app/views/results/test_run/show_summary.haml 2007-09-13 02:57:21 UTC (rev 13569) +++ cattrack/trunk/app/views/results/test_run/show_summary.haml 2007-09-13 05:46:02 UTC (rev 13570) @@ -8,6 +8,7 @@ %h3 Unsuccessful Tests %table.list %tr + %th %th Build Configuration %th Test Configuration %th Group @@ -15,9 +16,11 @@ %th Name %th Result %th Reason - %th Operations - @record.non_successes.each do |t| %tr{:class => cycle('odd','even')} + %td + %ul.actions + %li= link_for(t.test_case, :label => 'Details') %td= link_for(t.test_case.group.test_configuration.build_configuration) %td= link_for(t.test_case.group.test_configuration) %td= link_for(t.test_case.group) @@ -25,6 +28,3 @@ %td= h(t.name) %td= h(t.result) %td= h(t.result_explanation) - %td - %ul.actions - %li= link_for(t.test_case, :label => 'Show') Modified: cattrack/trunk/app/views/results/test_run/statistics_report.haml =================================================================== --- cattrack/trunk/app/views/results/test_run/statistics_report.haml 2007-09-13 02:57:21 UTC (rev 13569) +++ cattrack/trunk/app/views/results/test_run/statistics_report.haml 2007-09-13 05:46:02 UTC (rev 13570) @@ -2,22 +2,29 @@ - @page_title = "Statistics Report: #{h(@report.test_run.label)}" - scm_url = SystemSetting['scm.url'] %h1.page-title= @page_title +%ul.actions + %li= link_for(@report.test_run, :label => 'Summary', :action => 'show_summary') + %li= link_for(@report.test_run, :label => 'Statistics Report', :controller => '/results/test_run', :action => 'statistics_report') + - if @report.test_run.variant == 'perf' + %li= link_for(@report.test_run, :label => 'Performance Report', :controller => '/results/test_run', :action => 'performance_report') +.clearer += legend_header() %h2 Test Runs Covered By Report %table.list %tr + %th %th Name %th Revision %th Time - %th Operations - @report.test_runs.each do |t| %tr{:class => cycle('odd','even')} + %td + %ul.actions + %li= link_for(t, :label => "Details") %td= h(t.label) %td= revision_link_for_url(scm_url, t.revision) %td= t.start_time - %td - %ul.actions - %li= link_for(t, :label => "Show") - if @report.statistics.size > 0 or @report.test_runs.size > 1 %h2 Statistics Added: cattrack/trunk/public/images/legend.png =================================================================== (Binary files differ) Property changes on: cattrack/trunk/public/images/legend.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |