diff --git a/test/unit/database_helper_test.rb b/test/unit/database_helper_test.rb index e141a97..56f9765 100644 --- a/test/unit/database_helper_test.rb +++ b/test/unit/database_helper_test.rb @@ -9,8 +9,8 @@ class DatabaseHelperTest < ActiveSupport::TestCase dd2 = DatabaseDescription.create!(:name => "MySQL") @database_objects = [ - {:database_description_id => dd1.id.to_s ,:version => "2.0", :operating_system => "debian"}, - {:database_description_id => dd2.id.to_s ,:version => "2.1", :operating_system => "debian"} + {:database_description_id => dd1.id.to_s ,:version => "2.0"}, + {:database_description_id => dd2.id.to_s ,:version => "2.1"} ] end @@ -47,28 +47,10 @@ class DatabaseHelperTest < ActiveSupport::TestCase assert_equal false,DatabaseHelper.valid_list_database?(list_compare) end - should "return a html text with operating system equals to linux" do - databases = [] - - database_description = DatabaseDescription.new - database_description.name = "teste" - - software_database = SoftwareDatabase.new - software_database.version = 2 - software_database.operating_system = "linux" - software_database.database_description = database_description - - databases << software_database - db_tables = DatabaseHelper.database_as_tables(databases) - - assert_not_nil db_tables.first.call.index("linux") - end - should "remove invalid tables from the list" do @database_objects.push({ :database_description_id => "I'm not a valid id", - :version => "2.5", - :operating_system => "debian" + :version => "2.5" }) database_objects_length = @database_objects.count diff --git a/test/unit/database_validation_test.rb b/test/unit/database_validation_test.rb index 61d6ba8..5466779 100644 --- a/test/unit/database_validation_test.rb +++ b/test/unit/database_validation_test.rb @@ -7,7 +7,6 @@ class DatabaseValidationTest < ActiveSupport::TestCase @database = SoftwareDatabase.new @database.database_description = @database_desc @database.version = "MYSQL" - @database.operating_system = "debian" @database end @@ -26,11 +25,6 @@ class DatabaseValidationTest < ActiveSupport::TestCase assert_equal true, !@database.save end - should "not save database if operating system are empty" do - @database.operating_system = " " - assert_equal true, !@database.save - end - should "not save database if version are empty" do @database.version = " " assert_equal true, !@database.save @@ -40,9 +34,4 @@ class DatabaseValidationTest < ActiveSupport::TestCase @database.version = "A too long version to be a valid version for database" assert !@database.save end - - should "not save database if operating system is too long" do - @database.operating_system = "A too long operating system to be a valid db" - assert !@database.save - end end diff --git a/test/unit/library_helper_test.rb b/test/unit/library_helper_test.rb index fd3298f..fc87de2 100644 --- a/test/unit/library_helper_test.rb +++ b/test/unit/library_helper_test.rb @@ -27,7 +27,7 @@ class LibraryHelperTest < ActiveSupport::TestCase end should "have same information from the list passed as parameter" do - list_compare = LibraryHelper.list_libraries(@license_objects) + list_compare = LibraryHelper.list_library(@license_objects) assert_equal @license_objects.first[:name], list_compare.first.name end diff --git a/test/unit/software_database_test.rb b/test/unit/software_database_test.rb index b6386d6..c73a359 100644 --- a/test/unit/software_database_test.rb +++ b/test/unit/software_database_test.rb @@ -4,8 +4,7 @@ class SoftwareDatabaseTest < ActiveSupport::TestCase def setup DatabaseDescription.create!(name: "PostgreSQL") @software_database = SoftwareDatabase.new( - :version => "1.0", - :operating_system => "Debian" + :version => "1.0" ) @software_database.database_description_id = 1 end @@ -33,15 +32,4 @@ class SoftwareDatabaseTest < ActiveSupport::TestCase @software_database.version = "a"*21 assert !@software_database.save, "Version must have until 20 characters" end - - should "not save if operating system is empty" do - @software_database.operating_system = nil - assert !@software_database.save, "Operating system must be filled" - end - - should "not save if operating system has more than 20 characters" do - invalid_msg = "Operating system must have until 20 characters" - @software_database.operating_system = "a"*21 - assert !@software_database.save, invalid_msg - end end diff --git a/test/unit/software_info_validation_test.rb b/test/unit/software_info_validation_test.rb index e869f8d..f0317a3 100644 --- a/test/unit/software_info_validation_test.rb +++ b/test/unit/software_info_validation_test.rb @@ -12,8 +12,7 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase @language = ProgrammingLanguage.new(:name => 'C++') @language.save @software_language = SoftwareLanguage.new( - :version => '1', - :operating_system => 'os' + :version => '1' ) @software_language.programming_language = @language @software_language.save @@ -21,8 +20,7 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase @database = DatabaseDescription.new(:name => 'Oracle') @database.save @software_database = SoftwareDatabase.new( - :version => '2', - :operating_system => 'os2' + :version => '2' ) @software_database.database_description = @database @software_database.save diff --git a/test/unit/software_language_helper_test.rb b/test/unit/software_language_helper_test.rb index 60e62a0..e70df4f 100644 --- a/test/unit/software_language_helper_test.rb +++ b/test/unit/software_language_helper_test.rb @@ -9,9 +9,9 @@ class SoftwareLanguageHelperTest < ActiveSupport::TestCase pl2 = ProgrammingLanguage.create(:name => "Java") @software_language_objects = [ - {:programming_language_id => pl1.id.to_s ,:version => "2.0", :operating_system => "debian"}, - {:programming_language_id => pl2.id.to_s ,:version => "2.1", :operating_system => "debian"}, - {:programming_language_id => pl1.id.to_s ,:version => "2.2", :operating_system => "debian"}] + {:programming_language_id => pl1.id.to_s ,:version => "2.0"}, + {:programming_language_id => pl2.id.to_s ,:version => "2.1"}, + {:programming_language_id => pl1.id.to_s ,:version => "2.2"}] @software_language_objects end @@ -48,27 +48,10 @@ class SoftwareLanguageHelperTest < ActiveSupport::TestCase assert_equal false,SoftwareLanguageHelper.valid_list_language?(list_compare) end - should "return a html text with operating system equals to linux" do - softwares_languages = [] - - programming_language = ProgrammingLanguage.new - programming_language.name = "teste" - - software_language = SoftwareLanguage.new - software_language.version = 2 - software_language.operating_system = "linux" - software_language.programming_language = programming_language - - softwares_languages << software_language - lang_table = SoftwareLanguageHelper.language_as_tables(softwares_languages) - assert_not_nil lang_table.first.call.index("linux") - end - should "remove invalid tables from the list" do @software_language_objects.push({ :programming_language_id => "I'm not a valid id", - :version => "2.0", - :operating_system => "debian" + :version => "2.0" }) software_language_objects_length = @software_language_objects.count diff --git a/test/unit/software_language_validation.rb b/test/unit/software_language_validation.rb index f2e3ddf..8a1b21d 100644 --- a/test/unit/software_language_validation.rb +++ b/test/unit/software_language_validation.rb @@ -35,19 +35,6 @@ class SoftwareLanguageValidationTest < ActiveSupport::TestCase assert_equal true, !@software_language.save end - should "Don't save SoftwareLanguage if operating system is too long" do - operating_system = "A too long to be valid as a operating system" - @software_language = create_software_language - @software_language.operating_system = operating_system - assert_equal true, !@software_language.save - end - - should "Save SoftwareLanguage if operating_system is not filed" do - @software_language = create_software_language - @software_language.operating_system = "" - assert_equal false, @software_language.save - end - private def create_software_language @@ -55,7 +42,6 @@ class SoftwareLanguageValidationTest < ActiveSupport::TestCase software_language.software_info = @software_info software_language.programming_language = ProgrammingLanguage.last software_language.version = "version" - software_language.operating_system = "GNU/Linux" software_language end -- libgit2 0.21.2