From f5c09269742267344d7f16ef1a10537a14dc1b93 Mon Sep 17 00:00:00 2001 From: Alessandro Palmeira + João M. M. da Silva Date: Thu, 5 Apr 2012 17:24:03 -0300 Subject: [PATCH] [Mezuro] Removed old unused code and added functional tests --- plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb | 1 - plugins/mezuro/lib/kalibro/entities/configuration.rb | 7 ------- plugins/mezuro/test/fixtures/metric_configuration_fixtures.rb | 9 +++++++++ plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb | 17 +++++++++++++++++ plugins/mezuro/test/unit/kalibro/entities/configuration_test.rb | 9 --------- plugins/mezuro/test/unit/kalibro/entities/metric_configuration_test.rb | 22 +++++++++++++++++++--- 6 files changed, 45 insertions(+), 20 deletions(-) diff --git a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb index 0f606c6..feb2ae7 100644 --- a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb +++ b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb @@ -43,7 +43,6 @@ class MezuroPluginProfileController < ProfileController def choose_metric @configuration_name = params[:configuration_name] @collector_name = params[:collector_name] - @collector = Kalibro::Client::BaseToolClient.new.base_tool(@collector_name) end diff --git a/plugins/mezuro/lib/kalibro/entities/configuration.rb b/plugins/mezuro/lib/kalibro/entities/configuration.rb index 38e3d0a..3ed1a48 100644 --- a/plugins/mezuro/lib/kalibro/entities/configuration.rb +++ b/plugins/mezuro/lib/kalibro/entities/configuration.rb @@ -14,11 +14,4 @@ class Kalibro::Entities::Configuration < Kalibro::Entities::Entity @metric_configuration = metric_configurations end - def create_metric_configurations(metrics) - @metric_configuration = [] - metrics.each do |metric| - @metric_configuration << create_metric_configuration(metric) - end - end - end diff --git a/plugins/mezuro/test/fixtures/metric_configuration_fixtures.rb b/plugins/mezuro/test/fixtures/metric_configuration_fixtures.rb index a5bc752..8456c12 100644 --- a/plugins/mezuro/test/fixtures/metric_configuration_fixtures.rb +++ b/plugins/mezuro/test/fixtures/metric_configuration_fixtures.rb @@ -14,6 +14,15 @@ class MetricConfigurationFixtures amloc end + def self.metric_configuration_without_ranges + amloc = Kalibro::Entities::MetricConfiguration.new + amloc.metric = NativeMetricFixtures.amloc + amloc.code = 'amloc' + amloc.weight = 1.0 + amloc.aggregation_form = 'AVERAGE' + amloc + end + def self.sc_configuration sc = Kalibro::Entities::MetricConfiguration.new sc.metric = CompoundMetricFixtures.sc diff --git a/plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb b/plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb index 4170568..2a5215b 100644 --- a/plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb +++ b/plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb @@ -65,6 +65,23 @@ class MezuroPluginProfileControllerTest < ActionController::TestCase assert_select('h5', 'Metric results for: Qt-Calculator (APPLICATION)') end + should 'assign configuration name in choose_base_tool' do + get :choose_base_tool, :profile => @profile.identifier, :configuration_name => "test name" + assert_equal assigns(:configuration_name), "test name" + end + + should 'create base tool client' do + get :choose_base_tool, :profile => @profile.identifier, :configuration_name => "test name" + assert assigns(:tool_names).instance_of?(Kalibro::Client::BaseToolClient) + end + + should 'assign configuration and collector name in choose_metric' do + #TODO Mockar cliente + get :choose_metric, :profile => @profile.identifier, :configuration_name => "test name", :collector_name => "Collector A" + assert_equal assigns(:configuration_name), "test name" + assert_equal assigns(:collector_name), "Collector A" + end + private def create_project_content diff --git a/plugins/mezuro/test/unit/kalibro/entities/configuration_test.rb b/plugins/mezuro/test/unit/kalibro/entities/configuration_test.rb index 881a778..ffdeba9 100644 --- a/plugins/mezuro/test/unit/kalibro/entities/configuration_test.rb +++ b/plugins/mezuro/test/unit/kalibro/entities/configuration_test.rb @@ -17,13 +17,4 @@ class ConfigurationTest < ActiveSupport::TestCase assert_equal @hash, @configuration.to_hash end - should 'create metric configuration' do - configuration = Kalibro::Entities::Configuration.new - configuration.create_metric_configurations(["Analizo:Metric Name"]) - metric_configuration = configuration.metric_configurations[0] - assert_equal metric_configuration.code, "Metric Name" - assert_equal metric_configuration.metric.name, "Metric Name" - assert_equal metric_configuration.metric.origin, "Analizo" - end - end diff --git a/plugins/mezuro/test/unit/kalibro/entities/metric_configuration_test.rb b/plugins/mezuro/test/unit/kalibro/entities/metric_configuration_test.rb index 385921c..d4e9e65 100644 --- a/plugins/mezuro/test/unit/kalibro/entities/metric_configuration_test.rb +++ b/plugins/mezuro/test/unit/kalibro/entities/metric_configuration_test.rb @@ -1,20 +1,24 @@ require "test_helper" require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/metric_configuration_fixtures" +require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/range_fixtures" class MetricConfigurationTest < ActiveSupport::TestCase def setup @hash = MetricConfigurationFixtures.amloc_configuration_hash - @range = MetricConfigurationFixtures.amloc_configuration + @metric_configuration = MetricConfigurationFixtures.amloc_configuration + @metric_configuration_without_ranges = MetricConfigurationFixtures.metric_configuration_without_ranges + @range1 = RangeFixtures.amloc_excellent + @range2 = RangeFixtures.amloc_bad end should 'create metric configuration from hash' do - assert_equal @range, Kalibro::Entities::MetricConfiguration.from_hash(@hash) + assert_equal @metric_configuration, Kalibro::Entities::MetricConfiguration.from_hash(@hash) end should 'convert metric configuration to hash' do - assert_equal @hash, @range.to_hash + assert_equal @hash, @metric_configuration.to_hash end should 'create appropriate metric type' do @@ -24,4 +28,16 @@ class MetricConfigurationTest < ActiveSupport::TestCase assert sc.metric.instance_of?(Kalibro::Entities::CompoundMetric) end + should 'add a range to an empty range list' do + @metric_configuration_without_ranges.add_range @range1 + assert_equal @metric_configuration_without_ranges.ranges, [@range1] + end + + should 'add a range to an non-empty range list' do + @metric_configuration_without_ranges.ranges = [@range1] + @metric_configuration_without_ranges.add_range @range2 + assert_equal @metric_configuration_without_ranges.ranges, [@range1, @range2] + end + + end -- libgit2 0.21.2