Projects November 2005

projects@lrde.epita.fr

6 participants
85 discussions

[ranch] 56: Test systems controller requests.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Test systems controller requests. * web/ranch/test/functional/systems_controller_test.rb: Test index and list request. * web/ranch/app/controllers/systems_controller.rb: Redirect to list rather than to call list and render using its template. app/controllers/systems_controller.rb | 3 +-- test/functional/systems_controller_test.rb | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) Index: web/ranch/test/functional/systems_controller_test.rb --- web/ranch/test/functional/systems_controller_test.rb (revision 55) +++ web/ranch/test/functional/systems_controller_test.rb (working copy) @@ -5,14 +5,26 @@ class SystemsController; def rescue_action(e) raise e end; end class SystemsControllerTest < Test::Unit::TestCase + fixtures :systems + def setup @controller = SystemsController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new end - # Replace this with your real tests. - def test_truth - assert true + def test_index + get :index + assert_response :redirect + assert_redirected_to(:action => 'list') end + + def test_list + get :list + assert_response :success + assert_template 'list' + + assert_not_nil assigns(:systems) + end + end Index: web/ranch/app/controllers/systems_controller.rb --- web/ranch/app/controllers/systems_controller.rb (revision 55) +++ web/ranch/app/controllers/systems_controller.rb (working copy) @@ -3,8 +3,7 @@ layout 'systems' def index - list - render :action => 'list' + redirect_to :action => 'list' end def list

18 years, 5 months

