Corrections on all unit tests

- Duplicated integration test was removed(institution_helper_test.rb) (correcoes_aderencia) Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>

Corrections on all unit tests
- Duplicated integration test was removed(institution_helper_test.rb) (correcoes_aderencia) Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Fabio Teixeira · Gabriela Navarro
1 parent 55dbc944
Showing 10 changed files with 117 additions and 53 deletions Show diff stats
lib/mpog_software_plugin.rb
test/functional/search_controller_test.rb
test/unit/governmental_power_test.rb
test/unit/institution_helper_test.rb
test/unit/juridical_nature_test.rb
test/unit/mpog_software_plugin_test.rb
test/unit/mpog_user_test.rb
test/unit/mpog_validation_test.rb
test/unit/software_info_validation_test.rb
test/unit/software_language_validation.rb
@@ -266,13 +266,12 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
  
   protected
  
-
- def create_url_to_edit_profile person
+  def create_url_to_edit_profile person
     new_url = person.public_profile_url
     new_url[:controller] = 'profile_editor'
     new_url[:action] = 'edit'
     new_url
- end
+  end
  
   def profile_required_list
     required_list = ["cell_phone","contact_phone","institutions","comercial_phone","country","city","state","organization_website","area_interest","image"]
@@ -85,7 +85,7 @@ class SearchControllerTest &lt; ActionController::TestCase
   should "search for software by identifier" do
     software = create_software("beautiful os")
  
-    params = {"type"=>"Software", "query"=>"", "name"=>"beautiful-os", "database_description"=>{"id"=>""}, "programming_language"=>{"id"=>""}, "operating_system"=>{"id"=>""}, "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"", "commit"=>"Search"}
+    params = {"type"=>"Software", "query"=>"", "name"=>"beautiful-os", "database_description"=>{"id"=>""}, "programming_language"=>{"id"=>""}, "operating_system"=>{"id"=>""}, "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"", "commit"=>"Search"}
     get :communities, params
  
     assert_includes assigns(:searches)[:communities][:results], software.community
@@ -94,7 +94,7 @@ class SearchControllerTest &lt; ActionController::TestCase
   should "search for software by name" do
     software = create_software("beautiful")
  
-    params = {"type"=>"Software", "query"=>"", "name"=>"beautiful", "database_description"=>{"id"=>""}, "programming_language"=>{"id"=>""}, "operating_system"=>{"id"=>""}, "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"", "commit"=>"Search"}
+    params = {"type"=>"Software", "query"=>"", "name"=>"beautiful", "database_description"=>{"id"=>""}, "programming_language"=>{"id"=>""}, "operating_system"=>{"id"=>""}, "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"", "commit"=>"Search"}
     get :communities, params
  
     assert_includes assigns(:searches)[:communities][:results], software.community
@@ -108,7 +108,7 @@ class SearchControllerTest &lt; ActionController::TestCase
  
     params = {"type"=>"Software", "query"=>"", "name"=>"",
           "database_description"=>{"id"=>SoftwareDatabase.last.database_description.id},
-      "programming_language"=>{"id"=>""}, "operating_system"=>{"id"=>""}, "controlled_vocabulary"=>"",
+      "programming_language"=>{"id"=>""}, "operating_system"=>{"id"=>""}, "software_categories"=>"",
       "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
       "commit"=>"Search"}
     get :communities, params
@@ -124,7 +124,7 @@ class SearchControllerTest &lt; ActionController::TestCase
  
     params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
       "programming_language"=>{"id"=>SoftwareLanguage.last.programming_language.id},
-      "operating_system"=>{"id"=>""}, "controlled_vocabulary"=>"",
+      "operating_system"=>{"id"=>""}, "software_categories"=>"",
       "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
       "commit"=>"Search"}
     get :communities, params
@@ -141,7 +141,7 @@ class SearchControllerTest &lt; ActionController::TestCase
     params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
       "programming_language"=>{"id"=>""},
       "operating_system"=>{"id"=>OperatingSystem.last.id},
-      "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
+      "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
       "commit"=>"Search"}
     get :communities, params
  
@@ -150,13 +150,13 @@ class SearchControllerTest &lt; ActionController::TestCase
  
   should "search for software by controlled vocabulary" do
     software = create_software("beautiful")
-    software.controlled_vocabulary.habitation = true
-    software.controlled_vocabulary.save!
+    software.software_categories.habitation = true
+    software.software_categories.save!
  
     params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
       "programming_language"=>{"id"=>""},
       "operating_system"=>{"id"=>""},
-      "controlled_vocabulary"=>"habitation", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
+      "software_categories"=>"habitation", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
       "commit"=>"Search"}
     get :communities, params
  
@@ -171,7 +171,7 @@ class SearchControllerTest &lt; ActionController::TestCase
     params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
       "programming_language"=>{"id"=>""},
       "operating_system"=>{"id"=>""},
-      "controlled_vocabulary"=>"", "license_info"=>{"id"=>LicenseInfo.last.id}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
+      "software_categories"=>"", "license_info"=>{"id"=>LicenseInfo.last.id}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
       "commit"=>"Search"}
     get :communities, params
  
