Merge branch 'refactoring_js' into refactoring

João M. M. da Silva
2 parents e498c21b afcd974d
Showing 56 changed files with 435 additions and 258 deletions Show diff stats
plugins/mezuro/controllers/profile/mezuro_plugin_module_result_controller.rb
plugins/mezuro/controllers/profile/mezuro_plugin_processing_controller.rb
plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb
plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb
plugins/mezuro/lib/kalibro/metric_result.rb
plugins/mezuro/lib/kalibro/model.rb
plugins/mezuro/lib/kalibro/module_result.rb
plugins/mezuro/lib/kalibro/process_time.rb
plugins/mezuro/lib/kalibro/processing.rb
plugins/mezuro/lib/kalibro/project.rb
plugins/mezuro/lib/kalibro/range_snapshot.rb
plugins/mezuro/lib/kalibro/repository.rb
plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
plugins/mezuro/lib/mezuro_plugin/helpers/module_result_helper.rb
plugins/mezuro/lib/mezuro_plugin/project_content.rb
plugins/mezuro/public/javascripts/processing.js
plugins/mezuro/test/fixtures/configuration_fixtures.rb
plugins/mezuro/test/fixtures/date_metric_result_fixtures.rb
plugins/mezuro/test/fixtures/metric_configuration_fixtures.rb
plugins/mezuro/test/fixtures/metric_configuration_snapshot_fixtures.rb
@@ -7,7 +7,7 @@ class MezuroPluginModuleResultController &lt; MezuroPluginProfileController
     @metric_results = Kalibro::MetricResult.metric_results_of(@module_result.id)
     render :partial => 'module_result'
   end
- 
+
   def metric_result_history
     @history = Kalibro::MetricResult.history_of(params[:metric_name], params[:module_result_id].to_i)
     render :partial => 'score_history'
@@ -2,20 +2,32 @@ class MezuroPluginProcessingController &lt; MezuroPluginProfileController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def render_last_state
-    last_state = Kalibro::Processing.last_processing_state_of(params[:repository_id].to_i)
-    render :text => last_state
+  def state
+    processing = processing_for_date(params[:repository_id].to_i, params[:date])
+    if processing.error.nil?
+      render :text => processing.state
+    else
+      render :text => 'ERROR'
+    end
   end
   def processing
-    date = params[:date]
-    repository_id = params[:repository_id].to_i
-    processing_class = Kalibro::Processing
-    @processing = date.nil? ? processing_class.processing_of(repository_id) : processing_class.processing_with_date_of(repository_id, date)
-    if @processing.state == 'ERROR'
+    @processing = processing_for_date(params[:repository_id].to_i, params[:date])
+    if @processing.error.nil?
+      render :partial => 'processing'
+    else
       render :partial => 'processing_error'
+    end
+  end
+
+  private
+
+  def processing_for_date(repository_id, date = nil)
+    processing_class = Kalibro::Processing
+    if date.nil?
+      processing_class.processing_of(repository_id)
     else
-      render :partial => 'processing'
+      processing_class.processing_with_date_of(repository_id, date)
     end
   end
@@ -3,8 +3,11 @@ class MezuroPluginRepositoryController &lt; MezuroPluginProfileController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
   def new
-    @project_content = profile.articles.find(params[:id])
-    
+    project_content = profile.articles.find(params[:id])
+    @project_name = project_content.name
+    @data_profile = project_content.profile.identifier
+    @project_content_id = project_content.id
+
     @repository_types = Kalibro::Repository.repository_types
     configurations = Kalibro::Configuration.all
@@ -16,20 +19,24 @@ class MezuroPluginRepositoryController &lt; MezuroPluginProfileController
   def create
     project_content = profile.articles.find(params[:id])
-    
+
     repository = Kalibro::Repository.new( params[:repository] )
     repository.save(project_content.project_id)
     if( repository.errors.empty? )
-      redirect_to "/#{profile.identifier}/#{project_content.name.downcase.gsub(/\s/, '-')}"
+      repository.process
+      redirect_to "/profile/#{profile.identifier}/plugin/mezuro/repository/show/#{project_content.id}?repository_id=#{repository.id}"
     else
       redirect_to_error_page repository.errors[0].message
     end
   end
   def edit
-    @project_content = profile.articles.find(params[:id])
-    
+    project_content = profile.articles.find(params[:id])
+    @project_name = project_content.name
+    @data_profile = project_content.profile.identifier
+    @project_content_id = project_content.id
+
     @repository_types = Kalibro::Repository.repository_types
     configurations = Kalibro::Configuration.all
@@ -38,7 +45,7 @@ class MezuroPluginRepositoryController &lt; MezuroPluginProfileController
       [configuration.name,configuration.id] 
     end
-    @repository = @project_content.repositories.select{ |repository| repository.id.to_s == params[:repository_id] }.first
+    @repository = project_content.repositories.select{ |repository| repository.id.to_s == params[:repository_id] }.first
   end
   def update
@@ -46,9 +53,10 @@ class MezuroPluginRepositoryController &lt; MezuroPluginProfileController
     repository = Kalibro::Repository.new( params[:repository] )
     repository.save(project_content.project_id)
-    
+
     if( repository.errors.empty? )
-      redirect_to "/#{profile.identifier}/#{project_content.name.downcase.gsub(/\s/, '-')}"
+      repository.process
+      redirect_to "/profile/#{profile.identifier}/plugin/mezuro/repository/show/#{project_content.id}?repository_id=#{repository.id}"
     else
       redirect_to_error_page repository.errors[0].message
     end
@@ -2,6 +2,10 @@ class Kalibro::MetricConfigurationSnapshot &lt; Kalibro::Model
   attr_accessor :code, :weight, :aggregation_form, :metric, :base_tool_name, :range
+  def weight=(value)
+    @weight = value.to_f
+  end
+
   def metric=(value)
     if value.kind_of?(Hash)
       @metric = Kalibro::Metric.to_object(value)
@@ -11,11 +15,24 @@ class Kalibro::MetricConfigurationSnapshot &lt; Kalibro::Model
   end
   def range=(value)
-    @range = Kalibro::RangeSnapshot.to_object value
+    value.to_a
+    @range = []
+
+    value.each do |range_snapshot|
+      @range << Kalibro::RangeSnapshot.to_object(range_snapshot)
+    end
+
   end
   def range_snapshot
     range
   end
+  def to_hash
+    hash = super
+    hash[:attributes!][:range] = {'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
+                    'xsi:type' => 'kalibro:rangeSnapshotXml'  }
+    hash
+  end
+
 end
@@ -2,8 +2,19 @@ class Kalibro::MetricResult &lt; Kalibro::Model
   attr_accessor :id, :configuration, :value, :error
-  def value=(value)
-    @value = value.to_f
+  def initialize(attributes={})
+    value = attributes[:value]
+    @value = (value == "NaN") ? attributes[:aggregated_value].to_f : value.to_f
+    attributes.each do |field, value|
+      if field!= :value and field!= :aggregated_value and self.class.is_valid?(field)
+        send("#{field}=", value)
+      end
+    end
+    @errors = []
+  end
+
+  def id=(value)
+    @id = value.to_i
   end
   def configuration=(value)
@@ -30,7 +41,7 @@ class Kalibro::MetricResult &lt; Kalibro::Model
   end
   def self.history_of(metric_name, module_result_id)
-    response = self.request(:history_of, {:metric_name => metric_name, :module_result_id => module_result_id})[:date_metric_result]
+    response = self.request(:history_of_metric, {:metric_name => metric_name, :module_result_id => module_result_id})[:date_metric_result]
     response = [] if response.nil?
     response = [response] if response.is_a?(Hash) 
     response.map {|date_metric_result| Kalibro::DateMetricResult.new date_metric_result}
@@ -7,6 +7,7 @@ class Kalibro::Model
     @errors = []
   end
+
   def to_hash(options={})
     hash = Hash.new
     excepts = options[:except].nil? ? [] : options[:except]
@@ -15,7 +16,7 @@ class Kalibro::Model
       if(!excepts.include?(field))
         field_value = send(field)
         if !field_value.nil?
