From c9b381b921f93881746dc0be693aaee5b0313811 Mon Sep 17 00:00:00 2001
From: Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
Date: Thu, 5 Apr 2012 16:37:26 -0300
Subject: [PATCH] [Mezuro] Refactored module_result_client and updated tests

---
 plugins/mezuro/lib/kalibro/client/module_result_client.rb            | 15 ++++++++-------
 plugins/mezuro/lib/mezuro_plugin/project_content.rb                  |  7 ++++++-
 plugins/mezuro/test/unit/kalibro/client/module_result_client_test.rb |  3 +--
 plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb       | 20 +++++++++++++++-----
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/plugins/mezuro/lib/kalibro/client/module_result_client.rb b/plugins/mezuro/lib/kalibro/client/module_result_client.rb
index 81b42af..1b0cdd3 100644
--- a/plugins/mezuro/lib/kalibro/client/module_result_client.rb
+++ b/plugins/mezuro/lib/kalibro/client/module_result_client.rb
@@ -1,11 +1,5 @@
 class Kalibro::Client::ModuleResultClient
 
-  # TODO test this
-  def self.module_result(project_content, module_name)
-    project_result = project_content.project_result
-    new.module_result(project_result.project.name, module_name, project_result.date)
-  end
-  
   def initialize
     @port = Kalibro::Client::Port.new('ModuleResult')
   end
@@ -23,4 +17,11 @@ class Kalibro::Client::ModuleResultClient
     Kalibro::Entities::Entity.new.to_entity_array(value, Kalibro::Entities::ModuleResult)
   end
 
-end
\ No newline at end of file
+  private
+
+  def date_with_milliseconds(date)
+    milliseconds = "." + (date.sec_fraction * 60 * 60 * 24 * 1000).to_s
+    date.to_s[0..18] + milliseconds + date.to_s[19..-1]
+  end
+
+end
diff --git a/plugins/mezuro/lib/mezuro_plugin/project_content.rb b/plugins/mezuro/lib/mezuro_plugin/project_content.rb
index 364bf3d..604b5fb 100644
--- a/plugins/mezuro/lib/mezuro_plugin/project_content.rb
+++ b/plugins/mezuro/lib/mezuro_plugin/project_content.rb
@@ -26,7 +26,12 @@ class MezuroPlugin::ProjectContent < Article
   end
 
   def module_result(module_name)
-    @module_client ||= Kalibro::Client::ModuleResultClient.module_result(self, module_name)
+    module_name = project.name if module_name.nil?      
+    @module_client ||= module_result_client.module_result(project.name, module_name, project_result.date)
+  end
+
+  def module_result_client
+    @module_result_client ||= Kalibro::Client::ModuleResultClient.new
   end
 
   after_save :send_project_to_service
diff --git a/plugins/mezuro/test/unit/kalibro/client/module_result_client_test.rb b/plugins/mezuro/test/unit/kalibro/client/module_result_client_test.rb
index 4b109ac..ba5e60d 100644
--- a/plugins/mezuro/test/unit/kalibro/client/module_result_client_test.rb
+++ b/plugins/mezuro/test/unit/kalibro/client/module_result_client_test.rb
@@ -26,5 +26,4 @@ class ModuleResultClientTest < ActiveSupport::TestCase
     @port.expects(:request).with(:get_result_history, request_body).returns(response)
     assert_equal [@result], @client.result_history('Qt-Calculator', 'main')
   end
-
-end
\ No newline at end of file
+end
diff --git a/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb b/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
index 0705616..5cde95c 100644
--- a/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
+++ b/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
@@ -46,17 +46,27 @@ class ProjectContentTest < ActiveSupport::TestCase
   should 'get module result from service' do
     module_name = 'My module name'
     module_result = mock
-    Kalibro::Client::ModuleResultClient.expects(:module_result).with(@content, module_name).
+	module_result_client = mock
+	project_result = mock
+	@content.expects(:project_result).returns(project_result)
+    project_result.expects(:date).returns('12/04/2012')
+	@content.expects(:module_result_client).returns(module_result_client)
+    module_result_client.expects(:module_result).with(@project.name, module_name, '12/04/2012').
       returns(module_result)
     assert_equal module_result, @content.module_result(module_name)
   end
 
-  should 'get module result root when project name is give' do
+  should 'get module result root when nil is given' do
     module_result = mock
-    Kalibro::Client::ModuleResultClient.expects(:module_result).with(@content, @project.name).
+	module_result_client = mock
+	project_result = mock
+	@content.expects(:project_result).returns(project_result)
+    project_result.expects(:date).returns('12/04/2012')
+	@content.expects(:module_result_client).returns(module_result_client)
+    module_result_client.expects(:module_result).with(@project.name, @project.name, '12/04/2012').
       returns(module_result)
-    assert_equal module_result, @content.module_result(@project.name)
-  end  
+    assert_equal module_result, @content.module_result(nil)
+  end
 
   should 'send project to service after saving' do
     @content.expects :send_project_to_service
--
libgit2 0.21.2