[Mezuro] Completed base_tool model and changed metric model and fixtures.

Alessandro Palmeira + João M. M. da Silva · João M. M. da Silva
1 parent 9766d9cc
Showing 8 changed files with 57 additions and 49 deletions Show diff stats
plugins/mezuro/lib/kalibro/base_tool.rb
plugins/mezuro/lib/kalibro/compound_metric.rb
plugins/mezuro/lib/kalibro/metric.rb
plugins/mezuro/lib/kalibro/native_metric.rb
plugins/mezuro/test/fixtures/base_tool_fixtures.rb
plugins/mezuro/test/fixtures/compound_metric_fixtures.rb
plugins/mezuro/test/fixtures/metric_fixtures.rb
plugins/mezuro/test/unit/kalibro/base_tool_test.rb
@@ -16,7 +16,7 @@ class Kalibro::BaseTool &lt; Kalibro::Model
   end 
   def supported_metric=(value)
-    @supported_metric = Kalibro::NativeMetric.to_objects_array value
+    @supported_metric = Kalibro::Metric.to_objects_array value
   end
   def supported_metrics
@@ -1,5 +0,0 @@
-class Kalibro::CompoundMetric < Kalibro::Metric
-
-  attr_accessor :script
-
-end
 class Kalibro::Metric < Kalibro::Model
-  attr_accessor :name, :scope, :description
+  attr_accessor :name, :compound, :scope, :description, :script, :origin, :language
+
+  def languages
+    @language
+  end
+
+  def languages=(languages)
+    @language = languages
+  end
+
+  def language=(value)
+    @language = Kalibro::Model.to_objects_array value
+  end
 end
@@ -1,17 +0,0 @@
-class Kalibro::NativeMetric < Kalibro::Metric
-
-  attr_accessor :origin, :language
-
-  def languages
-    @language
-  end
-
-  def languages=(languages)
-    @language = languages
-  end
-
-  def language=(value)
-    @language = Kalibro::Model.to_objects_array value
-  end
-
-end
-require File.dirname(__FILE__) + '/native_metric_fixtures'
+require File.dirname(__FILE__) + '/metric_fixtures'
 class BaseToolFixtures
@@ -6,10 +6,14 @@ class BaseToolFixtures
     Kalibro::BaseTool.new base_tool_hash
   end
-  def self.base_tool_hash
-    {:name => 'Analizo', :supported_metric => [
-        NativeMetricFixtures.total_cof_hash,
-        NativeMetricFixtures.amloc_hash]}
+  def self.base_tool_hash 
+  {
+    :name => 'Analizo', 
+    :supported_metric => [
+      MetricFixtures.total_cof_hash,
+      MetricFixtures.amloc_hash], 
+    :collector_class_name => "org.analizo.AnalizoMetricCollector"
+  }
   end
 end
@@ -1,11 +0,0 @@
-class CompoundMetricFixtures
-
-  def self.compound_metric
-    Kalibro::CompoundMetric.new compound_metric_hash
-  end
-
-  def self.compound_metric_hash
-    {:name => 'Structural Complexity', :scope => 'CLASS', :script => 'return 42;', :description => 'Calculate the Structural Complexity of the Code'}
-  end
-
-end
@@ -0,0 +1,27 @@
+class MetricFixtures
+
+  def self.compound_metric
+    Kalibro::Metric.new compound_metric_hash
+  end
+
+  def self.compound_metric_hash
+    {:name => 'Structural Complexity', :compound => true, :scope => 'CLASS', :script => 'return 42;', :description => 'Calculate the Structural Complexity of the Code'}
+  end
+
+  def self.total_cof
+    Kalibro::Metric.new total_cof_hash
+  end
+
+  def self.total_cof_hash
+    {:name => 'Total Coupling Factor', :compound => false, :scope => 'APPLICATION', :origin => 'Analizo', :language => ['JAVA']}
+  end
+
+  def self.amloc
+    Kalibro::Metric.new amloc_hash
+  end
+
+  def self.amloc_hash
+    {:name => 'Average Method LOC', :compound => false, :scope => 'CLASS', :origin => 'Analizo', :language => ['JAVA']}
+  end
+
+end
@@ -12,14 +12,16 @@ class BaseToolTest &lt; ActiveSupport::TestCase
   should 'create base tool from hash' do
     assert_equal @base_tool.name, Kalibro::BaseTool.new(@hash).name
   end