-          hash[field] = convert_to_hash(field_value)
+            hash[field] = convert_to_hash(field_value)
           if field_value.is_a?(Kalibro::Model)
             hash = {:attributes! => {}}.merge(hash)
             hash[:attributes!][field.to_sym] = {
@@ -91,7 +92,7 @@ class Kalibro::Model
     return self.class.date_with_milliseconds(value) if value.is_a?(DateTime)
     return 'INF' if value.is_a?(Float) and value.infinite? == 1
     return '-INF' if value.is_a?(Float) and value.infinite? == -1
-    value
+    value.to_s
   end
   def xml_instance_class_name(object)
@@ -22,6 +22,10 @@ class Kalibro::ModuleResult &lt; Kalibro::Model
     end
   end
+  def id=(value)
+    @id = value.to_i
+  end
+
   def module=(value)
     @module = Kalibro::Module.to_object value
   end
@@ -30,6 +34,10 @@ class Kalibro::ModuleResult &lt; Kalibro::Model
     @grade = value.to_f
   end
+  def parent_id=(value)
+    @parent_id = value.to_i
+  end
+
   def self.history_of(module_result_id)
     response = self.request(:history_of_module, {:module_result_id => module_result_id})[:date_module_result]
     response = [] if response.nil?
@@ -2,4 +2,8 @@ class Kalibro::ProcessTime &lt; Kalibro::Model
   attr_accessor :state, :time
+  def time=(time)
+    @time = time.to_i
+  end
+
 end
-#TODO arrumar esse modelo e seus testes de unidade
 class Kalibro::Processing < Kalibro::Model
   attr_accessor :id, :date, :state, :error, :process_time, :results_root_id
@@ -12,6 +11,7 @@ class Kalibro::Processing &lt; Kalibro::Model
   end
   def self.processing_with_date_of(repository_id, date)
+    date = date.is_a?(String) ? DateTime.parse(date) : date
     if has_processing_after(repository_id, date)
       first_processing_after(repository_id, date)
     elsif has_processing_before(repository_id, date)
@@ -21,6 +21,10 @@ class Kalibro::Processing &lt; Kalibro::Model
     end
   end
+  def id=(value)
+    @id = value.to_i
+  end
+
   def date=(value)
     @date = value.is_a?(String) ? DateTime.parse(value) : value
   end
@@ -41,6 +45,10 @@ class Kalibro::Processing &lt; Kalibro::Model
     @error = Kalibro::Throwable.to_object value
   end
+  def results_root_id=(value)
+    @results_root_id = value.to_i
+  end
+
   private
   def self.has_processing(repository_id)
@@ -2,6 +2,10 @@ class Kalibro::Project &lt; Kalibro::Model
   attr_accessor :id, :name, :description
+  def id=(value)
+    @id = value.to_i
+  end
+
   def self.all
     response = request(:all_projects)[:project]
     response = [] if response.nil?
 class Kalibro::RangeSnapshot < Kalibro::Model
-  attr_accessor :end, :label, :grade, :color, :comments
+  attr_accessor :beginning, :end, :label, :grade, :color, :comments
+
+  def beginning=(value)
+    @beginning = ((value == "-INF") ? -1.0/0 : value.to_f)
+  end
+
+  def end=(value)
+    @end = ((value == "INF") ? 1.0/0 : value.to_f)
+  end
+
+  def grade=(value)
+    @grade = value.to_f
+  end
 end
@@ -17,7 +17,19 @@ class Kalibro::Repository &lt; Kalibro::Model
     response.map {|repository| new repository}
   end
-  def process_repository
+  def id=(value)
+    @id = value.to_i
+  end
+
+  def process_period=(value)
+    @process_period = value.to_i
+  end
+
+  def configuration_id=(value)
+    @configuration_id = value.to_i
+  end
+
+  def process
     self.class.request(:process_repository, {:repository_id => self.id})
   end
@@ -28,7 +40,6 @@ class Kalibro::Repository &lt; Kalibro::Model
   def save(project_id)
     begin
       self.id = self.class.request(:save_repository, {:repository => self.to_hash, :project_id => project_id})[:repository_id]
-      process_repository
       true
 	  rescue Exception => exception
 	    add_error exception
@@ -7,7 +7,7 @@ class MezuroPlugin::Helpers::ContentViewerHelper
   end
   def self.periodicity_options
-    [["Not Periodically", 0], ["1 day", 1], ["2 days", 2], ["Weekly", 7], ["Biweeky", 15], ["Monthly", 30]]
+    [["Not Periodically", 0], ["1 day", 1], ["2 days", 2], ["Weekly", 7], ["Biweekly", 15], ["Monthly", 30]]
   end
   def self.periodicity_option(periodicity)
@@ -43,10 +43,14 @@ class MezuroPlugin::Helpers::ContentViewerHelper
                 )
   end
-
   def self.format_name(metric_configuration_snapshot)
     metric_configuration_snapshot.metric.name.delete("() ")
   end
+  
+  def self.format_time(miliseconds)
+    seconds = miliseconds/1000
+    MezuroPluginModuleResultController.helpers.distance_of_time_in_words(0, seconds, include_seconds = true)
+  end
   private
@@ -0,0 +1,7 @@
+class MezuroPlugin::Helpers::ModuleResultHelper
+
+  def self.module_name name
+    name.is_a?(Array) ? name.last : name
+  end
+
+end
@@ -83,7 +83,6 @@ class MezuroPlugin::ProjectContent &lt; Article
   def create_kalibro_project
    Kalibro::Project.create(
-      :id => project_id,
       :name => name,
       :description => description
     )
@@ -2,41 +2,39 @@ var processingTree = false;
 var metricName;
 jQuery(function (){
   jQuery('.source-tree-link').live("click", reloadModule);
-  jQuery('[show-metric-history]').live("click", display_metric_history); //TODO review for project history
-  jQuery('[show-grade-history]').live("click", display_grade_history); //TODO review for project history
-  jQuery('#project_date_submit').live("click", reloadProjectWithDate); //TODO review for project history
+  jQuery('[show-metric-history]').live("click", display_metric_history);
+  jQuery('[show-grade-history]').live("click", display_grade_history);
+  jQuery('#project_date_submit').live("click", reloadProcessingWithDate);
   showLoadingProcess(true);
   showProcessing();
 });
 function showProcessing() {
-  callAction('processing', 'processing', {}, showProcessingFor);
+  repository_id = processingData('repository-id');
+  callAction('processing', 'state', {repository_id: repository_id}, showProcessingFor);
 }
-//TODO review for project history
 function display_metric_history() {
-  var module_name = jQuery(this).attr('data-module-name');
-  var metric_name = jQuery(this).attr('show-metric-history');
-  toggle_mezuro("." + metric_name);
-  metricName = metric_name;
+  var module_result_id = jQuery(this).attr('data-module-id');
+  var formatted_name = jQuery(this).attr('show-metric-history');
+  var metric_name = jQuery(this).attr('data-metric-name');
+  toggle_mezuro("." + formatted_name);
+  metricName = formatted_name;
   callAction('module_result', 'metric_result_history', {metric_name: metric_name, module_result_id: module_result_id}, show_metrics);
   return false;
 }
-//TODO review for project history
 function display_grade_history() {
-  var module_name = jQuery(this).attr('data-module-name');
+  var module_result_id = jQuery(this).attr('data-module-id');
   toggle_mezuro("#historical-grade");
   callAction('module_result', 'module_result_history', {module_result_id: module_result_id}, show_grades);
   return false;
 }
-//TODO review for project history
 function show_metrics(content) {
   jQuery('#historical-' + metricName).html(content);
 }
-//TODO review for project history
 function show_grades(content) {
   jQuery('#historical-grade').html(content);
 }
@@ -46,93 +44,85 @@ function toggle_mezuro(element){
   return false;
 }
-//TODO Waiting for ModuleResultController refactoring
 function reloadModule(){
-  var results_root_id = jQuery(this).attr('results_root_id');
+  var module_result_id = jQuery(this).attr('data-module-id');
   showLoadingProcess(false);
   processingTree = true;
-//  callAction('module_result', 'project_tree', {results_root_id: results_root_id }, showProjectTree);
-  callAction('module_result', 'module_result', {results_root_id: results_root_id}, showModuleResult);
+  callAction('module_result', 'module_result', {module_result_id: module_result_id}, showModuleResult);
   return false;
 }
-//TODO review for project history
-function reloadProjectWithDate(date){
-	reloadProject(date + "T00:00:00+00:00");
+function reloadProcessingWithDate(date){
+	reloadProcessing(date + "T00:00:00+00:00");
   return false;
 }
-//TODO review for project history
-function reloadProject(date){
+function reloadProcessing(date){
+  repository_id = processingData('repository-id');
   showLoadingProcess(true);
-  
-  callAction('processing', 'processing', {date: date}, showProjectResult);
-//  callAction('module_result', 'project_tree', {date: date}, showProjectTree);
-  callAction('module_result', 'module_result', {date: date}, showModuleResult);
+
+  callAction('processing', 'processing', {date: date, repository_id: repository_id}, function(content){
+                                                                            showReadyProcessing(content);
+                                                                            var module_result_id = jQuery("#module_result_root_id").attr('module_result_root_id');
+                                                                            callAction('module_result', 'module_result', {module_result_id: module_result_id}, showModuleResult);
+                                                                         }
+            );
 }
 function showProcessingFor(state){
+  repository_id = processingData('repository-id');
   if (state == 'ERROR') {
-    jQuery('#project-state').html('<div style="color:Red">ERROR</div>');
-    callAction('processing', 'processing_error', {}, showProcessing);
+    jQuery('#processing-state').html('<div style="color:Red">ERROR</div>');
+    callAction('processing', 'processing', {repository_id: repository_id}, showReadyProcessing);
+    showModuleResult('');
   }
   else if (state == 'READY') {
     jQuery('#msg-time').html('');
     jQuery('#processing-state').html('<div style="color:Green">READY</div>');
-    callAction('processing', 'processing', {}, showProcessing);
-//    callAction('processing','project_tree', {}, showProjectTree);
-    //var module_result_id = jQuery("#processing").attr('results_root_id'); //TODO Waiting for ModuleResultController refactoring
-    callAction('module_result', 'module_result', {module_result_id: module_result_id}, showModuleResult); //TODO Waiting for ModuleResultController refactoring
-  } 
+    callAction('processing', 'processing', {repository_id: repository_id}, function(content){
+                                                                              showReadyProcessing(content);
+                                                                              var module_result_id = jQuery("#module_result_root_id").attr('module_result_root_id');
+                                                                              callAction('module_result', 'module_result', {module_result_id: module_result_id}, showModuleResult);
+                                                                           }
+              );
+  }
   else if (state.endsWith("ING")) {
     jQuery('#processing-state').html('<div style="color:DarkGoldenRod">'+ state +'</div>');
     jQuery('#msg-time').html("The project analysis may take long. <br/> You'll receive an e-mail when it's ready!");
-    showProjectContentAfter(20);
-  }	
+    showProcessingAfter(20);
+  }
 }
