[Mezuro] Fixed fixtures and added new test for new project model

João M. M. da Silva + Alessandro Palmeira · Paulo Meireles
1 parent 59b3e458
Showing 5 changed files with 43 additions and 36 deletions Show diff stats
plugins/mezuro/lib/kalibro/project.rb
plugins/mezuro/test/fixtures/project_fixtures.rb
plugins/mezuro/test/fixtures/repository_fixtures.rb
plugins/mezuro/test/unit/kalibro/project_test.rb
plugins/mezuro/test/unit/kalibro/repository_test.rb
@@ -7,8 +7,12 @@ class Kalibro::Project &lt; Kalibro::Model
   end
   def self.find_by_name(project_name)
-    attributes = request(:get_project, :project_name => project_name)[:project]
-    new attributes
+    begin
+      attributes = request(:get_project, :project_name => project_name)[:project]
+      new attributes
+    rescue Exception => error
+      nil
+    end
   end
   def self.destroy(project_name)
@@ -29,7 +33,12 @@ class Kalibro::Project &lt; Kalibro::Model
   end
   def save
-    self.class.request(:save_project, {:project => to_hash})
+    begin
+      self.class.request(:save_project, {:project => to_hash})
+      true
+    rescue Exception => error
+      false
+    end
   end
   def repository=(value)
@@ -3,20 +3,18 @@ require File.dirname(__FILE__) + &#39;/repository_fixtures&#39;
 class ProjectFixtures
   def self.qt_calculator
-    project = Kalibro::Project.new
-    project.name = 'Qt-Calculator'
-    project.license = 'GPL'
-    project.description = 'Calculator for Qt'
-    project.repository = RepositoryFixtures.qt_calculator
-    project.configuration_name = 'Kalibro for Java'
-    project.state = 'READY'
-    project
+    Kalibro::Project.new qt_calculator_hash
   end
   def self.qt_calculator_hash
-    {:name => 'Qt-Calculator', :license => 'GPL', :description => 'Calculator for Qt',
-        :repository => RepositoryFixtures.qt_calculator_hash,
-        :configuration_name => 'Kalibro for Java', :state => 'READY'}
+    {
+      :name => 'Qt-Calculator',
+      :license => 'GPL',
+      :description => 'Calculator for Qt',
+      :repository => RepositoryFixtures.qt_calculator_hash,
+      :configuration_name => 'Kalibro for Java',
+      :state => 'READY'
+    }
   end
 end
 class RepositoryFixtures
   def self.qt_calculator
-    repository = Kalibro::Repository.new
-    repository.type = 'SUBVERSION'
-    repository.address = 'https://qt-calculator.svn.sourceforge.net/svnroot/qt-calculator'
-    repository
+    Kalibro::Repository.new qt_calculator_hash
   end
   def self.qt_calculator_hash
@@ -12,30 +12,38 @@ class ProjectTest &lt; ActiveSupport::TestCase
   should 'get project by name' do
     request_body = {:project_name => @project.name}
     response_hash = {:project => @hash}
+    Kalibro::Project.expects(:new).with(@hash).returns(@project)
     Kalibro::Project.expects(:request).with(:get_project, request_body).returns(response_hash)
     assert_equal @project, Kalibro::Project.find_by_name(@project.name)
   end
-=begin 
   should 'raise error when project doesnt exist' do
     request_body = {:project_name => @project.name}
-    @port.expects(:request).with(:get_project, request_body).raises(Exception.new("(S:Server) There is no project named " + @project.name))
-    assert_nil Kalibro::Client::ProjectClient.project(@project.name)
+    Kalibro::Project.expects(:request).with(:get_project, request_body).raises(Exception.new("(S:Server) There is no project named " + @project.name))
+    assert_nil Kalibro::Project.find_by_name(@project.name)
+  end
+
+  should 'return true when project is saved successfully' do
+    Kalibro::Project.expects(:request).with(:save_project, {:project => @project.to_hash})
+    assert @project.save
   end
-  should 'save project' do
-    create_project_content_mock
-    @project.state = nil
-    @port.expects(:request).with(:save_project, {:project => @project.to_hash})
-    Kalibro::Client::ProjectClient.save(@project_content)
+  should 'return false when project is not saved successfully' do
+    Kalibro::Project.expects(:request).with(:save_project, {:project => @project.to_hash}).raises(Exception.new)
+    assert !(@project.save)
   end
   should 'remove existent project from service' do
-    @port.expects(:request).with(:get_project_names).returns({:project_name => @project.name})
-    @port.expects(:request).with(:remove_project, {:project_name => @project.name})
-    Kalibro::Client::ProjectClient.remove(@project.name)
+    Kalibro::Project.expects(:request).with(:remove_project, {:project_name => @project.name})
+    Kalibro::Project.destroy(@project.name)
   end
+  should 'raise error when try to remove inexistent project from service' do
+    Kalibro::Project.expects(:request).with(:remove_project, {:project_name => @project.name}).raises(Exception.new)
+    assert_raise Exception do Kalibro::Project.destroy(@project.name) end
+  end
+  
+=begin 
   should 'not try to remove inexistent project from service' do
     @port.expects(:request).with(:get_project_names).returns({:project_name => 'Different project'})
     @port.expects(:request).with(:remove_project, {:project_name => @project.name}).never
@@ -9,13 +9,8 @@ class RepositoryTest &lt; ActiveSupport::TestCase
     @repository = RepositoryFixtures.qt_calculator
   end
-  #TODO como pegar o nome de TODAS as variáveis, mesmo as não setadas???
-  should 'create repository from hash' do
-    repository = Kalibro::Repository.new(@hash)
-    attributes = repository.instance_variable_names.map { |variable| variable.to_s.sub(/@/, '') }
-    attributes.each { |field| assert_equal(@repository.send("#{field}"), repository.send("#{field}")) }
-    attributes = @repository.instance_variable_names.map { |variable| variable.to_s.sub(/@/, '') }
-    attributes.each { |field| assert_equal(@repository.send("#{field}"), repository.send("#{field}")) }
+  should 'new repository from hash' do
+    assert_equal @repository.type, Kalibro::Repository.new(@hash).type
   end
   should 'convert repository to hash' do