From aaebb6ee404a87d1a93651e93ac377584bb219d7 Mon Sep 17 00:00:00 2001 From: Jim Treadway Date: Thu, 20 Aug 2015 22:08:18 -0700 Subject: [PATCH 1/2] Add default test directory descriptions to Statistics::TEST_TYPES. "Test LOC" is always 0 unless you have manually configured test your test directories via CodeMetrics::StatsDirectories#add_test_directory, CodeMetrics::StatsDirectories#add_test_directories, etc. Modify CodeMetrics::Statistics#initialize so that the default test directories are also added to the CodeMetrics::Statistics::TEST_TYPES array. This allows CodeMetrics::Statistics#calculate_tests to work in the default configuration case (eg., when using "metric_fu" without and custom "code_metrics" configuration changes). Also, add a dummy controller test and adjust the expected results in the test_code_metrics_sanity to look for the correct, updated values for "Test LOC" and "Code to Test Ratio". --- lib/code_metrics/stats_directories.rb | 1 + .../test/controllers/application_controller_test.rb | 9 +++++++++ test/rake_test.rb | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 test/dummy/test/controllers/application_controller_test.rb diff --git a/lib/code_metrics/stats_directories.rb b/lib/code_metrics/stats_directories.rb index 05d81e0..27470cf 100644 --- a/lib/code_metrics/stats_directories.rb +++ b/lib/code_metrics/stats_directories.rb @@ -28,6 +28,7 @@ def initialize @root = path_prefix @app_directories = default_app_directories @test_directories = default_test_directories + @test_directories.each { |pair| CodeMetrics::Statistics::TEST_TYPES << pair.first } end def directories diff --git a/test/dummy/test/controllers/application_controller_test.rb b/test/dummy/test/controllers/application_controller_test.rb new file mode 100644 index 0000000..56eb7b3 --- /dev/null +++ b/test/dummy/test/controllers/application_controller_test.rb @@ -0,0 +1,9 @@ +class ApplicationControllerTest < ActionController::TestCase + test "truth" do + assert true + end + + test "negativity" do + assert_not false + end +end diff --git a/test/rake_test.rb b/test/rake_test.rb index 641f290..89d5228 100644 --- a/test/rake_test.rb +++ b/test/rake_test.rb @@ -6,7 +6,7 @@ module CodeMetrics class RakeTest < ActiveSupport::TestCase def test_code_metrics_sanity - assert_match "Code LOC: 5 Test LOC: 0 Code to Test Ratio: 1:0.0", + assert_match "Code LOC: 5 Test LOC: 8 Code to Test Ratio: 1:1.6", Dir.chdir(app_path){ `rake code_metrics:stats` } end From 50a4eae988d212c7be8ed77cd58ec38137de2983 Mon Sep 17 00:00:00 2001 From: Jim Treadway Date: Thu, 20 Aug 2015 22:25:24 -0700 Subject: [PATCH 2/2] Fix line length in CodeMetrics::StatsDirectories#initialize. --- lib/code_metrics/stats_directories.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/code_metrics/stats_directories.rb b/lib/code_metrics/stats_directories.rb index 27470cf..e2312cc 100644 --- a/lib/code_metrics/stats_directories.rb +++ b/lib/code_metrics/stats_directories.rb @@ -28,7 +28,9 @@ def initialize @root = path_prefix @app_directories = default_app_directories @test_directories = default_test_directories - @test_directories.each { |pair| CodeMetrics::Statistics::TEST_TYPES << pair.first } + @test_directories.each do |pair| + CodeMetrics::Statistics::TEST_TYPES << pair.first + end end def directories