@@ -187,7 +187,7 @@ class SearchControllerTest &lt; ActionController::TestCase
     params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
       "programming_language"=>{"id"=>""},
       "operating_system"=>{"id"=>""},
-      "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"true", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
+      "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"true", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
       "commit"=>"Search"}
     get :communities, params
  
@@ -203,7 +203,7 @@ class SearchControllerTest &lt; ActionController::TestCase
     params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
       "programming_language"=>{"id"=>""},
       "operating_system"=>{"id"=>""},
-      "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"true", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
+      "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"true", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
       "commit"=>"Search"}
     get :communities, params
  
@@ -219,7 +219,7 @@ class SearchControllerTest &lt; ActionController::TestCase
     params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
       "programming_language"=>{"id"=>""},
       "operating_system"=>{"id"=>""},
-      "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"true", "e_arq"=>"", "internacionalizable"=>"",
+      "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"true", "e_arq"=>"", "internacionalizable"=>"",
       "commit"=>"Search"}
     get :communities, params
  
@@ -234,7 +234,7 @@ class SearchControllerTest &lt; ActionController::TestCase
     params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
       "programming_language"=>{"id"=>""},
       "operating_system"=>{"id"=>""},
-      "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"true", "internacionalizable"=>"",
+      "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"true", "internacionalizable"=>"",
       "commit"=>"Search"}
     get :communities, params
  
@@ -249,7 +249,7 @@ class SearchControllerTest &lt; ActionController::TestCase
     params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
       "programming_language"=>{"id"=>""},
       "operating_system"=>{"id"=>""},
-      "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"true",
+      "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"true",
       "commit"=>"Search"}
     get :communities, params
  
@@ -265,7 +265,7 @@ class SearchControllerTest &lt; ActionController::TestCase
     params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
       "programming_language"=>{"id"=>""},
       "operating_system"=>{"id"=>""},
-      "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"true", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"true", "internacionalizable"=>"",
+      "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"true", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"true", "internacionalizable"=>"",
       "commit"=>"Search"}
     get :communities, params
  
@@ -295,16 +295,16 @@ class SearchControllerTest &lt; ActionController::TestCase
     software_info.license_info = LicenseInfo.last
  
  
-    cv = ControlledVocabulary.new()
-    cv.attributes.each do |key|
+    sc = SoftwareCategories.new()
+    sc.attributes.each do |key|
       if(key.first == 'id' || key.first == 'software_info_id')
         next
       end
-      cv.update_attribute(key.first, false)
+      sc.update_attribute(key.first, false)
     end
-    cv.save!
+    sc.save!
  
-    software_info.controlled_vocabulary = cv
+    software_info.software_categories = sc
  
     software_info.save!
  
@@ -35,6 +35,11 @@ class GovernmentalPowerTest &lt; ActiveSupport::TestCase
     institution.type = type
     institution.cnpj = cnpj
  
+    institution.community = Community.create(:name => "Simple Public Institution")
+    institution.community.country = "BR"
+    institution.community.state = "DF"
+    institution.community.city = "Gama"
+
     if type == "PublicInstitution"
       institution.governmental_power = GovernmentalPower.first
       institution.governmental_sphere = GovernmentalSphere.first