-function showProjectContentAfter(seconds){
+function showProcessingAfter(seconds){
   if (seconds > 0){
-    setTimeout(function() { showProjectContentAfter(seconds - 10);}, 10000);
+    setTimeout(function() { showProcessingAfter(seconds - 10);}, 10000);
   } else {
-    showProjectContent();
+    showProcessing();
   }
 }
-function showProjectResult(content) {
+function showReadyProcessing(content) {
   jQuery('#processing').html(content);
 }
-//function showProjectTree(content){ 
-//  processingTree = false;
-//  jQuery('#project-tree').html(content);
-//	return false;
-//}
-
-//TODO Waiting for ModuleResultController refactoring
 function showModuleResult(content){
-//  if (processingTree != true){
     jQuery('#module-result').html(content);
-//  }
-//  return false;
 }
 function callAction(controller, action, params, callback){
-  var profile = projectContentData('profile');
-  var content = projectContentData('content');
+  var profile = processingData('profile');
+  var content = processingData('content');
   var endpoint = '/profile/' + profile + '/plugin/mezuro/' + controller + '/' + action + '/' + content;
   jQuery.get(endpoint, params, callback);
 }
-function projectContentData(data){
+function processingData(data){
   return jQuery('#processing').attr('data-' + data);
 }
 function showLoadingProcess(firstLoad){
-	if(firstLoad)	
-  	showProjectResult("<img src='/images/loading-small.gif'/>");
-	
-  showProjectTree("<img src='/images/loading-small.gif'/>");
+	if(firstLoad)
+  	showReadyProcessing("<img src='/images/loading-small.gif'/>");
   showModuleResult("<img src='/images/loading-small.gif'/>");
 }
@@ -15,7 +15,7 @@ class ConfigurationFixtures
   def self.configuration_hash
     {
-      :id => 42,
+      :id => "42",
       :name => 'Sample Configuration',
       :description => 'Kalibro configuration for Java projects.'
     }
@@ -21,4 +21,13 @@ class DateMetricResultFixtures
     }
   end
+  def self.score_history
+    result = []
+    result << date_metric_result
+    newer_date_metric_result = date_metric_result
+    newer_date_metric_result.date = '2011-10-25T18:26:43.151+00:00'
+    newer_date_metric_result.metric_result.value = 5.0
+    result << newer_date_metric_result    
+  end
+
 end
@@ -4,13 +4,13 @@ class MetricConfigurationFixtures
   def self.amloc_metric_configuration
     amloc = Kalibro::MetricConfiguration.new amloc_metric_configuration_hash
-    amloc.configuration_id = 13
+    amloc.configuration_id = "13"
     amloc
   end
   def self.sc_metric_configuration
     sc = Kalibro::MetricConfiguration.new sc_metric_configuration_hash
-    sc.configuration_id = 13
+    sc.configuration_id = "13"
     sc
   end
@@ -19,22 +19,22 @@ class MetricConfigurationFixtures
         :code => 'amloc',
         :metric => MetricFixtures.amloc_hash,
         :base_tool_name => MetricFixtures.amloc_hash[:origin],
-        :weight => 1.0,
+        :weight => "1.0",
         :aggregation_form => 'AVERAGE',
-        :reading_group_id => 31,
-        :configuration_id => 13
+        :reading_group_id => "31",
+        :configuration_id => "13"
       })
   end
   def self.amloc_metric_configuration_hash
     {
-      :id => 42,
+      :id => "42",
       :code => 'amloc',
       :metric => MetricFixtures.amloc_hash,
       :base_tool_name => MetricFixtures.amloc_hash[:origin],
-      :weight => 1.0,
+      :weight => "1.0",
       :aggregation_form => 'AVERAGE',
-      :reading_group_id => 31,
+      :reading_group_id => "31",
       :attributes! => {:metric => {
           'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
           'xsi:type' => 'kalibro:metricXml'  }}
@@ -43,12 +43,12 @@ class MetricConfigurationFixtures
   def self.sc_metric_configuration_hash
     {
-      :id => 42,
+      :id => "42",
       :code => 'sc',
       :metric => MetricFixtures.compound_metric_hash,
-      :weight => 1.0,
+      :weight => "1.0",
       :aggregation_form => 'AVERAGE',
-      :reading_group_id => 31,
+      :reading_group_id => "31",
       :attributes! => {:metric => {
           'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
           'xsi:type' => 'kalibro:metricXml'  }}
@@ -10,11 +10,11 @@ class MetricConfigurationSnapshotFixtures
   def self.metric_configuration_snapshot_hash
     {
       :code => "code",
-      :weight => 1,
+      :weight => "1.0",
       :aggregation_form => 'AVERAGE',
       :metric => MetricFixtures.amloc_hash,
       :base_tool_name => "Analizo",
-      :range => RangeSnapshotFixtures.range_snapshot_hash,
+      :range => [RangeSnapshotFixtures.range_snapshot_hash],
       :attributes! => {
         :metric => {
           'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
@@ -26,6 +26,16 @@ class MetricConfigurationSnapshotFixtures
     }
   end
+  def self.metric_configuration_snapshot_with_2_elements
+    Kalibro::MetricConfigurationSnapshot.new  metric_configuration_snapshot_hash_with_2_elements
+  end
+
+  def self.metric_configuration_snapshot_hash_with_2_elements
+    hash = self.metric_configuration_snapshot_hash
+    hash[:range] << RangeSnapshotFixtures.range_snapshot_hash
+    hash
+  end
+
   def self.compound_metric_configuration_snapshot
     Kalibro::MetricConfigurationSnapshot.new compound_metric_configuration_snapshot_hash
   end
@@ -33,11 +43,11 @@ class MetricConfigurationSnapshotFixtures
   def self.compound_metric_configuration_snapshot_hash
     {
       :code => "code",
-      :weight => 1,
+      :weight => "1.0",
       :aggregation_form => 'AVERAGE',
       :metric => MetricFixtures.compound_metric,
       :base_tool_name => "Analizo",
-      :range => RangeSnapshotFixtures.range_snapshot_hash,
+      :range => [RangeSnapshotFixtures.range_snapshot_hash],
       :attributes! => {
         :metric => {
           'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
@@ -5,7 +5,7 @@ class MetricFixtures
   end
   def self.compound_metric_hash
-    {:name => 'Structural Complexity', :compound => true, :scope => 'CLASS', :script => 'return 42;', :description => 'Calculate the Structural Complexity of the Code'}
+    {:name => 'Structural Complexity', :compound => "true", :scope => 'CLASS', :script => 'return 42;', :description => 'Calculate the Structural Complexity of the Code'}
   end
   def self.total_cof
@@ -13,7 +13,7 @@ class MetricFixtures
   end
   def self.total_cof_hash
-    {:name => 'Total Coupling Factor', :compound => false, :scope => 'APPLICATION', :origin => 'Analizo', :language => ['JAVA']}
+    {:name => 'Total Coupling Factor', :compound => "false", :scope => 'APPLICATION', :origin => 'Analizo', :language => ['JAVA']}
   end
   def self.amloc
@@ -21,7 +21,7 @@ class MetricFixtures
   end
   def self.amloc_hash
-    {:name => 'Average Method LOC', :compound => false, :scope => 'CLASS', :origin => 'Analizo', :language => ['JAVA']}
+    {:name => 'Average Method LOC', :compound => "false", :scope => 'CLASS', :origin => 'Analizo', :language => ['JAVA']}
   end
 end
@@ -13,7 +13,7 @@ class MetricResultFixtures
   def self.metric_result_with_error_hash
     {
-      :id => 41,
+      :id => "41",
       :configuration => MetricConfigurationSnapshotFixtures.metric_configuration_snapshot_hash,
       :error => ThrowableFixtures.throwable_hash
     }
@@ -21,9 +21,9 @@ class MetricResultFixtures
   def self.native_metric_result_hash
     {
-      :id => 42,
+      :id => "42",
       :configuration => MetricConfigurationSnapshotFixtures.metric_configuration_snapshot_hash,
-      :value => 0.0,
+      :value => "0.0",
       :attributes! =>
       {
         :configuration =>
@@ -37,9 +37,9 @@ class MetricResultFixtures
   def self.compound_metric_result_hash
     {
-      :id => 43,
+      :id => "43",
       :configuration => MetricConfigurationSnapshotFixtures.compound_metric_configuration_snapshot_hash,
-      :value => 1.0,
+      :value => "1.0",
       :attributes! =>
       {
         :configuration =>
@@ -8,10 +8,10 @@ class ModuleResultFixtures
   def self.module_result_hash
     {
-      :id => 42,
+      :id => "42",
       :module => ModuleFixtures.module_hash,
-      :grade => 10.0,
-      :parent_id => 31,
+      :grade => "10.0",
+      :parent_id => "31",
       :attributes! =>
       {
         :module =>
@@ -25,12 +25,12 @@ class ModuleResultFixtures
   def self.parent_module_result_hash
     {
-      :id => 31,
+      :id => "31",
       :module =>  {
         :name => 'Qt-Calculator Parent',
         :granularity => 'APPLICATION'
       },
-      :grade => 10.0,
+      :grade => "10.0",
       :attributes! =>
       {
         :module =>
@@ -5,7 +5,7 @@ class ProcessTimeFixtures
   end
   def self.process_time_hash
-    {:state => "Ready", :time => 1}
+    {:state => "Ready", :time => "1"}
   end
 end
@@ -9,17 +9,17 @@ class ProcessingFixtures
   def self.processing_hash
     {
-      :id => 31,
+      :id => "31",
       :date => '2011-10-20T18:26:43.151+00:00',
       :state => 'READY',
       :process_time => [ProcessTimeFixtures.process_time_hash],
-      :results_root_id => 13
+      :results_root_id => "13"
     }
   end
   def self.processing_with_error_hash
     {
-      :id => 31,
+      :id => "31",
       :date => '2011-10-20T18:26:43.151+00:00',
       :state => 'ERROR',
       :process_time => [ProcessTimeFixtures.process_time_hash],
@@ -3,14 +3,7 @@ class ProjectContentFixtures
   def self.project_content
     content = MezuroPlugin::ProjectContent.new
     content.project_id = 42
-    #content.name = 'Qt-Calculator'
-    #content.project_license = 'GPL'
-    #content.description = 'Calculator for Qt'
-    #content.repository_type = [RepositoryFixtures.repository_hash[:type]]
-    #content.repository_url = [RepositoryFixtures.repository_hash[:address]]
-    #content.configuration_name = 'Kalibro for Java'
-    #content.periodicity_in_days = 1
     content
   end
-end
 \ No newline at end of file
+end
@@ -12,7 +12,7 @@ class ProjectFixtures
   def self.project_hash
     {
-      :id => 42,
+      :id => "42",
       :name => 'Qt-Calculator',
       :description => 'Calculator for Qt'
     }
@@ -5,11 +5,11 @@ class RangeFixtures
   end
   def self.created_range
-    Kalibro::Range.new :beginning => 19.5, :end => "INF", :reading_id => 1, :comments => "Test range 1"
+    Kalibro::Range.new :beginning => "19.5", :end => "INF", :reading_id => "1", :comments => "Test range 1"
   end
   def self.range_hash
-    {:id => 1, :beginning => 19.5, :end => "INF", :reading_id => 1, :comments => "Test range 1"}
+    {:id => "1", :beginning => "19.5", :end => "INF", :reading_id => "1", :comments => "Test range 1"}
   end
 end
@@ -4,8 +4,16 @@ class RangeSnapshotFixtures
     Kalibro::RangeSnapshot.new range_snapshot_hash
   end
+  def self.range_snapshot_with_infinite_range
+    Kalibro::RangeSnapshot.new range_snapshot_with_infinite_range_hash
+  end
+
   def self.range_snapshot_hash
-    { :end => 5, :label => "snapshot", :grade => 10, :color => "FF2284", :comments => "comment" }
+    { :beginning => "1.1", :end => "5.1", :label => "snapshot", :grade => "10.1", :color => "FF2284", :comments => "comment" }
 	end
+  def self.range_snapshot_with_infinite_range_hash
+    { :beginning => "-INF", :end => "INF", :label => "snapshot", :grade => "10.1", :color => "FF2284", :comments => "comment" }
+  end
+
 end
@@ -5,11 +5,11 @@ class ReadingFixtures
   end
   def self.created_reading # A created object has no id before being sent to kalibro
-    Kalibro::Reading.new :label => "Reading Test Label", :grade => 10.5, :color => "AABBCC"
+    Kalibro::Reading.new :label => "Reading Test Label", :grade => "10.5", :color => "AABBCC"
   end
   def self.reading_hash
-    {:id => 42, :label => "Reading Test Label", :grade => 10.5, :color => "AABBCC" }
+    {:id => "42", :label => "Reading Test Label", :grade => "10.5", :color => "AABBCC" }
   end
 end
@@ -9,7 +9,7 @@ class ReadingGroupFixtures
   end
   def self.reading_group_hash
-    {:id => 42, :name => "Reading Group Test", :description => "Reading group in the fixtures"}
+    {:id => "42", :name => "Reading Group Test", :description => "Reading group in the fixtures"}
   end
 end
@@ -12,12 +12,12 @@ class RepositoryFixtures
       :process_period => "1",
       :type => 'SUBVERSION',
       :address => 'https://qt-calculator.svn.sourceforge.net/svnroot/qt-calculator',
-      :configuration_id => 31
+      :configuration_id => "31"
     })
   end
   def self.repository_hash
-    {:id => 42, :name => "test repository", :description => "test description", :license => "GPL", :process_period => "1", :type => 'SUBVERSION', :address => 'https://qt-calculator.svn.sourceforge.net/svnroot/qt-calculator', :configuration_id => 31}
+    {:id => "42", :name => "test repository", :description => "test description", :license => "GPL", :process_period => "1", :type => 'SUBVERSION', :address => "https://qt-calculator.svn.sourceforge.net/svnroot/qt-calculator", :configuration_id => "31"}
   end
   def self.types
 class StackTraceElementFixtures
-  def self.stack_trace_element(method_name = 'my method name', line_number = 42)
-    Kalibro::StackTraceElement.new stack_trace_element_hash(method_name, line_number)
+  def self.stack_trace_element
+    Kalibro::StackTraceElement.new stack_trace_element_hash
   end
-  def self.stack_trace_element_hash(method_name = 'my method name', line_number = 42)
+  def self.stack_trace_element_hash
     {
       :declaring_class => 'my.declaring.Class',
-      :method_name => method_name,
+      :method_name => 'my method name',
       :file_name => 'MyFile.java',
-      :line_number => line_number
+      :line_number => '42'
     }
   end
@@ -11,8 +11,7 @@ class ThrowableFixtures
       :target_string => 'Target String',
       :message => 'Throwable message from ThrowableTest',
       :stack_trace_element => [
-        StackTraceElementFixtures.stack_trace_element_hash('my method 1', 42),
-        StackTraceElementFixtures.stack_trace_element_hash('my method 2', 84)
+        StackTraceElementFixtures.stack_trace_element_hash, StackTraceElementFixtures.stack_trace_element_hash
       ]
     }
   end
@@ -21,24 +21,24 @@ class MezuroPluginModuleResultControllerTest &lt; ActionController::TestCase
   should 'find module result on kalibro' do
     parent_module_result = ModuleResultFixtures.parent_module_result_hash
-    Kalibro::ModuleResult.expects(:request).with(:get_module_result, { :module_result_id => @module_result_hash[:id] }).
+    Kalibro::ModuleResult.expects(:request).with(:get_module_result, { :module_result_id => @module_result_hash[:id].to_i }).
         returns({:module_result => @module_result_hash})
-    Kalibro::MetricResult.expects(:request).with(:metric_results_of, { :module_result_id => @module_result_hash[:id] }).
+    Kalibro::MetricResult.expects(:request).with(:metric_results_of, { :module_result_id => @module_result_hash[:id].to_i }).
         returns({:metric_result => @metric_result_hash})
-    Kalibro::ModuleResult.expects(:request).with(:get_module_result, { :module_result_id => @module_result_hash[:parent_id] }).
+    Kalibro::ModuleResult.expects(:request).with(:get_module_result, { :module_result_id => @module_result_hash[:parent_id].to_i }).
         returns({:module_result => parent_module_result})
-    Kalibro::ModuleResult.expects(:request).with(:children_of, {:module_result_id => @module_result_hash[:id]}).
+    Kalibro::ModuleResult.expects(:request).with(:children_of, {:module_result_id => @module_result_hash[:id].to_i}).
         returns({:module_result => nil})
     get :module_result, :profile => @profile.identifier, :module_result_id => @module_result_hash[:id]
-    assert_equal @module_result_hash[:grade], assigns(:module_result).grade
-    assert_equal @metric_result_hash[:value], assigns(:metric_results).first.value
+    assert_equal @module_result_hash[:grade].to_f, assigns(:module_result).grade
+    assert_equal @metric_result_hash[:value].to_f, assigns(:metric_results).first.value
     assert_response 200
     #TODO assert_select('h5', 'Metric results for: Qt-Calculator (APPLICATION)')
   end
   should 'get metric result history' do
     metric_name = @metric_result_hash[:configuration][:metric][:name]
-    Kalibro::MetricResult.expects(:request).with(:history_of, { :metric_name => metric_name, :module_result_id => @module_result_hash[:id] }).
+    Kalibro::MetricResult.expects(:request).with(:history_of_metric, { :metric_name => metric_name, :module_result_id => @module_result_hash[:id].to_i }).
         returns({:date_metric_result => @date_metric_result_hash})
     get :metric_result_history, :profile => @profile.identifier, :module_result_id => @module_result_hash[:id], :metric_name => metric_name
     assert_equal DateTime.parse(@date_metric_result_hash[:date]), assigns(:history).first.date
@@ -47,7 +47,7 @@ class MezuroPluginModuleResultControllerTest &lt; ActionController::TestCase
   end
   should 'get module result history' do
-    Kalibro::ModuleResult.expects(:request).with(:history_of_module, { :module_result_id => @module_result_hash[:id] }).
+    Kalibro::ModuleResult.expects(:request).with(:history_of_module, { :module_result_id => @module_result_hash[:id].to_i }).
         returns({:date_module_result => @date_module_result_hash})
     get :module_result_history, :profile => @profile.identifier, :module_result_id => @module_result_hash[:id]
     assert_equal DateTime.parse(@date_module_result_hash[:date]), assigns(:history).first.date
@@ -19,8 +19,15 @@ class MezuroPluginProcessingControllerTest &lt; ActionController::TestCase
   end
   should 'render last processing state' do
-    Kalibro::Processing.expects(:request).with(:last_processing_state, :repository_id => @repository_id).returns({:process_state => @processing.state})
-    get :render_last_state, :profile => @profile.identifier, :repository_id => @repository_id
+    Kalibro::Processing.expects(:processing_of).with(@repository_id).returns(@processing)
+    get :state, :profile => @profile.identifier, :repository_id => @repository_id
+    assert_response 200
+    assert_equal @processing.state, @response.body
+  end
+
+  should 'render a processing state in a specific date' do
+    Kalibro::Processing.expects(:processing_with_date_of).with(@repository_id, @processing.date).returns(@processing)
+    get :state, :profile => @profile.identifier, :repository_id => @repository_id, :date => @processing.date
     assert_response 200
     assert_equal @processing.state, @response.body
   end
@@ -31,8 +31,10 @@ class MezuroPluginRepositoryControllerTest &lt; ActionController::TestCase
     get :new, :profile => @profile.identifier, :id => @content.id
-    assert_equal @content, assigns(:project_content)
+    assert_equal @content.id, assigns(:project_content_id)
+    assert_equal @content.name, assigns(:project_name)
     assert_equal @repository_types, assigns(:repository_types)
+    assert_equal @content.profile.identifier, assigns(:data_profile)
     assert_equal @all_configurations.first.name, assigns(:configuration_select).first.first
     assert_equal @all_configurations.first.id, assigns(:configuration_select).first.last
   end
@@ -40,6 +42,7 @@ class MezuroPluginRepositoryControllerTest &lt; ActionController::TestCase
   should 'create a repository' do
     Kalibro::Repository.expects(:new).returns(@repository)
     @repository.expects(:save).with(@content.project_id).returns(true)
+    @repository.expects(:process)
     get :create, :profile => @profile.identifier, :id => @content.id, :repository => @repository_hash
     assert @repository.errors.empty?
     assert_response :redirect
@@ -62,8 +65,10 @@ class MezuroPluginRepositoryControllerTest &lt; ActionController::TestCase
     get :edit, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
-    assert_equal @content, assigns(:project_content)
+    assert_equal @content.id, assigns(:project_content_id)
+    assert_equal @content.name, assigns(:project_name)
     assert_equal @repository_types, assigns(:repository_types)
+    assert_equal @content.profile.identifier, assigns(:data_profile)
     assert_equal @all_configurations.first.name, assigns(:configuration_select).first.first
     assert_equal @all_configurations.first.id, assigns(:configuration_select).first.last
     assert_equal @repository, assigns(:repository)
@@ -72,6 +77,7 @@ class MezuroPluginRepositoryControllerTest &lt; ActionController::TestCase
   should 'update a repository' do
     Kalibro::Repository.expects(:new).returns(@repository)
     @repository.expects(:save).with(@content.project_id).returns(true)
+    Kalibro::Repository.expects(:request).with(:process_repository, {:repository_id => @repository.id})
     get :update, :profile => @profile.identifier, :id => @content.id, :repository => @repository_hash
     assert @repository.errors.empty?
     assert_response :redirect
@@ -91,6 +97,7 @@ class MezuroPluginRepositoryControllerTest &lt; ActionController::TestCase
     Kalibro::Configuration.expects(:configuration_of).with(@repository.id).returns(@configuration)
     get :show, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
+
     assert_equal @content.name, assigns(:project_name)
     assert_equal @repository, assigns(:repository)
     assert_equal @configuration.name, assigns(:configuration_name)
@@ -10,7 +10,7 @@ class DateMetricResultTest &lt; ActiveSupport::TestCase
   end
   should 'create date_metric_result from hash' do
-    assert_equal @hash[:metric_result][:id], Kalibro::DateMetricResult.new(@hash).metric_result.id
+    assert_equal @hash[:metric_result][:id].to_i, Kalibro::DateMetricResult.new(@hash).metric_result.id
   end
   should 'convert date_metric_result to hash' do
@@ -10,7 +10,7 @@ class DateModuleResultTest &lt; ActiveSupport::TestCase
   end
   should 'create date_module_result from hash' do
-    assert_equal @hash[:module_result][:id], Kalibro::DateModuleResult.new(@hash).module_result.id
+    assert_equal @hash[:module_result][:id].to_i, Kalibro::DateModuleResult.new(@hash).module_result.id
   end
   should 'convert date_module_result to hash' do
@@ -6,15 +6,19 @@ class MetricConfigurationSnapshotTest &lt; ActiveSupport::TestCase
   def setup
     @hash = MetricConfigurationSnapshotFixtures.metric_configuration_snapshot_hash
+    @hash2 = MetricConfigurationSnapshotFixtures.metric_configuration_snapshot_hash_with_2_elements
     @metric_configuration_snapshot = MetricConfigurationSnapshotFixtures.metric_configuration_snapshot
+    @metric_configuration_snapshot2 = MetricConfigurationSnapshotFixtures.metric_configuration_snapshot_with_2_elements
   end
-  should 'create metric configuration snapshot from hash' do
+  should 'create and convert metric configuration snapshot from hash' do
     assert_equal @hash[:code], Kalibro::MetricConfigurationSnapshot.new(@hash).code
+    assert_equal @hash[:weight].to_f, @metric_configuration_snapshot.weight
   end
-  should 'convert metric configuration snapshot to hash' do
-    assert_equal @hash, @metric_configuration_snapshot.to_hash
+  should 'create and convert metric configuration snapshot from hash with 2 elements' do
+    assert_equal @hash2[:code], Kalibro::MetricConfigurationSnapshot.new(@hash2).code
+    assert_equal @hash2, @metric_configuration_snapshot2.to_hash
   end
 end
@@ -12,7 +12,18 @@ class MetricResultTest &lt; ActiveSupport::TestCase
   end
   should 'create metric result from hash' do
-    assert_equal @native_hash[:configuration][:code], Kalibro::MetricResult.new(@native_hash).configuration.code
+    metric_result = Kalibro::MetricResult.new(@native_hash)
+    assert_equal @native_hash[:configuration][:code], metric_result.configuration.code
+    assert_equal @native_hash[:id].to_i, metric_result.id
+    assert_equal @native_hash[:value].to_f, metric_result.value
+  end
+
+  should 'create metric result with aggregated value from hash' do
+    hash = @native_hash
+    hash[:aggregated_value] = "2.0"
+    hash[:value] = "NaN"
+    metric_result = Kalibro::MetricResult.new(hash)
+    assert_equal @native_hash[:aggregated_value].to_f, metric_result.value
   end
   should 'convert metric result to hash' do
@@ -28,13 +39,13 @@ class MetricResultTest &lt; ActiveSupport::TestCase
   should 'return metric results of a module result' do
     id = 31
     Kalibro::MetricResult.expects(:request).with(:metric_results_of, {:module_result_id => id}).returns(:metric_result => [@native_hash, @compound_hash])
-    assert_equal @native_hash[:id], Kalibro::MetricResult.metric_results_of(id).first.id
+    assert_equal @native_hash[:id].to_i, Kalibro::MetricResult.metric_results_of(id).first.id
   end
   should 'return history of a metric with a module result id' do
     module_result_id = 31
-    Kalibro::MetricResult.expects(:request).with(:history_of, {:metric_name => @result.configuration.metric.name, :module_result_id => module_result_id}).returns({:date_metric_result => DateMetricResultFixtures.date_metric_result_hash})
-    assert_equal DateMetricResultFixtures.date_metric_result_hash[:metric_result][:id], Kalibro::MetricResult.history_of(@result.configuration.metric.name, module_result_id).first.metric_result.id
+    Kalibro::MetricResult.expects(:request).with(:history_of_metric, {:metric_name => @result.configuration.metric.name, :module_result_id => module_result_id}).returns({:date_metric_result => DateMetricResultFixtures.date_metric_result_hash})
+    assert_equal DateMetricResultFixtures.date_metric_result_hash[:metric_result][:id].to_i, Kalibro::MetricResult.history_of(@result.configuration.metric.name, module_result_id).first.metric_result.id
   end
 end
@@ -11,7 +11,10 @@ class ModuleResultTest &lt; ActiveSupport::TestCase
   end
   should 'create module result' do
-    assert_equal @hash[:id] , Kalibro::ModuleResult.new(@hash).id
+    module_result = Kalibro::ModuleResult.new(@hash)
+    assert_equal @hash[:id].to_i , module_result.id
+    assert_equal @hash[:grade].to_f , module_result.grade
+    assert_equal @hash[:parent_id].to_i , module_result.parent_id
   end
   should 'convert module result to hash' do
@@ -41,7 +44,7 @@ class ModuleResultTest &lt; ActiveSupport::TestCase
   should 'return history of a module result' do
     Kalibro::ModuleResult.expects(:request).with(:history_of_module, {:module_result_id => @module_result.id}).returns({:date_module_result => [DateModuleResultFixtures.date_module_result_hash]})
-    assert_equal DateModuleResultFixtures.date_module_result_hash[:module_result][:id], Kalibro::ModuleResult.history_of(@module_result.id).first.module_result.id
+    assert_equal DateModuleResultFixtures.date_module_result_hash[:module_result][:id].to_i, Kalibro::ModuleResult.history_of(@module_result.id).first.module_result.id
   end
 end
@@ -11,10 +11,15 @@ class ProcessTimeTest &lt; ActiveSupport::TestCase
   should 'create process time from hash' do
     assert_equal @hash[:state], Kalibro::ProcessTime.new(@hash).state
+    assert_equal @hash[:time].to_i, Kalibro::ProcessTime.new(@hash).time
   end
   should 'convert process time to hash' do
     assert_equal @hash, @process_time.to_hash
   end
+  should 'get time as an integer' do
+    assert_equal 1.class, @process_time.time.class
+  end
+
 end
 require "test_helper"
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/processing_fixtures"
-#TODO arrumar os testes de unidade
 class ProcessingTest < ActiveSupport::TestCase
   def setup
@@ -11,12 +10,14 @@ class ProcessingTest &lt; ActiveSupport::TestCase
     @repository_id = 31
   end
-  should 'create project result from hash' do
-    assert_equal @hash[:results_root_id], Kalibro::Processing.new(@hash).results_root_id
-    assert_equal @hash[:process_time].first[:state], Kalibro::Processing.new(@hash).process_times.first.state
+  should 'create processing from hash' do
+    processing = Kalibro::Processing.new(@hash)
+    assert_equal @hash[:results_root_id].to_i, processing.results_root_id
+    assert_equal @hash[:process_time].first[:state], processing.process_times.first.state
+    assert_equal @hash[:id].to_i, processing.id
   end
-  should 'convert project result to hash' do
+  should 'convert processing to hash' do
     assert_equal @hash, @processing.to_hash
   end
@@ -94,56 +95,4 @@ class ProcessingTest &lt; ActiveSupport::TestCase
     assert_equal @processing.id, Kalibro::Processing.last_processing_before(@repository_id, @processing.date).id
   end
-=begin
-  should 'get processing of a repository' do
-    Kalibro::Processing.expects(:has_ready_processing).with(@repository.id).returns(true)
-    Kalibro::Processing.expects(:last_ready_processing_of).with(@repository.id).returns(@processing)
-    assert_equal @processing, @project_content.processing(@repository.id)
-  end
-  
-  should 'get not ready processing of a repository' do
-    Kalibro::Processing.expects(:has_ready_processing).with(@repository.id).returns(false)
-    Kalibro::Processing.expects(:last_processing_of).with(@repository.id).returns(@processing)
-    assert_equal @processing, @project_content.processing(@repository.id)
-  end
-  
-  should 'get processing of a repository after date' do
-    Kalibro::Processing.expects(:has_processing_after).with(@repository.id, @date).returns(true)
-    Kalibro::Processing.expects(:first_processing_after).with(@repository.id, @date).returns(@processing)
-    assert_equal @processing, @project_content.processing_with_date(@repository.id, @date)
-  end
-  
-  should 'get processing of a repository before date' do
-    Kalibro::Processing.expects(:has_processing_after).with(@repository.id, @date).returns(false)
-    Kalibro::Processing.expects(:has_processing_before).with(@repository.id, @date).returns(true)
-    Kalibro::Processing.expects(:last_processing_before).with(@repository.id, @date).returns(@processing)
-    assert_equal @processing, @project_content.processing_with_date(@repository.id, @date)
-  end
-
-  should 'get module result' do
-    @project_content.expects(:processing).with(@repository.id).returns(@processing)
-    Kalibro::ModuleResult.expects(:find).with(@processing.results_root_id).returns(@module_result)
-    assert_equal @module_result, @project_content.module_result(@repository.id)
-
-  end
-  
-  should 'get module result with date' do
-    @project_content.expects(:processing_with_date).with(@repository.id,@date.to_s).returns(@processing)
-    Kalibro::ModuleResult.expects(:find).with(@processing.results_root_id).returns(@module_result)
-    assert_equal @module_result, @project_content.module_result(@repository.id, @date.to_s)
-  end
-
-  should 'get result history' do
-    Kalibro::MetricResult.expects(:history_of).with(@module_result.id).returns([@date_metric_result])
-    assert_equal [@date_metric_result], @project_content.result_history(@module_result.id)
-  end
-
-  should 'add error to base when the module_result does not exist' do
-    Kalibro::MetricResult.expects(:history_of).with(@module_result.id).raises(Kalibro::Errors::RecordNotFound)
-    assert_nil @project_content.errors[:base]
-    @project_content.result_history(@module_result.id)
-    assert_not_nil @project_content.errors[:base]
-  end
-=end
-
 end
@@ -13,6 +13,7 @@ class ProjectTest &lt; ActiveSupport::TestCase
   should 'initialize new project from hash' do
     project = Kalibro::Project.new @hash
     assert_equal @hash[:name], project.name
+    assert_equal @hash[:id].to_i, project.id
   end
   should 'convert project to hash' do
@@ -6,11 +6,23 @@ class RangeSnapshotTest &lt; ActiveSupport::TestCase
   def setup
     @hash = RangeSnapshotFixtures.range_snapshot_hash
+    @range_snapshot_with_infinite_range_hash = RangeSnapshotFixtures.range_snapshot_with_infinite_range_hash
     @range_snapshot = RangeSnapshotFixtures.range_snapshot
+    @range_snapshot_with_infinite_range = RangeSnapshotFixtures.range_snapshot_with_infinite_range
   end
   should 'create range_snapshot from hash' do
-    assert_equal @hash[:comments], Kalibro::RangeSnapshot.new(@hash).comments
+    range_snapshot = Kalibro::RangeSnapshot.new(@hash)
+    assert_equal @hash[:comments], range_snapshot.comments
+    assert_equal @hash[:beginning].to_f, range_snapshot.beginning
+    assert_equal @hash[:end].to_f, range_snapshot.end
+    assert_equal @hash[:grade].to_f, range_snapshot.grade
+  end
+
+  should 'create range_snapshot from hash with infinity values' do
+    range_snapshot = Kalibro::RangeSnapshot.new(@range_snapshot_with_infinite_range_hash)
+    assert_equal -1.0/0, range_snapshot.beginning
+    assert_equal 1.0/0, range_snapshot.end
   end
   should 'convert range_snapshot to hash' do
@@ -11,7 +11,11 @@ class RepositoryTest &lt; ActiveSupport::TestCase
   end
   should 'new repository from hash' do
-    assert_equal @repository.type, Kalibro::Repository.new(@hash).type
+    repository = Kalibro::Repository.new(@hash)
+    assert_equal @hash[:type], repository.type
+    assert_equal @hash[:id].to_i, repository.id
+    assert_equal @hash[:process_period].to_i, repository.process_period
+    assert_equal @hash[:configuration_id].to_i, repository.configuration_id
   end
   should 'convert repository to hash' do
@@ -40,7 +44,6 @@ class RepositoryTest &lt; ActiveSupport::TestCase
     id_from_kalibro = 1
     project_id = 56
     Kalibro::Repository.expects(:request).with(:save_repository, {:repository => @created_repository.to_hash, :project_id => project_id}).returns(:repository_id => id_from_kalibro)
-    Kalibro::Repository.expects(:request).with(:process_repository, :repository_id => id_from_kalibro).returns(:repository_id => id_from_kalibro)
     assert @created_repository.save(project_id)
     assert_equal id_from_kalibro, @created_repository.id
   end
@@ -59,7 +62,7 @@ class RepositoryTest &lt; ActiveSupport::TestCase
   should 'process repository' do
     Kalibro::Repository.expects(:request).with(:process_repository, {:repository_id => @repository.id});
-    @repository.process_repository
+    @repository.process
   end
   should 'cancel processing of a repository' do
 require "test_helper"
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/metric_configuration_snapshot_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/date_metric_result_fixtures"
 class ContentViewerHelperTest < ActiveSupport::TestCase
+  def setup
+    @helper = MezuroPlugin::Helpers::ContentViewerHelper
+  end
+
   should 'get the number rounded by two decimal points' do
-    assert_equal '4.22', MezuroPlugin::Helpers::ContentViewerHelper.format_grade('4.22344')
-    assert_equal '4.10', MezuroPlugin::Helpers::ContentViewerHelper.format_grade('4.1')
-    assert_equal '4.00', MezuroPlugin::Helpers::ContentViewerHelper.format_grade('4')
+    assert_equal '4.22', @helper.format_grade('4.22344')
+    assert_equal '4.10', @helper.format_grade('4.1')
+    assert_equal '4.00', @helper.format_grade('4')
   end
   should 'create the periodicity options array' do
-    assert_equal [["Not Periodically", 0], ["1 day", 1], ["2 days", 2], ["Weekly", 7], ["Biweeky", 15], ["Monthly", 30]], MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options
+    assert_equal [["Not Periodically", 0], ["1 day", 1], ["2 days", 2], ["Weekly", 7], ["Biweekly", 15], ["Monthly", 30]], @helper.periodicity_options
+  end
+
+  should 'return the correct string for a given periodicity' do
+    assert_equal "Not Periodically", @helper.periodicity_option(0)
+    assert_equal "1 day", @helper.periodicity_option(1)
+    assert_equal "2 days", @helper.periodicity_option(2)
+    assert_equal "Weekly", @helper.periodicity_option(7)
+    assert_equal "Biweekly", @helper.periodicity_option(15)
+    assert_equal "Monthly", @helper.periodicity_option(30)
+  end
+
+  should 'create the license options array' do
+   options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yml")
+   options = options.split(";")
+   formated_options = []
+   options.each { |option| formated_options << [option, option] }
+   assert_equal formated_options, @helper.license_options
   end
+  should 'generate chart from metric result history' do
+    chart = "http://chart.apis.google.com/chart?chxt=y,x&chco=c4a000&chf=bg,ls,90,efefef,0.2,ffffff,0.2&chd=s:A9&chl=2011-10-20T18%3A26%3A43%2B00%3A00|2011-10-25T18%3A26%3A43%2B00%3A00&cht=lc&chs=600x180&chxr=0,0.0,5.0"
+    metric_history = DateMetricResultFixtures.score_history
+
+    assert_equal chart, @helper.generate_chart(metric_history)
+  end
+
+  should 'format time to show a sentence' do
+    assert_equal 'less than 5 seconds', @helper.format_time(0)
+    assert_equal 'less than 5 seconds', @helper.format_time(4999)
+    assert_equal 'less than 10 seconds', @helper.format_time(5000)
+    assert_equal '1 minute', @helper.format_time(70000)
+    assert_equal 'about 2 hours', @helper.format_time(7000000)
+  end
+
   should 'format metric name for metric configuration snapshot' do
     metric_configuration_snapshot = MetricConfigurationSnapshotFixtures.metric_configuration_snapshot
-    assert_equal 'AverageMethodLOC', MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_configuration_snapshot)
+    assert_equal 'AverageMethodLOC', @helper.format_name(metric_configuration_snapshot)
   end
 end
@@ -0,0 +1,15 @@
+require "test_helper"
+
+class ModuleResultHelperTest < ActiveSupport::TestCase
+
+  should 'return last module name when receive a string' do
+    name = 'Class'
+    assert_equal name, MezuroPlugin::Helpers::ModuleResultHelper.module_name(name)
+  end
+
+  should 'return last module name when receive an array of strings' do
+    name = ['Class', 'Module']
+    assert_equal name.last, MezuroPlugin::Helpers::ModuleResultHelper.module_name(name)
+  end
+
+end
@@ -9,19 +9,22 @@
 <tbody>
   <% @metric_results.each do |metric_result|  %>
     <% metric_configuration_snapshot = metric_result.metric_configuration_snapshot%>
-    <% range_snapshot = metric_configuration_snapshot.range_snapshot %>
-    <% formatted_name = MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_configuration_snapshot) %>
-    <% if !range_snapshot.nil? %>
+    <% range_snapshots = metric_configuration_snapshot.range_snapshot %>
+    <% metric_name = metric_configuration_snapshot.metric.name %>
+    <% formatted_name = metric_name.delete("() ") %>
+    <% if !range_snapshots.nil? %>
       <tr>
-        <td style="width: 74%"><a href="#" show-metric-history="<%= formatted_name %>" data-module-id="<%= @module_result_id %>"><%= metric_configuration_snapshot.metric.name %></a></td>
+        <td style="width: 74%"><a href="#" show-metric-history="<%= formatted_name %>" data-metric-name="<%= metric_name %>" data-module-id="<%= @module_result.id %>"><%= metric_name %></a></td>
         <td><%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_result.value) %></td>
         <td><%= metric_configuration_snapshot.weight %></td>
+      <% range_snapshots.each do |range_snapshot| %>
+        <% if range_snapshot.beginning <= metric_result.value and range_snapshot.end > metric_result.value %>
         <td style="background-color: #<%= range_snapshot.color %>">
           <span title="<%= range_snapshot.comments %>" >
             <%= range_snapshot.label %>
           </span>
         </td>
-      </tr>	  
+      </tr>
       <tr class="<%= formatted_name %>" style="display: none;">
         <td colspan="3">
           <div id='historical-<%= formatted_name %>'>
@@ -29,8 +32,10 @@
         </td>
         <td align="right">
           <%= range_snapshot.comments.nil? ? '' : range_snapshot.comments %>
-        </td> 
+        </td>
       </tr>
+      <% end %>
+      <% end %>
     <% end %>
   <% end %>
 </tbody>
-<% render :partial => "source_tree", :locals => {:module_result => @module_result} %>
-<h5><%= _('Metric results for: #{@module_result.module.name} (#{@module_result.module.granularity}) ') %> </h5>
+<%= render :partial => "source_tree", :locals => {:module_result => @module_result} %>
+<h5><%= _"Metric results for: #{@module_result.module.name} (#{@module_result.module.granularity})" %> </h5>
 <hr/>
 <div class="zoomable-image">
 <h4><%= _('Source tree') %></h4>
-<% module_name = module_result.module.name %>
+<% helper = MezuroPlugin::Helpers::ModuleResultHelper %>
+<% module_name = helper.module_name(module_result.module.name) %>
 <% module_label = "#{module_name} (#{module_result.module.granularity})" %>
 <p>
   <h2 class="path">
     <% module_result.parents.each do |parent| %>
       /<a href="#" class="source-tree-link" data-module-id="<%= parent.id %>">
-        <%= parent.module.name %>
+        <%= helper.module_name parent.module.name %>
       </a>
-    <% end %>
+    <% end %>/ <%= helper.module_name module_name %>
   </h2>
 </p>
@@ -17,14 +18,14 @@
     <% if child.module.granularity=='PACKAGE' %>
       <tr>
         <td class="icon"><%= image_tag('/plugins/mezuro/images/folder.png')%></td>
-        <td class="source-tree-text"><a href='#' class="source-tree-link" data-module-id="<%= child.id %>"><%= child.module.name %></a></td>
+        <td class="source-tree-text"><a href='#' class="source-tree-link" data-module-id="<%= child.id %>"><%= helper.module_name child.module.name %></a></td>
       </tr>
     <% else %>
       <tr>
         <td class="icon"><%= image_tag('/plugins/mezuro/images/file.png') %></td>
         <td class="source-tree-text">
           <a href='#' class="source-tree-link" data-module-id="<%= child.id %>">
-            <%= child.module.name %>
+            <%= helper.module_name child.module.name %>
           </a>
         </td>
       </tr>
@@ -5,12 +5,12 @@
 <table>
   <tr>
     <td><%= _('Date') %></td>
-    <td><%= @processing.date %></td>
+    <td><%= @processing.date.inspect %></td>
   </tr>
   <% @processing.process_time.each do |process_time| %>
     <tr>
       <td><%= _(process_time.state + ' time') %></td>
-      <td><%= process_time.time %></td>
+      <td><%= MezuroPlugin::Helpers::ContentViewerHelper.format_time(process_time.time) %></td>
     </tr>
   <% end %>
   <tr>
@@ -25,10 +25,12 @@
   jQuery(document).ready(function($) {
     $("#datepicker").datepicker({
 	  								onSelect: function(dateText, inst) {
-	  									reloadProjectWithDate(dateText) } });
+	  									reloadProcessingWithDate(dateText) } });
     $("#datepicker").toggle();
     var date = jQuery("#current_processing_date").attr('data-date').substr(0,10);
-  $("#datepicker").datepicker( "setDate" , date );
+    $("#datepicker").datepicker( "setDate" , date.substr(5,2)+"/"+date.substr(8,2)+"/"+date.substr(0,4));
   });
 </script>
+
+<span id="module_result_root_id" module_result_root_id="<%= @processing.results_root_id %>">
-<h2><%= @project_content.name %> Project</h2>
+<h3> <%= link_to( @project_name, homepage_url(@data_profile, @project_name.downcase.gsub(/[^0-9A-Za-z]/, '')) ) %></h3>
 <% form_for :repository, :url => {:action =>"update", :controller => "mezuro_plugin_repository"},  :method => :get do |f| %>
-  <%= hidden_field_tag :id, @project_content.id %>
+  <%= hidden_field_tag :id, @project_content_id %>
   <%= f.hidden_field :id%>
   <%= required labelled_form_field _('Name:'), f.text_field(:name) %> 
-<h2><%= @project_content.name %> Project</h2>
+<h3> <%= link_to( @project_name, homepage_url(@data_profile, @project_name.downcase.gsub(/[^0-9A-Za-z]/, '')) ) %></h3>
 <% form_for :repository, :url => {:action =>"create", :controller => "mezuro_plugin_repository"},  :method => :get do |f| %>
-  <%= hidden_field_tag :id, @project_content.id %>
+  <%= hidden_field_tag :id, @project_content_id %>
   <%= required labelled_form_field _('Name:'), f.text_field(:name) %> 
 <script src="/plugins/mezuro/javascripts/processing.js" type="text/javascript"></script>
-<h3><%= @project_name %></h3>
+<h3> <%= link_to( @project_name, homepage_url(@data_profile, @project_name.downcase.gsub(/[^0-9A-Za-z]/, '')) ) %></h3>
 <table>
   <tr>
@@ -14,7 +14,7 @@
     <td><%= _('License') %></td>
     <td><%= @repository.license %></td>
   </tr>
-  <tr> 
+  <tr>
     <td><%= _('Process Period') %></td>
     <td><%= MezuroPlugin::Helpers::ContentViewerHelper.periodicity_option(@repository.process_period.to_i) %></td>
   </tr>
@@ -34,7 +34,7 @@
     <td><%= _('Status')%></td>
     <td>
       <div id="processing-state" style="color:DarkGoldenRod">Retrieving</div>
-      <div id="msg-time"></div> 
+      <div id="msg-time"></div>
     </td>
   </tr>
 </table>
	@@ -7,7 +7,7 @@ class MezuroPluginModuleResultController < MezuroPluginProfileController		@@ -7,7 +7,7 @@ class MezuroPluginModuleResultController < MezuroPluginProfileController
7	@metric_results = Kalibro::MetricResult.metric_results_of(@module_result.id)	7	@metric_results = Kalibro::MetricResult.metric_results_of(@module_result.id)
8	render :partial => 'module_result'	8	render :partial => 'module_result'
9	end	9	end
10	-	10	+
11	def metric_result_history	11	def metric_result_history
12	@history = Kalibro::MetricResult.history_of(params[:metric_name], params[:module_result_id].to_i)	12	@history = Kalibro::MetricResult.history_of(params[:metric_name], params[:module_result_id].to_i)
13	render :partial => 'score_history'	13	render :partial => 'score_history'
	@@ -2,6 +2,10 @@ class Kalibro::MetricConfigurationSnapshot < Kalibro::Model		@@ -2,6 +2,10 @@ class Kalibro::MetricConfigurationSnapshot < Kalibro::Model
2		2
3	attr_accessor :code, :weight, :aggregation_form, :metric, :base_tool_name, :range	3	attr_accessor :code, :weight, :aggregation_form, :metric, :base_tool_name, :range
4		4
		5	+ def weight=(value)
		6	+ @weight = value.to_f
		7	+ end
		8	+
5	def metric=(value)	9	def metric=(value)
6	if value.kind_of?(Hash)	10	if value.kind_of?(Hash)
7	@metric = Kalibro::Metric.to_object(value)	11	@metric = Kalibro::Metric.to_object(value)
	@@ -11,11 +15,24 @@ class Kalibro::MetricConfigurationSnapshot < Kalibro::Model		@@ -11,11 +15,24 @@ class Kalibro::MetricConfigurationSnapshot < Kalibro::Model
11	end	15	end
12		16
13	def range=(value)	17	def range=(value)
14	- @range = Kalibro::RangeSnapshot.to_object value	18	+ value.to_a
		19	+ @range = []
		20	+
		21	+ value.each do \|range_snapshot\|
		22	+ @range << Kalibro::RangeSnapshot.to_object(range_snapshot)
		23	+ end
		24	+
15	end	25	end
16		26
17	def range_snapshot	27	def range_snapshot
18	range	28	range
19	end	29	end
20		30
		31	+ def to_hash
		32	+ hash = super
		33	+ hash[:attributes!][:range] = {'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
		34	+ 'xsi:type' => 'kalibro:rangeSnapshotXml' }
		35	+ hash
		36	+ end
		37	+
21	end	38	end
	@@ -2,4 +2,8 @@ class Kalibro::ProcessTime < Kalibro::Model		@@ -2,4 +2,8 @@ class Kalibro::ProcessTime < Kalibro::Model
2		2
3	attr_accessor :state, :time	3	attr_accessor :state, :time
4		4
		5	+ def time=(time)
		6	+ @time = time.to_i
		7	+ end
		8	+
5	end	9	end
1	class Kalibro::RangeSnapshot < Kalibro::Model	1	class Kalibro::RangeSnapshot < Kalibro::Model
2		2
3	- attr_accessor :end, :label, :grade, :color, :comments	3	+ attr_accessor :beginning, :end, :label, :grade, :color, :comments
		4	+
		5	+ def beginning=(value)
		6	+ @beginning = ((value == "-INF") ? -1.0/0 : value.to_f)
		7	+ end
		8	+
		9	+ def end=(value)
		10	+ @end = ((value == "INF") ? 1.0/0 : value.to_f)
		11	+ end
		12	+
		13	+ def grade=(value)
		14	+ @grade = value.to_f
		15	+ end
4		16
5	end	17	end
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+class MezuroPlugin::Helpers::ModuleResultHelper
	2	+
	3	+ def self.module_name name
	4	+ name.is_a?(Array) ? name.last : name
	5	+ end
	6	+
	7	+end
	@@ -83,7 +83,6 @@ class MezuroPlugin::ProjectContent < Article		@@ -83,7 +83,6 @@ class MezuroPlugin::ProjectContent < Article
83		83
84	def create_kalibro_project	84	def create_kalibro_project
85	Kalibro::Project.create(	85	Kalibro::Project.create(
86	- :id => project_id,
87	:name => name,	86	:name => name,
88	:description => description	87	:description => description
89	)	88	)
	@@ -15,7 +15,7 @@ class ConfigurationFixtures		@@ -15,7 +15,7 @@ class ConfigurationFixtures
15		15
16	def self.configuration_hash	16	def self.configuration_hash
17	{	17	{
18	- :id => 42,	18	+ :id => "42",
19	:name => 'Sample Configuration',	19	:name => 'Sample Configuration',
20	:description => 'Kalibro configuration for Java projects.'	20	:description => 'Kalibro configuration for Java projects.'
21	}	21	}
	@@ -21,4 +21,13 @@ class DateMetricResultFixtures		@@ -21,4 +21,13 @@ class DateMetricResultFixtures
21	}	21	}
22	end	22	end
23		23
		24	+ def self.score_history
		25	+ result = []
		26	+ result << date_metric_result
		27	+ newer_date_metric_result = date_metric_result
		28	+ newer_date_metric_result.date = '2011-10-25T18:26:43.151+00:00'
		29	+ newer_date_metric_result.metric_result.value = 5.0
		30	+ result << newer_date_metric_result
		31	+ end
		32	+
24	end	33	end
	@@ -5,7 +5,7 @@ class MetricFixtures		@@ -5,7 +5,7 @@ class MetricFixtures
5	end	5	end
6		6
7	def self.compound_metric_hash	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'}	8	+ {:name => 'Structural Complexity', :compound => "true", :scope => 'CLASS', :script => 'return 42;', :description => 'Calculate the Structural Complexity of the Code'}
9	end	9	end
10		10
11	def self.total_cof	11	def self.total_cof
	@@ -13,7 +13,7 @@ class MetricFixtures		@@ -13,7 +13,7 @@ class MetricFixtures
13	end	13	end
14		14
15	def self.total_cof_hash	15	def self.total_cof_hash
16	- {:name => 'Total Coupling Factor', :compound => false, :scope => 'APPLICATION', :origin => 'Analizo', :language => ['JAVA']}	16	+ {:name => 'Total Coupling Factor', :compound => "false", :scope => 'APPLICATION', :origin => 'Analizo', :language => ['JAVA']}
17	end	17	end
18		18
19	def self.amloc	19	def self.amloc
	@@ -21,7 +21,7 @@ class MetricFixtures		@@ -21,7 +21,7 @@ class MetricFixtures
21	end	21	end
22		22
23	def self.amloc_hash	23	def self.amloc_hash
24	- {:name => 'Average Method LOC', :compound => false, :scope => 'CLASS', :origin => 'Analizo', :language => ['JAVA']}	24	+ {:name => 'Average Method LOC', :compound => "false", :scope => 'CLASS', :origin => 'Analizo', :language => ['JAVA']}
25	end	25	end
26		26
27	end	27	end
	@@ -13,7 +13,7 @@ class MetricResultFixtures		@@ -13,7 +13,7 @@ class MetricResultFixtures
13		13
14	def self.metric_result_with_error_hash	14	def self.metric_result_with_error_hash
15	{	15	{
16	- :id => 41,	16	+ :id => "41",
17	:configuration => MetricConfigurationSnapshotFixtures.metric_configuration_snapshot_hash,	17	:configuration => MetricConfigurationSnapshotFixtures.metric_configuration_snapshot_hash,
18	:error => ThrowableFixtures.throwable_hash	18	:error => ThrowableFixtures.throwable_hash
19	}	19	}
	@@ -21,9 +21,9 @@ class MetricResultFixtures		@@ -21,9 +21,9 @@ class MetricResultFixtures
21		21
22	def self.native_metric_result_hash	22	def self.native_metric_result_hash
23	{	23	{
24	- :id => 42,	24	+ :id => "42",
25	:configuration => MetricConfigurationSnapshotFixtures.metric_configuration_snapshot_hash,	25	:configuration => MetricConfigurationSnapshotFixtures.metric_configuration_snapshot_hash,
26	- :value => 0.0,	26	+ :value => "0.0",
27	:attributes! =>	27	:attributes! =>
28	{	28	{
29	:configuration =>	29	:configuration =>
	@@ -37,9 +37,9 @@ class MetricResultFixtures		@@ -37,9 +37,9 @@ class MetricResultFixtures
37		37
38	def self.compound_metric_result_hash	38	def self.compound_metric_result_hash
39	{	39	{
40	- :id => 43,	40	+ :id => "43",
41	:configuration => MetricConfigurationSnapshotFixtures.compound_metric_configuration_snapshot_hash,	41	:configuration => MetricConfigurationSnapshotFixtures.compound_metric_configuration_snapshot_hash,
42	- :value => 1.0,	42	+ :value => "1.0",
43	:attributes! =>	43	:attributes! =>
44	{	44	{
45	:configuration =>	45	:configuration =>