-
-  should 'convert base tool to hash' do
-    assert_equal @hash, @base_tool.to_hash
-  end
+  
+#  Mezuro will not send a base_tool hash back to Kalibro
+#
+#  should 'convert base tool to hash' do
+#    assert_equal @hash, @base_tool.to_hash
+#  end
   should 'get base tool names' do
     names = ['Analizo', 'Checkstyle']
-    Kalibro::BaseTool.expects(:request).with("BaseTool", :get_base_tool_names).returns({:base_tool_name => names})
+    Kalibro::BaseTool.expects(:request).with("BaseTool", :all_base_tool_names).returns({:base_tool_name => names})
     assert_equal names, Kalibro::BaseTool.all_names
   end
@@ -29,8 +31,4 @@ class BaseToolTest &lt; ActiveSupport::TestCase
     assert_equal @base_tool.name, Kalibro::BaseTool.find_by_name(@base_tool.name).name
   end
-  should 'get base tool metrics' do
-    assert_equal @base_tool.supported_metrics[0].name, @base_tool.metric('Total Coupling Factor').name
-  end
-  
 end
	@@ -16,7 +16,7 @@ class Kalibro::BaseTool < Kalibro::Model		@@ -16,7 +16,7 @@ class Kalibro::BaseTool < Kalibro::Model
16	end	16	end
17		17
18	def supported_metric=(value)	18	def supported_metric=(value)
19	- @supported_metric = Kalibro::NativeMetric.to_objects_array value	19	+ @supported_metric = Kalibro::Metric.to_objects_array value
20	end	20	end
21		21
22	def supported_metrics	22	def supported_metrics
	@@ -1,5 +0,0 @@	@@ -1,5 +0,0 @@
1	-class Kalibro::CompoundMetric < Kalibro::Metric
2	-
3	- attr_accessor :script
4	-
5	-end
1	class Kalibro::Metric < Kalibro::Model	1	class Kalibro::Metric < Kalibro::Model
2		2
3	- attr_accessor :name, :scope, :description	3	+ attr_accessor :name, :compound, :scope, :description, :script, :origin, :language
		4	+
		5	+ def languages
		6	+ @language
		7	+ end
		8	+
		9	+ def languages=(languages)
		10	+ @language = languages
		11	+ end
		12	+
		13	+ def language=(value)
		14	+ @language = Kalibro::Model.to_objects_array value
		15	+ end
4		16
5	end	17	end
	@@ -1,17 +0,0 @@	@@ -1,17 +0,0 @@
1	-class Kalibro::NativeMetric < Kalibro::Metric
2	-
3	- attr_accessor :origin, :language
4	-
5	- def languages
6	- @language
7	- end
8	-
9	- def languages=(languages)
10	- @language = languages
11	- end
12	-
13	- def language=(value)
14	- @language = Kalibro::Model.to_objects_array value
15	- end
16	-
17	-end
	@@ -1,11 +0,0 @@	@@ -1,11 +0,0 @@
1	-class CompoundMetricFixtures
2	-
3	- def self.compound_metric
4	- Kalibro::CompoundMetric.new compound_metric_hash
5	- end
6	-
7	- def self.compound_metric_hash
8	- {:name => 'Structural Complexity', :scope => 'CLASS', :script => 'return 42;', :description => 'Calculate the Structural Complexity of the Code'}
9	- end
10	-
11	-end
@@ -0,0 +1,27 @@		@@ -0,0 +1,27 @@
	1	+class MetricFixtures
	2	+
	3	+ def self.compound_metric
	4	+ Kalibro::Metric.new compound_metric_hash
	5	+ end
	6	+
	7	+ def self.compound_metric_hash
	8	+ {:name => 'Structural Complexity', :compound => true, :scope => 'CLASS', :script => 'return 42;', :description => 'Calculate the Structural Complexity of the Code'}
	9	+ end
	10	+
	11	+ def self.total_cof
	12	+ Kalibro::Metric.new total_cof_hash
	13	+ end
	14	+
	15	+ def self.total_cof_hash
	16	+ {:name => 'Total Coupling Factor', :compound => false, :scope => 'APPLICATION', :origin => 'Analizo', :language => ['JAVA']}
	17	+ end
	18	+
	19	+ def self.amloc
	20	+ Kalibro::Metric.new amloc_hash
	21	+ end
	22	+
	23	+ def self.amloc_hash
	24	+ {:name => 'Average Method LOC', :compound => false, :scope => 'CLASS', :origin => 'Analizo', :language => ['JAVA']}
	25	+ end
	26	+
	27	+end