@@ -1,26 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-
-class InstitutionHelperTest < ActiveSupport::TestCase
-
-  should "populate public institutions with data from SIORG" do
-    Institution.destroy_all
-
-    InstitutionHelper.mass_update
-
-    assert Institution.count != 0
-  end
-
-  should "receive json data from SIORG"  do
-    data = InstitutionHelper.get_json(2, 1)
-
-    assert data["unidades"].count != 0
-  end
-
-  should "update Institution's date modification when edit the Institution" do
-    institution = Institution.new
-    InstitutionHelper.register_institution_modification institution
-    date = Time.now.day.to_s + "/" + Time.now.month.to_s + "/" + Time.now.year.to_s
-
-    assert_equal date, institution.date_modification
-  end
-end
@@ -18,8 +18,26 @@ class JuridicalNatureTest &lt; ActiveSupport::TestCase
     juridical_nature = JuridicalNature.create(:name => "Autarquia")
     create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", juridical_nature, @govPower, @govSphere)
     create_public_institution("Tribunal Regional da Uniao", "TRU", "BR", "DF", "Brasilia", juridical_nature, @govPower, @govSphere)
-
     assert juridical_nature.public_institutions.count == PublicInstitution.count
   end
+  
+  private
+
+  def build_institution name, type="PublicInstitution", cnpj=nil
+    institution = Institution::new
+    institution.name = name
+    institution.type = type
+    institution.cnpj = cnpj
+
+    institution.community = Community.create(:name => "Simple Public Institution")
+    institution.community.country = "BR"
+    institution.community.state = "DF"
+    institution.community.city = "Gama"
+
+    if type == "PublicInstitution"
+      institution.juridical_nature = JuridicalNature.first
+    end
+
+  end
  
 end
@@ -33,4 +33,18 @@ class MpogSoftwarePluginTest &lt; ActiveSupport::TestCase
  
     assert_equal(test_percentege, plugin_percentege)
 	end
+
+  private
+
+  def create_user
+    user = User.new
+    user.login = "login"
+    user.email = "user@email.com"
+    user.password = "123456"
+    user.password_confirmation = "123456"
+    user.secondary_email = "user@secondary_email.com"
+    user.save
+    user.person.save
+    user
+  end
 end
@@ -86,10 +86,13 @@ class MpogSoftwarePluginUserTest &lt; ActiveSupport::TestCase
  
     user.email = "test@gov.br"
  
-    user.institution = nil
+    user.institutions = []
     assert !user.save
  
-    user.institution = Institution::new(:name=>"Test Other institution")
+    institution = build_institution "Test simple institution"
+    institution.save
+
+    user.institutions << institution
     assert user.save
   end
  
@@ -104,4 +107,22 @@ class MpogSoftwarePluginUserTest &lt; ActiveSupport::TestCase
  
     return user
   end
+
+  def build_institution name, type="PublicInstitution", cnpj=nil
+    institution = Institution::new
+    institution.name = name
+    institution.type = type
+    institution.cnpj = cnpj
+
+    institution.community = Community.create(:name => "Simple Public Institution")
+    institution.community.country = "BR"
+    institution.community.state = "DF"
+    institution.community.city = "Gama"
+
+    if type == "PublicInstitution"
+      institution.juridical_nature = JuridicalNature.first
+    end
+
+    institution
+  end
 end
@@ -6,8 +6,12 @@ class MpogSoftwarePluginValidationTest &lt; ActiveSupport::TestCase
  
   def setup
     @plugin = MpogSoftwarePlugin.new
-    @user = create_user 'login', 'test@email.com', '1234', '1234', 'test2@email.com'
  
+    institution = build_institution("Test institution")
+    institution.save
+
+    @user = fast_create(User)
+    @user.institutions << institution
   end
  
   def teardown
@@ -25,4 +29,24 @@ class MpogSoftwarePluginValidationTest &lt; ActiveSupport::TestCase
     @user.email = "test_email@net.br"
     assert @user.save
   end
+
+  private
+
+  def build_institution name, type="PublicInstitution", cnpj=nil
+    institution = Institution::new
+    institution.name = name
+    institution.type = type
+    institution.cnpj = cnpj
+
+    institution.community = Community.create(:name => "Simple Public Institution")
+    institution.community.country = "BR"
+    institution.community.state = "DF"
+    institution.community.city = "Gama"
+
+    if type == "PublicInstitution"
+      institution.juridical_nature = JuridicalNature.first
+    end
+
+    institution
+  end
 end