[ranch] 55: Add the systems controller.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Add the systems controller. * web/ranch/app/views/layouts/_menubar.rhtml: Add the `Systems' menu item. * web/ranch/app/controllers/systems_controller.rb: New. Implement the index and list request. * web/ranch/app/views/layouts/systems.rhtml: New. Layout for the systems controller. * web/ranch/app/views/systems: New. * web/ranch/app/views/systems/list.rhtml: New. View for the list request. * web/ranch/app/views/systems/_menubar.rhtml: New. Menu bar part of the systems layout. * web/ranch/test/functional/systems_controller_test.rb, * web/ranch/app/helpers/systems_helper.rb: New. Generated by Rails. app/controllers/systems_controller.rb | 14 ++++++++++++++ app/helpers/systems_helper.rb | 2 ++ app/views/layouts/_menubar.rhtml | 1 + app/views/layouts/systems.rhtml | 24 ++++++++++++++++++++++++ app/views/systems/_menubar.rhtml | 10 ++++++++++ app/views/systems/list.rhtml | 24 ++++++++++++++++++++++++ test/functional/systems_controller_test.rb | 18 ++++++++++++++++++ 7 files changed, 93 insertions(+) Index: web/ranch/test/functional/systems_controller_test.rb --- web/ranch/test/functional/systems_controller_test.rb (revision 0) +++ web/ranch/test/functional/systems_controller_test.rb (revision 0) @@ -0,0 +1,18 @@ +require File.dirname(__FILE__) + '/../test_helper' +require 'systems_controller' + +# Re-raise errors caught by the controller. +class SystemsController; def rescue_action(e) raise e end; end + +class SystemsControllerTest < Test::Unit::TestCase + def setup + @controller = SystemsController.new + @request = ActionController::TestRequest.new + @response = ActionController::TestResponse.new + end + + # Replace this with your real tests. + def test_truth + assert true + end +end Index: web/ranch/app/helpers/systems_helper.rb --- web/ranch/app/helpers/systems_helper.rb (revision 0) +++ web/ranch/app/helpers/systems_helper.rb (revision 0) @@ -0,0 +1,2 @@ +module SystemsHelper +end Index: web/ranch/app/controllers/systems_controller.rb --- web/ranch/app/controllers/systems_controller.rb (revision 0) +++ web/ranch/app/controllers/systems_controller.rb (revision 0) @@ -0,0 +1,14 @@ +class SystemsController < ApplicationController + + layout 'systems' + + def index + list + render :action => 'list' + end + + def list + @systems = System.find :all, :order => "hostname" + end + +end Index: web/ranch/app/views/layouts/systems.rhtml --- web/ranch/app/views/layouts/systems.rhtml (revision 0) +++ web/ranch/app/views/layouts/systems.rhtml (revision 0) @@ -0,0 +1,24 @@ +  + +<html> + <%= render :partial => "layouts/head" %> + <body> + <%= render :partial => "layouts/top_banner" %> + <%= render :partial => "layouts/menubar" %> + + <p> + <table width="100%"> + <tr><td> + <%= render :partial => "systems/menubar" %> + </td></tr> + <tr><td> + <%= @content_for_layout %> + </td></tr> + </table> + </p> + + <%= render :partial => "layouts/bottom_banner" %> + </body> +</html> + + Index: web/ranch/app/views/layouts/_menubar.rhtml --- web/ranch/app/views/layouts/_menubar.rhtml (revision 54) +++ web/ranch/app/views/layouts/_menubar.rhtml (working copy) @@ -5,6 +5,7 @@ <tr> <td><%= link_to "Home", :controller => "ranch" %></td> <td><%= link_to "Projects", :controller => "projects" %></td> + <td><%= link_to "Systems", :controller => "systems" %></td> </tr> </table> <hr> Index: web/ranch/app/views/systems/list.rhtml --- web/ranch/app/views/systems/list.rhtml (revision 0) +++ web/ranch/app/views/systems/list.rhtml (revision 0) @@ -0,0 +1,24 @@ +  + +<p> +<table> + <% + rejected_col = [ "id", "info" ] + columns = System.columns.reject do |column| + rejected_col.include? column.name + end + %> + <tr> + <% for column in columns do %> + <%= content_tag "td", column.name %> + <% end %> + </tr> + <% for system in @systems do %> + <tr> + <% for column in columns do %> + <%= content_tag "td", system.send(column.name) %> + <% end %> + </tr> + <% end %> +</table> +</p> Index: web/ranch/app/views/systems/_menubar.rhtml --- web/ranch/app/views/systems/_menubar.rhtml (revision 0) +++ web/ranch/app/views/systems/_menubar.rhtml (revision 0) @@ -0,0 +1,10 @@ +  +<table> + <tr> + <td> + <%= link_to "List", :controller => "systems", + :action => "list" %> + </td> + </tr> +</table> +<hr>

18 years, 5 months

[ranch] 54: Update unit tests.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Update unit tests. * web/ranch/test/unit/project_test.rb, * web/ranch/test/unit/output_test.rb, * web/ranch/test/unit/bench_test.rb: Assert fixtures are correct and ensure other tests stress only the expected validation rule. * web/ranch/test/fixtures/outputs.yml: system_id is zero and not one. fixtures/outputs.yml | 2 +- unit/bench_test.rb | 14 ++++++++++++-- unit/output_test.rb | 17 ++++++++++++++--- unit/project_test.rb | 8 ++++++++ 4 files changed, 35 insertions(+), 6 deletions(-) Index: web/ranch/test/fixtures/outputs.yml --- web/ranch/test/fixtures/outputs.yml (revision 53) +++ web/ranch/test/fixtures/outputs.yml (working copy) @@ -23,7 +23,7 @@ bench_id: <%= 1 %> arg_num: <%= arg_num += 1 %> set_num: <%= set_num %> - system_id: 0 + system_id: 1 revision: <%= rev %> <% end %> Index: web/ranch/test/unit/project_test.rb --- web/ranch/test/unit/project_test.rb (revision 53) +++ web/ranch/test/unit/project_test.rb (working copy) @@ -7,6 +7,14 @@ assert Project.new.save end + def test_save_fixtures + Project.find_all.each do |project| + assert(project.save, + "cannot save #{project.name}: " + + project.errors.full_messages.inspect) + end + end + def test_save_bad_head_revision_not_numeric foo = Project.new(:name => 'foo', :head_revision => 'foo') assert ! foo.save Index: web/ranch/test/unit/output_test.rb --- web/ranch/test/unit/output_test.rb (revision 53) +++ web/ranch/test/unit/output_test.rb (working copy) @@ -7,18 +7,29 @@ assert Output.new.save end + def test_save_fixtures + Output.find_all.each do |output| + assert(output.save, + "cannot save #{output.name}: " + + output.errors.full_messages.inspect) + end + end + def test_save_arg_num_is_positive - output = Output.new(:arg_num => -1) + output = outputs("determinize_r1_utime_1") + output.arg_num = -1 assert !output.save end def test_save_set_num_is_positive_or_zero - output = Output.new(:set_num => -1) + output = outputs("determinize_r1_utime_1") + output.set_num = -1 assert !output.save end def test_save_presence_of_revision - output = Output.new(:name => 'foo', :revision => 0) + output = outputs("determinize_r1_utime_1") + output.revision = 0 assert !output.save end Index: web/ranch/test/unit/bench_test.rb --- web/ranch/test/unit/bench_test.rb (revision 53) +++ web/ranch/test/unit/bench_test.rb (working copy) @@ -7,13 +7,23 @@ assert Bench.new.save end + def test_save_fixtures + Bench.find_all.each do |bench| + assert(bench.save, + "cannot save #{bench.name}: " + + bench.errors.full_messages.inspect) + end + end + def test_save_presence_of_name - bench = Bench.new(:name => '') + bench = benches("determinize") + bench.name = '' assert !bench.save end def test_save_maximum_lenght_of_name - bench = Bench.new(:name => '' * 256) + bench = benches("open") + bench.name = '' * 256 assert !bench.save end

18 years, 5 months

[ranch] 53: Update inputs test unit.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Update inputs test unit. * web/ranch/test/unit/input_test.rb: Assert fixtures are correct and ensure other tests stress only the expected validation rule. input_test.rb | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) Index: web/ranch/test/unit/input_test.rb --- web/ranch/test/unit/input_test.rb (revision 52) +++ web/ranch/test/unit/input_test.rb (working copy) @@ -7,14 +7,24 @@ assert Input.new.save end + def test_save_fixtures + Input.find_all.each do |input| + assert(input.save, + "cannot save #{input.name}: " + + input.errors.full_messages.inspect) + end + end + def test_save_arg_num_is_positive - output = Output.new(:arg_num => -1) - assert !output.save + input = inputs("determinize_r1_foo_1") + input.arg_num = -1 + assert !input.save end def test_save_set_num_is_positive_or_zero - output = Output.new(:set_num => -1) - assert !output.save + input = inputs("determinize_r1_foo_1") + input.set_num = -1 + assert !input.save end end

18 years, 5 months

[ranch] 52: Update the system table.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Update the system table. * web/ranch/test/unit/system_test.rb: Test the validation rule set. * web/ranch/test/fixtures/systems.yml: Add a second system fixture. * web/ranch/app/models/system.rb: Update the validations rule set. * web/ranch/db/schema.rb: Add cpu and memory information. app/models/system.rb | 22 +++++++++++++++--- db/schema.rb | 19 +++++++++------ test/fixtures/systems.yml | 55 +++++++++++++++++++++++++++++++++++++++++++--- test/unit/system_test.rb | 19 +++++++++++++++ 4 files changed, 100 insertions(+), 15 deletions(-) Index: web/ranch/test/unit/system_test.rb --- web/ranch/test/unit/system_test.rb (revision 51) +++ web/ranch/test/unit/system_test.rb (working copy) @@ -3,6 +3,23 @@ class SystemTest < Test::Unit::TestCase fixtures :systems - def test_truth + def test_save_default + assert ! System.new.save end + + def test_save_fixtures + System.find_all.each do |system| + assert(system.save, + "cannot save #{system.hostname}: " + + system.errors.full_messages.inspect) + end + end + + def test_save_mem_size_positive + system = systems("ouagadougou") + system.mem_size = -42 + assert ! system.save + assert 1, system.errors.count + end + end Index: web/ranch/test/fixtures/systems.yml --- web/ranch/test/fixtures/systems.yml (revision 51) +++ web/ranch/test/fixtures/systems.yml (working copy) @@ -1,14 +1,63 @@ +<% id = 0 %> + ouagadougou: - id: 1 + id: <%= id += 1 %> hostname: ouagadougou.lrde.epita.fr kernel_name: Linux - kernel_version: "2.4.27-2-k7 #1 Tue Aug 16 17:30:14" + kernel_revision: "2.4.27-2-k7" + kernel_version: "#1 Tue Aug 16 17:30:14" host_type: i686 os_name: GNU/Linux - os_version: comp_name: g++ comp_version: 4.0.3 comp_flags: -02 -W -Wall + mem_size: 256664 + cpu_name: "AMD Athlon(tm) XP 2000+" + cpu_frequency: 1661.957 + info: | + Running action system + SYSTEM UNAME: CYGWIN_NT-5.1 pau 1.5.18(0.132/4/2) 2005-07-02 20:30 i686 unknown unknown Cygwin + BUILD DATE: Mon Nov 14 10:13:51 2005 + BUILD SHORTDATE: 14/11 10:13 + HIGHEST SVN REVISION: 26 + BUILD REVISION: 6 + PKG_CONFIG_PATH: + PATH: /cygdrive/d/build_farm/prefix/monoburg/bin:/usr/local/bin:/bin:/cygdrive/c/ghc/ghc-6.4/bin:/cygdrive/c/program files/imagemagick-6.2.5-q16:/cygdrive/c/WINDOWS/system32:/cygdrive/c/WINDOWS:/cygdrive/c/WINDOWS/System32/Wbem:/cygdrive/c/Program Files/Intel/DMIX:/bin + BF_DEPS: + + CFLAGS: + CXXFLAGS: + CC: ccache gcc + CXX: ccache g++ + CONFIGURE OPTIONS: --prefix=/cygdrive/d/build_farm/prefix/ranch + DISTCHECK_CONFIGURE_FLAGS: + + --- gcc (/bin/gcc) --- + gcc (GCC) 3.4.4 (cygming special) (gdc 0.12, using dmd 0.125) + Copyright (C) 2004 Free Software Foundation, Inc. + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + --- g++ (/bin/g++) --- + g++ (GCC) 3.4.4 (cygming special) (gdc 0.12, using dmd 0.125) + Copyright (C) 2004 Free Software Foundation, Inc. + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +vaucanson: + id: <%= id += 1 %> + hostname: vaucanson + kernel_name: Linux + kernel_revision: 2.6.10-1.760_FC3smp + kernel_version: "#1 SMP Wed Feb 2 00:29:03 EST 2005" + host_type: i686 + os_name: GNU/Linux + comp_name: g++ + comp_version: 4.0.1 + comp_flags: -02 -W -Wall + mem_size: 4151600 + cpu_name: "Intel(R) Xeon(TM) CPU 3.20GHz" + cpu_frequency: 3194.224 info: | Running action system SYSTEM UNAME: CYGWIN_NT-5.1 pau 1.5.18(0.132/4/2) 2005-07-02 20:30 i686 unknown unknown Cygwin Index: web/ranch/app/models/system.rb --- web/ranch/app/models/system.rb (revision 51) +++ web/ranch/app/models/system.rb (working copy) @@ -2,15 +2,31 @@ has_many :output - validates_presence_of :hostname + validates_presence_of(:hostname, + :kernel_name, :kernel_revision, :kernel_version, + :host_type, + :os_name, + :comp_name, :comp_version, :comp_flags, + :mem_size, + :cpu_name, :cpu_frequency) validates_length_of :hostname, :maximum => 128 validates_length_of :kernel_name, :maximum => 128 + validates_length_of :kernel_revision, :maximum => 128 validates_length_of :kernel_version, :maximum => 128 validates_length_of :host_type, :maximum => 128 validates_length_of :os_name, :maximum => 128 - validates_length_of :os_version, :maximum => 128 validates_length_of :comp_name, :maximum => 128 validates_length_of :comp_version, :maximum => 128 - validates_length_of :comp_flags, :maximum => 128 + validates_length_of :comp_flags, :maximum => 255 + validates_numericality_of :mem_size, :only_integer => true + validates_length_of :mem_size, :maximum => 255 + validates_length_of :cpu_name, :maximum => 128 + validates_numericality_of :cpu_frequency + + protected + + def validate + errors.add("mem_size", "is not positive") unless mem_size.to_i > 0 + end end Index: web/ranch/db/schema.rb --- web/ranch/db/schema.rb (revision 51) +++ web/ranch/db/schema.rb (working copy) @@ -40,14 +40,17 @@ create_table "systems", :force => true do |t| t.column "hostname", :string, :limit => 128, :default => "localhost", :null => false - t.column "kernel_name", :string, :limit => 64 - t.column "kernel_version", :string, :limit => 64 - t.column "host_type", :string, :limit => 64 - t.column "os_name", :string, :limit => 64 - t.column "os_version", :string, :limit => 64 - t.column "comp_name", :string, :limit => 64 - t.column "comp_version", :string, :limit => 64 - t.column "comp_flags", :string, :limit => 64 + t.column "kernel_name", :string, :limit => 128, :default => "", :null => false + t.column "kernel_revision", :string, :limit => 128, :default => "", :null => false + t.column "kernel_version", :string, :limit => 128, :default => "", :null => false + t.column "host_type", :string, :limit => 128, :default => "", :null => false + t.column "os_name", :string, :limit => 128, :default => "", :null => false + t.column "comp_name", :string, :limit => 128, :default => "", :null => false + t.column "comp_version", :string, :limit => 128, :default => "", :null => false + t.column "comp_flags", :string, :default => "", :null => false + t.column "mem_size", :integer, :default => 0, :null => false + t.column "cpu_name", :string, :limit => 128, :default => "", :null => false + t.column "cpu_frequency", :float, :default => 0.0, :null => false t.column "info", :text end

18 years, 5 months

[ranch] 51: Capitalize menu items.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Capitalize menu items. * web/ranch/app/views/benches/_menubar.rhtml, * web/ranch/app/views/projects/_menubar.rhtml: Captitalize menu items. benches/_menubar.rhtml | 4 ++-- projects/_menubar.rhtml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Index: web/ranch/app/views/benches/_menubar.rhtml --- web/ranch/app/views/benches/_menubar.rhtml (revision 50) +++ web/ranch/app/views/benches/_menubar.rhtml (working copy) @@ -3,12 +3,12 @@ <tr> <td><%= content_tag "h3", @bench.name %></td> <td> - <%= link_to "information", :controller => "benches", + <%= link_to "Information", :controller => "benches", :action => "show", :bench_id => @bench.id %> </td> <td> - <%= link_to "regression", :controller => "benches", + <%= link_to "Regression", :controller => "benches", :action => "regression", :bench_id => @bench.id %> </td> Index: web/ranch/app/views/projects/_menubar.rhtml --- web/ranch/app/views/projects/_menubar.rhtml (revision 50) +++ web/ranch/app/views/projects/_menubar.rhtml (working copy) @@ -3,12 +3,12 @@ <tr> <td><%= content_tag "h3", @project.name %></td> <td> - <%= link_to "information", :controller => "projects", + <%= link_to "Information", :controller => "projects", :action => "show", :project_id => @project.id %> </td> <td> - <%= link_to "benchmarks", :controller => "benches", + <%= link_to "Benchmarks", :controller => "benches", :action => "index", :project_id => @project.id %> </td>

18 years, 5 months

[ranch] 50: Rename show to information.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Rename show to information. * web/ranch/app/views/benches/_menubar.rhtml, * web/ranch/app/views/projects/_menubar.rhtml: Rename the show item to information. benches/_menubar.rhtml | 2 +- projects/_menubar.rhtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: web/ranch/app/views/benches/_menubar.rhtml --- web/ranch/app/views/benches/_menubar.rhtml (revision 49) +++ web/ranch/app/views/benches/_menubar.rhtml (working copy) @@ -3,7 +3,7 @@ <tr> <td><%= content_tag "h3", @bench.name %></td> <td> - <%= link_to "show", :controller => "benches", + <%= link_to "information", :controller => "benches", :action => "show", :bench_id => @bench.id %> </td> Index: web/ranch/app/views/projects/_menubar.rhtml --- web/ranch/app/views/projects/_menubar.rhtml (revision 49) +++ web/ranch/app/views/projects/_menubar.rhtml (working copy) @@ -3,7 +3,7 @@ <tr> <td><%= content_tag "h3", @project.name %></td> <td> - <%= link_to "show", :controller => "projects", + <%= link_to "information", :controller => "projects", :action => "show", :project_id => @project.id %> </td>

18 years, 5 months

[ranch] 49: Inject graph_form_controller into benches_controller.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Inject graph_form_controller into benches_controller. * web/ranch/test/functional/graph_form_controller_test.rb: Remove. Inject ... * web/ranch/test/functional/benches_controller_test.rb: ...here. * web/ranch/app/controllers/graph_form_controller.rb: Remove. Becomes... * web/ranch/app/controllers/benches_controller.rb: ... regression request. * web/ranch/app/views/graph_form: Remove. * web/ranch/app/views/graph_form/draw.rhtml: Remove. Becomes ... * web/ranch/app/views/benches/regression.rhtml: New. ...it. * web/ranch/app/views/benches/_list.rhtml: Redirect to the show request instead of the index one. * web/ranch/app/views/benches/_menubar.rhtml: Add the regression item. app/controllers/benches_controller.rb | 52 +++++++++++++ app/views/benches/_list.rhtml | 2 app/views/benches/_menubar.rhtml | 5 + app/views/benches/regression.rhtml | 12 +-- test/functional/benches_controller_test.rb | 112 +++++++++++++++++++++++++++-- 5 files changed, 170 insertions(+), 13 deletions(-) Index: web/ranch/test/functional/benches_controller_test.rb --- web/ranch/test/functional/benches_controller_test.rb (revision 48) +++ web/ranch/test/functional/benches_controller_test.rb (working copy) @@ -5,6 +5,8 @@ class BenchesController; def rescue_action(e) raise e end; end class BenchesControllerTest < Test::Unit::TestCase + fixtures :projects, :benches, :outputs, :inputs + def setup @controller = BenchesController.new @request = ActionController::TestRequest.new @@ -12,11 +14,9 @@ end def test_index - get :index, { :project_id => 2 } + get :index, { :project_id => 1 } assert_response :redirect - assert_redirected_to(:controller => 'benches', - :action => 'show', - :bench_id => 4) + assert_redirected_to(:action => 'show', :bench_id => 1) assert_not_nil assigns(:project) assert_not_nil assigns(:benches) end @@ -30,4 +30,108 @@ assert_not_nil assigns(:bench) end + def test_regression + get :regression, { :bench_id => 1 } + assert_response :success + assert_template 'regression' + + assert_not_nil assigns(:project) + assert_not_nil assigns(:bench) + assert_not_nil assigns(:output_arg_num) + assert_not_nil assigns(:inputs) + assert_kind_of Hash, assigns(:revision) + assert assigns(:revision)[:start] < assigns(:revision)[:stop] + assert assigns(:revision)[:start] >= 1 + end + + def test_regression_regular_revision_range + post :regression, { + :bench_id => 1, + :revision => { :range => "2-8" } + } + assert_response :success + assert_template 'regression' + + assert_not_nil assigns(:project) + assert_not_nil assigns(:bench) + assert_not_nil assigns(:output_arg_num) + assert_not_nil assigns(:inputs) + assert_not_nil assigns(:input_set_num) + assert_kind_of Hash, assigns(:revision) + assert_equal 2, assigns(:revision)[:start] + assert_equal 8, assigns(:revision)[:stop] + assert_nil flash[:error] + end + + def test_regression_bad_revision_range + post :regression, { + :bench_id => 1, + :revision => { :range => "-42-500" } + } + assert_response :success + assert_template 'regression' + + assert_not_nil assigns(:project) + assert_not_nil assigns(:bench) + assert_not_nil assigns(:output_arg_num) + assert_not_nil assigns(:inputs) + assert_not_nil assigns(:input_set_num) + assert_kind_of Hash, assigns(:revision) + assert_equal 1, assigns(:revision)[:start] + assert_equal assigns(:project).head_revision, assigns(:revision)[:stop] + assert_nil flash[:error] + end + + def test_draw_start_sup_stop + post :regression, { + :bench_id => 1, + :revision => { :range => "42-10" } + } + assert_response :success + assert_template 'regression' + + assert_equal 1, assigns(:project).id + assert_equal 'determinize', assigns(:bench).name + assert(flash.has_key?(:error)) + assert_not_nil assigns(:output_arg_num) + assert_not_nil assigns(:inputs) + assert_not_nil assigns(:input_set_num) + assert_not_nil flash[:error] + end + + def test_draw_output_arg_num + post :regression, { + :bench_id => 1, + :revision => { :range => "1-10" }, + :output_arg_num => 0, + } + assert_response :success + assert_template 'regression' + + assert_equal 1, assigns(:project).id + assert_equal 'determinize', assigns(:bench).name + assert_equal 0, assigns(:output_arg_num) + assert_equal 3, assigns(:output_arg_nb) + assert_not_nil assigns(:inputs) + assert_not_nil assigns(:input_set_num) + assert_nil flash[:error] + end + + def test_draw_bad_revision_format + post :regression, { + :bench_id => 1, + :revision => { :range => "-42---10" } + } + assert_response :success + assert_template 'regression' + + assert_equal 1, assigns(:project).id + assert_equal 'determinize', assigns(:bench).name + assert(flash.has_key?(:error)) + assert_not_nil assigns(:output_arg_num) + assert_not_nil assigns(:inputs) + assert_not_nil assigns(:input_set_num) + assert_not_nil flash[:error] + end + end Index: web/ranch/app/controllers/benches_controller.rb --- web/ranch/app/controllers/benches_controller.rb (revision 48) +++ web/ranch/app/controllers/benches_controller.rb (working copy) @@ -2,8 +2,12 @@ layout 'benches' + helper :graph, :graph_form + before_filter :list + DEFAULT_REVISION_RANGE = 100 + def index redirect_to :action => 'show', :bench_id => @benches.first.id end @@ -11,6 +15,28 @@ def show end + def regression + flash[:error] = nil + @inputs = @bench.input + @input_set_num = params[:input_set_num].to_i + @output_arg_num = params[:output_arg_num].to_i + if @output_arg_num.zero? + @output_arg_nb = Output.find_by_sql "SELECT outputs.arg_num " + + "FROM outputs " + + "WHERE outputs.bench_id = #{(a)bench.id} " + + "AND outputs.set_num = #@input_set_num " + + "GROUP BY outputs.arg_num " + + "ORDER BY outputs.arg_num " + @output_arg_nb = @output_arg_nb.size + end + if params[:revision].nil? or params[:revision][:range].nil? + @revision = {} + @revision[:stop], @revision[:start] = default_revision + else + @revision = get_revision_range(params[:revision][:range]) + end + end + protected def list @@ -23,4 +49,30 @@ @benches = @project.bench_ordered_by_name end + def get_revision_range(revision, head_rev=(a)project.head_revision) + stop_rev, start_rev = default_revision(head_rev) + result = { :stop => stop_rev, :start => start_rev } + if revision =~ /^(-?\d+)-(-?\d+)$/ + result[:start] = $1 + result[:stop] = $2 + result[:stop] = result[:stop].to_i + result[:stop] = head_rev if result[:stop] > head_rev + result[:start] = result[:start].to_i + result[:start] = 1 if result[:start] < 1 + if result[:start] > result[:stop] + flash[:error] = 'Start revision greater than stop revision.' + end + else + flash[:error] = "Bad revision range format." + end + result + end + + def default_revision(head_rev=(a)project.head_revision) + stop_rev = head_rev + start_rev = stop_rev - DEFAULT_REVISION_RANGE + start_rev = 1 if start_rev < 1 + [ stop_rev, start_rev ] + end + end Index: web/ranch/app/views/benches/_list.rhtml --- web/ranch/app/views/benches/_list.rhtml (revision 48) +++ web/ranch/app/views/benches/_list.rhtml (working copy) @@ -3,7 +3,7 @@ <tr> <td> <%= link_to @project.name, :controller => "projects", - :action => "index", + :action => "show", :project_id => @project.id %> </td> </tr> Index: web/ranch/app/views/benches/regression.rhtml --- web/ranch/app/views/benches/regression.rhtml (revision 48) +++ web/ranch/app/views/benches/regression.rhtml (working copy) @@ -1,6 +1,6 @@  <%= content_tag "h3", "#{(a)project.name}: #{(a)bench.name}" %> -<%= start_form_tag :action => "draw", +<%= start_form_tag :action => "regression", :bench_id => @bench.id %> <table cellspacing=10> @@ -74,7 +74,9 @@  <p> -<% if @draw_on %> +<% if flash[:error] %> + <p style="color: red;"><%= flash[:error] %></p> +<% else %> <% if @output_arg_num.zero? %> <% 1.upto(@output_arg_nb) do |i| %> <p> @@ -88,11 +90,5 @@ @revision[:start], @revision[:stop], @output_arg_num, @input_set_num %> <% end %> -<% else %> - <% if flash[:error] %> - <p style="color: red;"><%= flash[:error] %></p> - <% else %> - <%= content_tag "p", "No chart to display - click on Draw" %> - <% end %> <% end %> Index: web/ranch/app/views/benches/_menubar.rhtml --- web/ranch/app/views/benches/_menubar.rhtml (revision 48) +++ web/ranch/app/views/benches/_menubar.rhtml (working copy) @@ -7,6 +7,11 @@ :action => "show", :bench_id => @bench.id %> </td> + <td> + <%= link_to "regression", :controller => "benches", + :action => "regression", + :bench_id => @bench.id %> + </td> </tr> </table> <hr>

18 years, 5 months

[ranch] 48: Add the benches controller.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Add the benches controller. * web/ranch/test/functional/benches_controller_test.rb: New. Test it. * web/ranch/app/helpers/benches_helper.rb: New. Nothing by now but generated by Rails. * web/ranch/app/models/project.rb: Select only id and name fields. * web/ranch/app/controllers/benches_controller.rb: New. Handle index and show request. * web/ranch/app/views/layouts/benches.rhtml: New. Layout of the controller. * web/ranch/app/views/benches: New. * web/ranch/app/views/benches/_list.rhtml: New. The left margin part of the layout. * web/ranch/app/views/benches/show.rhtml: New. Template for the show request. * web/ranch/app/views/benches/_menubar.rhtml: New. The menu bar of the controller. * web/ranch/app/views/projects/_menubar.rhtml: Add a link in the menu bar to see go to the benchmarks of a project. app/controllers/benches_controller.rb | 26 +++++++++++++++++++ app/helpers/benches_helper.rb | 2 + app/models/project.rb | 5 ++- app/views/benches/_list.rhtml | 30 ++++++++++++++++++++++ app/views/benches/_menubar.rhtml | 12 ++++++++ app/views/benches/show.rhtml | 10 +++++++ app/views/layouts/benches.rhtml | 39 +++++++++++++++++++++++++++++ app/views/projects/_menubar.rhtml | 5 +++ test/functional/benches_controller_test.rb | 33 ++++++++++++++++++++++++ 9 files changed, 161 insertions(+), 1 deletion(-) Index: web/ranch/test/functional/benches_controller_test.rb --- web/ranch/test/functional/benches_controller_test.rb (revision 0) +++ web/ranch/test/functional/benches_controller_test.rb (revision 0) @@ -0,0 +1,33 @@ +require File.dirname(__FILE__) + '/../test_helper' +require 'benches_controller' + +# Re-raise errors caught by the controller. +class BenchesController; def rescue_action(e) raise e end; end + +class BenchesControllerTest < Test::Unit::TestCase + def setup + @controller = BenchesController.new + @request = ActionController::TestRequest.new + @response = ActionController::TestResponse.new + end + + def test_index + get :index, { :project_id => 2 } + assert_response :redirect + assert_redirected_to(:controller => 'benches', + :action => 'show', + :bench_id => 4) + assert_not_nil assigns(:project) + assert_not_nil assigns(:benches) + end + + def test_show + get :show, { :bench_id => 1 } + assert_response :success + assert_template 'show' + assert_not_nil assigns(:project) + assert_not_nil assigns(:benches) + assert_not_nil assigns(:bench) + end + +end Index: web/ranch/app/helpers/benches_helper.rb --- web/ranch/app/helpers/benches_helper.rb (revision 0) +++ web/ranch/app/helpers/benches_helper.rb (revision 0) @@ -0,0 +1,2 @@ +module BenchesHelper +end Index: web/ranch/app/models/project.rb --- web/ranch/app/models/project.rb (revision 47) +++ web/ranch/app/models/project.rb (working copy) @@ -8,7 +8,10 @@ validates_length_of :name, :maximum => 255 def bench_ordered_by_name - Bench.find :all, :conditions => [ "project_id = ?", id ], :order => "name" + Bench.find(:all, + :select => "id, name", + :conditions => [ "project_id = ?", id ], + :order => "name") end protected Index: web/ranch/app/controllers/benches_controller.rb --- web/ranch/app/controllers/benches_controller.rb (revision 0) +++ web/ranch/app/controllers/benches_controller.rb (revision 0) @@ -0,0 +1,26 @@ +class BenchesController < ApplicationController + + layout 'benches' + + before_filter :list + + def index + redirect_to :action => 'show', :bench_id => @benches.first.id + end + + def show + end + + protected + + def list + if params[:project_id] + @project = Project.find_by_id params[:project_id] + elsif params[:bench_id] + @bench = Bench.find_by_id params[:bench_id] + @project = @bench.project + end + @benches = @project.bench_ordered_by_name + end + +end Index: web/ranch/app/views/layouts/benches.rhtml --- web/ranch/app/views/layouts/benches.rhtml (revision 0) +++ web/ranch/app/views/layouts/benches.rhtml (revision 0) @@ -0,0 +1,39 @@ +  + +<html> + <%= render :partial => "layouts/head" %> + <body> + <%= render :partial => "layouts/top_banner" %> + <%= render :partial => "layouts/menubar" %> + + <p> + <table cellspacing=0 cellpadding=0 border=0 width="100%" height="80%" cols=2> + <tr> + <td class=left_margin valign=top width="15%"> + <%= render :partial => "benches/list" %> + </td> + <td class=content align=left valign=top width="80%"> + + <% if @bench.nil? %> + No benchmark + <% else %> + <table width="100%"> + <tr><td> + <%= render :partial => "benches/menubar" %> + </td></tr> + <tr><td> + <%= @content_for_layout %> + </td></tr> + </table> + <% end %> + + </td> + </tr> + </table> + </p> + + <%= render :partial => "layouts/bottom_banner" %> + </body> +</html> + + Index: web/ranch/app/views/benches/_list.rhtml --- web/ranch/app/views/benches/_list.rhtml (revision 0) +++ web/ranch/app/views/benches/_list.rhtml (revision 0) @@ -0,0 +1,30 @@ +  +<table> + <tr> + <td> + <%= link_to @project.name, :controller => "projects", + :action => "index", + :project_id => @project.id %> + </td> + </tr> + <% if @benches.nil? or @benches.empty? %> + No benchmarks available. + <% else %> + <tr> + <td> + <table> + <% for bench in @benches %> + <tr> + <td width=10></td> + <td> + <%= link_to bench.name, :controller => "benches", + :action => "show", + :bench_id => bench.id %> + </td> + </tr> + <% end %> + </table> + </td> + </tr> + <% end %> +</table> Index: web/ranch/app/views/benches/show.rhtml --- web/ranch/app/views/benches/show.rhtml (revision 0) +++ web/ranch/app/views/benches/show.rhtml (revision 0) @@ -0,0 +1,10 @@ +  + +<p> +<table> + <tr> + <td>Name:</td> + <td><%= @bench.name %></td> + </tr> +</table> +</p> Index: web/ranch/app/views/benches/_menubar.rhtml --- web/ranch/app/views/benches/_menubar.rhtml (revision 0) +++ web/ranch/app/views/benches/_menubar.rhtml (revision 0) @@ -0,0 +1,12 @@ +  +<table> + <tr> + <td><%= content_tag "h3", @bench.name %></td> + <td> + <%= link_to "show", :controller => "benches", + :action => "show", + :bench_id => @bench.id %> + </td> + </tr> +</table> +<hr> Index: web/ranch/app/views/projects/_menubar.rhtml --- web/ranch/app/views/projects/_menubar.rhtml (revision 47) +++ web/ranch/app/views/projects/_menubar.rhtml (working copy) @@ -7,6 +7,11 @@ :action => "show", :project_id => @project.id %> </td> + <td> + <%= link_to "benchmarks", :controller => "benches", + :action => "index", + :project_id => @project.id %> + </td> </tr> </table> <hr>

18 years, 5 months

[ranch] 47: Add project menu bar.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Add project menu bar. * web/ranch/app/views/layouts/projects.rhtml: Include the menu bar in the page. * web/ranch/app/views/projects/_menubar.rhtml: New. Menu bar for the project controller. * web/ranch/app/views/projects/show.rhtml: No longer display the name of the project since it's displayed in the menu bar. layouts/projects.rhtml | 13 ++++++++++++- projects/_menubar.rhtml | 12 ++++++++++++ projects/show.rhtml | 8 -------- 3 files changed, 24 insertions(+), 9 deletions(-) Index: web/ranch/app/views/layouts/projects.rhtml --- web/ranch/app/views/layouts/projects.rhtml (revision 46) +++ web/ranch/app/views/layouts/projects.rhtml (working copy) @@ -7,14 +7,25 @@ <%= render :partial => "layouts/menubar" %> <p> - <table cellspacing=0 cellpadding=0 border=0 width='100%' height="80%" cols=2> + <table cellspacing=0 cellpadding=0 border=0 width="100%" height="80%" cols=2> <tr> <td class=left_margin valign=top width="15%"> <%= render :partial => "projects/list" %> </td> <td class=content align=left valign=top width="80%"> + <% if @project.nil? %> + No project + <% else %> + <table width="100%"> + <tr><td> + <%= render :partial => "projects/menubar" %> + </td></tr> + <tr><td> <%= @content_for_layout %> + </td></tr> + </table> + <% end %> </td> </tr> Index: web/ranch/app/views/projects/_menubar.rhtml --- web/ranch/app/views/projects/_menubar.rhtml (revision 0) +++ web/ranch/app/views/projects/_menubar.rhtml (revision 0) @@ -0,0 +1,12 @@ +  +<table> + <tr> + <td><%= content_tag "h3", @project.name %></td> + <td> + <%= link_to "show", :controller => "projects", + :action => "show", + :project_id => @project.id %> + </td> + </tr> +</table> +<hr> Index: web/ranch/app/views/projects/show.rhtml --- web/ranch/app/views/projects/show.rhtml (revision 46) +++ web/ranch/app/views/projects/show.rhtml (working copy) @@ -1,11 +1,5 @@  -<% if @project.nil? %> - No project to show -<% else %> - -<%= content_tag "h3", "#{(a)project.name}" %> - <p> <table> <tr> @@ -14,5 +8,3 @@ </tr> </table> </p> - -<% end %> \ No newline at end of file

18 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Projects November 2005