Commit e313c1719966ad5f5594bad0d112657989b79713
1 parent
5c62082b
Exists in
master
and in
5 other branches
Fix unit tests for mpog_software
Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Showing
3 changed files
with
41 additions
and
19 deletions
Show diff stats
test/unit/controlled_vocabulary_test.rb
... | ... | @@ -3,28 +3,39 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper' |
3 | 3 | class ControlledVocabularyTest < ActiveSupport::TestCase |
4 | 4 | |
5 | 5 | def setup |
6 | - @community = fast_create(Community) | |
6 | + @community = fast_create(Community, :identifier => 'new-software', :name => 'New Software') | |
7 | + | |
7 | 8 | @language = ProgrammingLanguage.new(:name => 'C++') |
8 | 9 | @language.save |
9 | 10 | @software_language = SoftwareLanguage.new(:version => '1', :operating_system => 'os') |
10 | 11 | @software_language.programming_language = @language |
11 | 12 | @software_language.save |
13 | + | |
12 | 14 | @database = DatabaseDescription.new(:name => 'Oracle') |
13 | 15 | @database.save |
14 | 16 | @software_database = SoftwareDatabase.new(:version => '2', :operating_system => 'os2') |
15 | 17 | @software_database.database_description = @database |
16 | 18 | @software_database.save |
17 | - @software_info = SoftwareInfo.new(:community_id=>1, :acronym => "SFTW", :e_mag => true,:icp_brasil => true,:intern => true,:e_ping => true, | |
18 | - :e_arq => true,:name => true,:operating_platform => true,:objectives => "",:features => "") | |
19 | - @controlled_language = ControlledVocabulary.new() | |
20 | - @controlled_vocabulary = ControlledVocabulary.new(:administration => true, :agriculture => true, :business_and_services => true, :communication => true, | |
21 | - :culture => true, :national_defense => true, :economy_and_finances => true, :education => true, | |
22 | - :energy => true, :sports => false , :habitation => true, :industry => true, :environment => true, | |
23 | - :research_and_development => true, :social_security => false , :social_protection => true, | |
24 | - :international_relations => true, :sanitation => true, :health => false, | |
25 | - :security_public_order => true, :work => true, :transportation => true, :urbanism => true) | |
19 | + | |
20 | + @operating_system_name = OperatingSystemName.new(:name => 'Debian') | |
21 | + @operating_system_name.save | |
22 | + @operating_system = OperatingSystem.new(:version => '1.0') | |
23 | + @operating_system.operating_system_name = @operating_system_name | |
24 | + @operating_system.save | |
25 | + | |
26 | + @software_info = SoftwareInfo.new(:acronym => "SFTW", :e_mag => true,:icp_brasil => true,:intern => true,:e_ping => true, | |
27 | + :e_arq => true, :operating_platform => true, :objectives => "", :features => "") | |
26 | 28 | @software_info.software_languages << @software_language |
27 | 29 | @software_info.software_databases << @software_database |
30 | + @software_info.operating_systems << @operating_system | |
31 | + | |
32 | + @controlled_language = ControlledVocabulary.new() | |
33 | + @controlled_vocabulary = ControlledVocabulary.new(:administration => true, :agriculture => true, :business_and_services => true, :communication => true, | |
34 | + :culture => true, :national_defense => true, :economy_and_finances => true, :education => true, | |
35 | + :energy => true, :sports => false , :habitation => true, :industry => true, :environment => true, | |
36 | + :research_and_development => true, :social_security => false , :social_protection => true, | |
37 | + :international_relations => true, :sanitation => true, :health => false, | |
38 | + :security_public_order => true, :work => true, :transportation => true, :urbanism => true) | |
28 | 39 | @software_info.controlled_vocabulary = @controlled_vocabulary |
29 | 40 | end |
30 | 41 | |
... | ... | @@ -41,7 +52,8 @@ class ControlledVocabularyTest < ActiveSupport::TestCase |
41 | 52 | should "return a valid value from database" do |
42 | 53 | @software_info.save |
43 | 54 | @controlled_vocabulary.save |
44 | - controlled_vocabulary = ControlledVocabulary.find(SoftwareInfo.last.controlled_vocabulary) | |
55 | + software_info = SoftwareInfo.find(@software_info.id) | |
56 | + controlled_vocabulary = ControlledVocabulary.find(software_info.controlled_vocabulary) | |
45 | 57 | assert_equal true, controlled_vocabulary.education |
46 | 58 | end |
47 | 59 | end | ... | ... |
test/unit/software_info_validation_test.rb
... | ... | @@ -3,7 +3,8 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper' |
3 | 3 | class SoftwareInfoValidationTest < ActiveSupport::TestCase |
4 | 4 | |
5 | 5 | def setup |
6 | - @community = fast_create(Community) | |
6 | + @community = fast_create(Community, :identifier => 'new-software', :name => 'New Software') | |
7 | + | |
7 | 8 | @language = ProgrammingLanguage.new(:name => 'C++') |
8 | 9 | @language.save |
9 | 10 | @software_language = SoftwareLanguage.new(:version => '1', :operating_system => 'os') |
... | ... | @@ -15,10 +16,19 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase |
15 | 16 | @software_database = SoftwareDatabase.new(:version => '2', :operating_system => 'os2') |
16 | 17 | @software_database.database_description = @database |
17 | 18 | @software_database.save |
18 | - @software_info = SoftwareInfo.new(:community_id=>1, :acronym => "SFTW", :e_mag => true,:icp_brasil => true,:intern => true,:e_ping => true, | |
19 | - :e_arq => true,:name => true,:operating_platform => true,:objectives => "",:features => "") | |
20 | - @software_info.software_languages << @software_language | |
21 | - @software_info.software_databases << @software_database | |
19 | + | |
20 | + @operating_system_name = OperatingSystemName.new(:name => 'Debian') | |
21 | + @operating_system_name.save | |
22 | + @operating_system = OperatingSystem.new(:version => '1.0') | |
23 | + @operating_system.operating_system_name = @operating_system_name | |
24 | + @operating_system.save | |
25 | + | |
26 | + @software_info = SoftwareInfo.new(:acronym => "SFTW", :e_mag => true,:icp_brasil => true,:intern => true,:e_ping => true, | |
27 | + :e_arq => true, :operating_platform => true, :objectives => "", :features => "") | |
28 | + @software_info.software_languages << @software_language | |
29 | + @software_info.software_databases << @software_database | |
30 | + @software_info.operating_systems << @operating_system | |
31 | + | |
22 | 32 | end |
23 | 33 | |
24 | 34 | should 'Save SoftwareInfo if all fields are filled' do | ... | ... |
test/unit/software_language_validation.rb
... | ... | @@ -44,13 +44,13 @@ class SoftwareLanguageValidationTest < ActiveSupport::TestCase |
44 | 44 | def create_software_info |
45 | 45 | software_info = SoftwareInfo.new |
46 | 46 | software_info.community_id = fast_create(Community).id |
47 | + software_info.community.name = 'Noosfero' | |
47 | 48 | software_info.e_mag = true |
48 | 49 | software_info.icp_brasil = true |
49 | 50 | software_info.intern = true |
50 | 51 | software_info.e_ping = true |
51 | 52 | software_info.e_arq = true |
52 | - software_info.name = true | |
53 | - software_info.operating_platform = true | |
53 | + software_info.operating_platform = 'GNU/Linux' | |
54 | 54 | software_info |
55 | 55 | end |
56 | 56 | |
... | ... | @@ -60,4 +60,4 @@ class SoftwareLanguageValidationTest < ActiveSupport::TestCase |
60 | 60 | ProgrammingLanguage.create(:name=>"Ruby") |
61 | 61 | ProgrammingLanguage.create(:name=>"Python") |
62 | 62 | end |
63 | -end | |
64 | 63 | \ No newline at end of file |
64 | +end | ... | ... |