@@ -31,6 +31,12 @@ class SoftwareInfoValidationTest &lt; ActiveSupport::TestCase
  
     @software_info.features = "Do a lot of things"
     @software_info.objectives = "All tests should pass !"
+
+    software_categories = SoftwareCategories::new
+    software_categories.administration = true
+    software_categories.save
+
+    @software_info.software_categories = software_categories
   end
  
   should 'Save SoftwareInfo if all fields are filled' do
@@ -49,6 +55,7 @@ class SoftwareInfoValidationTest &lt; ActiveSupport::TestCase
  
   should "Save SoftwareInfo if acronym is blank" do
     @software_info.acronym = ""
+
     assert_equal true, @software_info.save
   end
  
@@ -63,6 +63,8 @@ class SoftwareLanguageValidationTest &lt; ActiveSupport::TestCase
     software_info.e_ping = true
     software_info.e_arq = true
     software_info.operating_platform = 'GNU/Linux' 
+    software_info.features = "Do a lot of things"
+    software_info.objectives = "All tests should pass !"
     software_info
   end
...	...	@@ -266,13 +266,12 @@ class MpogSoftwarePlugin < Noosfero::Plugin
266	266
267	267	protected
268	268
269		-
270		- def create_url_to_edit_profile person
	269	+ def create_url_to_edit_profile person
271	270	new_url = person.public_profile_url
272	271	new_url[:controller] = 'profile_editor'
273	272	new_url[:action] = 'edit'
274	273	new_url
275		- end
	274	+ end
276	275
277	276	def profile_required_list
278	277	required_list = ["cell_phone","contact_phone","institutions","comercial_phone","country","city","state","organization_website","area_interest","image"]
...	...
...	...	@@ -85,7 +85,7 @@ class SearchControllerTest < ActionController::TestCase
85	85	should "search for software by identifier" do
86	86	software = create_software("beautiful os")
87	87
88		- params = {"type"=>"Software", "query"=>"", "name"=>"beautiful-os", "database_description"=>{"id"=>""}, "programming_language"=>{"id"=>""}, "operating_system"=>{"id"=>""}, "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"", "commit"=>"Search"}
	88	+ params = {"type"=>"Software", "query"=>"", "name"=>"beautiful-os", "database_description"=>{"id"=>""}, "programming_language"=>{"id"=>""}, "operating_system"=>{"id"=>""}, "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"", "commit"=>"Search"}
89	89	get :communities, params
90	90
91	91	assert_includes assigns(:searches)[:communities][:results], software.community
...	...	@@ -94,7 +94,7 @@ class SearchControllerTest < ActionController::TestCase
94	94	should "search for software by name" do
95	95	software = create_software("beautiful")
96	96
97		- params = {"type"=>"Software", "query"=>"", "name"=>"beautiful", "database_description"=>{"id"=>""}, "programming_language"=>{"id"=>""}, "operating_system"=>{"id"=>""}, "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"", "commit"=>"Search"}
	97	+ params = {"type"=>"Software", "query"=>"", "name"=>"beautiful", "database_description"=>{"id"=>""}, "programming_language"=>{"id"=>""}, "operating_system"=>{"id"=>""}, "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"", "commit"=>"Search"}
98	98	get :communities, params
99	99
100	100	assert_includes assigns(:searches)[:communities][:results], software.community
...	...	@@ -108,7 +108,7 @@ class SearchControllerTest < ActionController::TestCase
108	108
109	109	params = {"type"=>"Software", "query"=>"", "name"=>"",
110	110	"database_description"=>{"id"=>SoftwareDatabase.last.database_description.id},
111		- "programming_language"=>{"id"=>""}, "operating_system"=>{"id"=>""}, "controlled_vocabulary"=>"",
	111	+ "programming_language"=>{"id"=>""}, "operating_system"=>{"id"=>""}, "software_categories"=>"",
112	112	"license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
113	113	"commit"=>"Search"}
114	114	get :communities, params
...	...	@@ -124,7 +124,7 @@ class SearchControllerTest < ActionController::TestCase
124	124
125	125	params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
126	126	"programming_language"=>{"id"=>SoftwareLanguage.last.programming_language.id},
127		- "operating_system"=>{"id"=>""}, "controlled_vocabulary"=>"",
	127	+ "operating_system"=>{"id"=>""}, "software_categories"=>"",
128	128	"license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
129	129	"commit"=>"Search"}
130	130	get :communities, params
...	...	@@ -141,7 +141,7 @@ class SearchControllerTest < ActionController::TestCase
141	141	params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
142	142	"programming_language"=>{"id"=>""},
143	143	"operating_system"=>{"id"=>OperatingSystem.last.id},
144		- "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
	144	+ "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
145	145	"commit"=>"Search"}
146	146	get :communities, params
147	147
...	...	@@ -150,13 +150,13 @@ class SearchControllerTest < ActionController::TestCase
150	150
151	151	should "search for software by controlled vocabulary" do
152	152	software = create_software("beautiful")
153		- software.controlled_vocabulary.habitation = true
154		- software.controlled_vocabulary.save!
	153	+ software.software_categories.habitation = true
	154	+ software.software_categories.save!
155	155
156	156	params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
157	157	"programming_language"=>{"id"=>""},
158	158	"operating_system"=>{"id"=>""},
159		- "controlled_vocabulary"=>"habitation", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
	159	+ "software_categories"=>"habitation", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
160	160	"commit"=>"Search"}
161	161	get :communities, params
162	162
...	...	@@ -171,7 +171,7 @@ class SearchControllerTest < ActionController::TestCase
171	171	params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
172	172	"programming_language"=>{"id"=>""},
173	173	"operating_system"=>{"id"=>""},
174		- "controlled_vocabulary"=>"", "license_info"=>{"id"=>LicenseInfo.last.id}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
	174	+ "software_categories"=>"", "license_info"=>{"id"=>LicenseInfo.last.id}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
175	175	"commit"=>"Search"}
176	176	get :communities, params
177	177
...	...	@@ -187,7 +187,7 @@ class SearchControllerTest < ActionController::TestCase
187	187	params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
188	188	"programming_language"=>{"id"=>""},
189	189	"operating_system"=>{"id"=>""},
190		- "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"true", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
	190	+ "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"true", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
191	191	"commit"=>"Search"}
192	192	get :communities, params
193	193
...	...	@@ -203,7 +203,7 @@ class SearchControllerTest < ActionController::TestCase
203	203	params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
204	204	"programming_language"=>{"id"=>""},
205	205	"operating_system"=>{"id"=>""},
206		- "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"true", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
	206	+ "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"true", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"",
207	207	"commit"=>"Search"}
208	208	get :communities, params
209	209
...	...	@@ -219,7 +219,7 @@ class SearchControllerTest < ActionController::TestCase
219	219	params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
220	220	"programming_language"=>{"id"=>""},
221	221	"operating_system"=>{"id"=>""},
222		- "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"true", "e_arq"=>"", "internacionalizable"=>"",
	222	+ "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"true", "e_arq"=>"", "internacionalizable"=>"",
223	223	"commit"=>"Search"}
224	224	get :communities, params
225	225
...	...	@@ -234,7 +234,7 @@ class SearchControllerTest < ActionController::TestCase
234	234	params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
235	235	"programming_language"=>{"id"=>""},
236	236	"operating_system"=>{"id"=>""},
237		- "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"true", "internacionalizable"=>"",
	237	+ "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"true", "internacionalizable"=>"",
238	238	"commit"=>"Search"}
239	239	get :communities, params
240	240
...	...	@@ -249,7 +249,7 @@ class SearchControllerTest < ActionController::TestCase
249	249	params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
250	250	"programming_language"=>{"id"=>""},
251	251	"operating_system"=>{"id"=>""},
252		- "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"true",
	252	+ "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"", "internacionalizable"=>"true",
253	253	"commit"=>"Search"}
254	254	get :communities, params
255	255
...	...	@@ -265,7 +265,7 @@ class SearchControllerTest < ActionController::TestCase
265	265	params = {"type"=>"Software", "query"=>"", "name"=>"", "database_description"=>{"id"=>""},
266	266	"programming_language"=>{"id"=>""},
267	267	"operating_system"=>{"id"=>""},
268		- "controlled_vocabulary"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"true", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"true", "internacionalizable"=>"",
	268	+ "software_categories"=>"", "license_info"=>{"id"=>""}, "e_ping"=>"true", "e_mag"=>"", "icp_brasil"=>"", "e_arq"=>"true", "internacionalizable"=>"",
269	269	"commit"=>"Search"}
270	270	get :communities, params
271	271
...	...	@@ -295,16 +295,16 @@ class SearchControllerTest < ActionController::TestCase
295	295	software_info.license_info = LicenseInfo.last
296	296
297	297
298		- cv = ControlledVocabulary.new()
299		- cv.attributes.each do \|key\|
	298	+ sc = SoftwareCategories.new()
	299	+ sc.attributes.each do \|key\|
300	300	if(key.first == 'id' \|\| key.first == 'software_info_id')
301	301	next
302	302	end
303		- cv.update_attribute(key.first, false)
	303	+ sc.update_attribute(key.first, false)
304	304	end
305		- cv.save!
	305	+ sc.save!
306	306
307		- software_info.controlled_vocabulary = cv
	307	+ software_info.software_categories = sc
308	308
309	309	software_info.save!
310	310
...	...
...	...	@@ -35,6 +35,11 @@ class GovernmentalPowerTest < ActiveSupport::TestCase
35	35	institution.type = type
36	36	institution.cnpj = cnpj
37	37
	38	+ institution.community = Community.create(:name => "Simple Public Institution")
	39	+ institution.community.country = "BR"
	40	+ institution.community.state = "DF"
	41	+ institution.community.city = "Gama"
	42	+
38	43	if type == "PublicInstitution"
39	44	institution.governmental_power = GovernmentalPower.first
40	45	institution.governmental_sphere = GovernmentalSphere.first
...	...
...	...	@@ -1,26 +0,0 @@
1		-require File.dirname(__FILE__) + '/../../../../test/test_helper'
2		-
3		-class InstitutionHelperTest < ActiveSupport::TestCase
4		-
5		- should "populate public institutions with data from SIORG" do
6		- Institution.destroy_all
7		-
8		- InstitutionHelper.mass_update
9		-
10		- assert Institution.count != 0
11		- end
12		-
13		- should "receive json data from SIORG" do
14		- data = InstitutionHelper.get_json(2, 1)
15		-
16		- assert data["unidades"].count != 0
17		- end
18		-
19		- should "update Institution's date modification when edit the Institution" do
20		- institution = Institution.new
21		- InstitutionHelper.register_institution_modification institution
22		- date = Time.now.day.to_s + "/" + Time.now.month.to_s + "/" + Time.now.year.to_s
23		-
24		- assert_equal date, institution.date_modification
25		- end
26		-end
...	...	@@ -18,8 +18,26 @@ class JuridicalNatureTest < ActiveSupport::TestCase
18	18	juridical_nature = JuridicalNature.create(:name => "Autarquia")
19	19	create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", juridical_nature, @govPower, @govSphere)
20	20	create_public_institution("Tribunal Regional da Uniao", "TRU", "BR", "DF", "Brasilia", juridical_nature, @govPower, @govSphere)
21		-
22	21	assert juridical_nature.public_institutions.count == PublicInstitution.count
23	22	end
	23	+
	24	+ private
	25	+
	26	+ def build_institution name, type="PublicInstitution", cnpj=nil
	27	+ institution = Institution::new
	28	+ institution.name = name
	29	+ institution.type = type
	30	+ institution.cnpj = cnpj
	31	+
	32	+ institution.community = Community.create(:name => "Simple Public Institution")
	33	+ institution.community.country = "BR"
	34	+ institution.community.state = "DF"
	35	+ institution.community.city = "Gama"
	36	+
	37	+ if type == "PublicInstitution"
	38	+ institution.juridical_nature = JuridicalNature.first
	39	+ end
	40	+
	41	+ end
24	42
25	43	end
...	...
...	...	@@ -33,4 +33,18 @@ class MpogSoftwarePluginTest < ActiveSupport::TestCase
33	33
34	34	assert_equal(test_percentege, plugin_percentege)
35	35	end
	36	+
	37	+ private
	38	+
	39	+ def create_user
	40	+ user = User.new
	41	+ user.login = "login"
	42	+ user.email = "user@email.com"
	43	+ user.password = "123456"
	44	+ user.password_confirmation = "123456"
	45	+ user.secondary_email = "user@secondary_email.com"
	46	+ user.save
	47	+ user.person.save
	48	+ user
	49	+ end
36	50	end
...	...
...	...	@@ -86,10 +86,13 @@ class MpogSoftwarePluginUserTest < ActiveSupport::TestCase
86	86
87	87	user.email = "test@gov.br"
88	88
89		- user.institution = nil
	89	+ user.institutions = []
90	90	assert !user.save
91	91
92		- user.institution = Institution::new(:name=>"Test Other institution")
	92	+ institution = build_institution "Test simple institution"
	93	+ institution.save
	94	+
	95	+ user.institutions << institution
93	96	assert user.save
94	97	end
95	98
...	...	@@ -104,4 +107,22 @@ class MpogSoftwarePluginUserTest < ActiveSupport::TestCase
104	107
105	108	return user
106	109	end
	110	+
	111	+ def build_institution name, type="PublicInstitution", cnpj=nil
	112	+ institution = Institution::new
	113	+ institution.name = name
	114	+ institution.type = type
	115	+ institution.cnpj = cnpj
	116	+
	117	+ institution.community = Community.create(:name => "Simple Public Institution")
	118	+ institution.community.country = "BR"
	119	+ institution.community.state = "DF"
	120	+ institution.community.city = "Gama"
	121	+
	122	+ if type == "PublicInstitution"
	123	+ institution.juridical_nature = JuridicalNature.first
	124	+ end
	125	+
	126	+ institution
	127	+ end
107	128	end
...	...
...	...	@@ -6,8 +6,12 @@ class MpogSoftwarePluginValidationTest < ActiveSupport::TestCase
6	6
7	7	def setup
8	8	@plugin = MpogSoftwarePlugin.new
9		- @user = create_user 'login', 'test@email.com', '1234', '1234', 'test2@email.com'
10	9
	10	+ institution = build_institution("Test institution")
	11	+ institution.save
	12	+
	13	+ @user = fast_create(User)
	14	+ @user.institutions << institution
11	15	end
12	16
13	17	def teardown
...	...	@@ -25,4 +29,24 @@ class MpogSoftwarePluginValidationTest < ActiveSupport::TestCase
25	29	@user.email = "test_email@net.br"
26	30	assert @user.save
27	31	end
	32	+
	33	+ private
	34	+
	35	+ def build_institution name, type="PublicInstitution", cnpj=nil
	36	+ institution = Institution::new
	37	+ institution.name = name
	38	+ institution.type = type
	39	+ institution.cnpj = cnpj
	40	+
	41	+ institution.community = Community.create(:name => "Simple Public Institution")
	42	+ institution.community.country = "BR"
	43	+ institution.community.state = "DF"
	44	+ institution.community.city = "Gama"
	45	+
	46	+ if type == "PublicInstitution"
	47	+ institution.juridical_nature = JuridicalNature.first
	48	+ end
	49	+
	50	+ institution
	51	+ end
28	52	end
...	...
...	...	@@ -31,6 +31,12 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase
31	31
32	32	@software_info.features = "Do a lot of things"
33	33	@software_info.objectives = "All tests should pass !"
	34	+
	35	+ software_categories = SoftwareCategories::new
	36	+ software_categories.administration = true
	37	+ software_categories.save
	38	+
	39	+ @software_info.software_categories = software_categories
34	40	end
35	41
36	42	should 'Save SoftwareInfo if all fields are filled' do
...	...	@@ -49,6 +55,7 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase
49	55
50	56	should "Save SoftwareInfo if acronym is blank" do
51	57	@software_info.acronym = ""
	58	+
52	59	assert_equal true, @software_info.save
53	60	end
54	61
...	...
...	...	@@ -63,6 +63,8 @@ class SoftwareLanguageValidationTest < ActiveSupport::TestCase
63	63	software_info.e_ping = true
64	64	software_info.e_arq = true
65	65	software_info.operating_platform = 'GNU/Linux'
	66	+ software_info.features = "Do a lot of things"
	67	+ software_info.objectives = "All tests should pass !"
66	68	software_info
67	69	end
68	70
...	...