Fix tests for the operating_system removal of database and language

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

Fix tests for the operating_system removal of database and language
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Gabriela Navarro · David Silva
1 parent 9d0e6d5d
Showing 7 changed files with 11 additions and 85 deletions Show diff stats
test/unit/database_helper_test.rb
test/unit/database_validation_test.rb
test/unit/library_helper_test.rb
test/unit/software_database_test.rb
test/unit/software_info_validation_test.rb
test/unit/software_language_helper_test.rb
test/unit/software_language_validation.rb
@@ -9,8 +9,8 @@ class DatabaseHelperTest &lt; 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 &lt; 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
@@ -7,7 +7,6 @@ class DatabaseValidationTest &lt; 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 &lt; 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 &lt; 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
@@ -27,7 +27,7 @@ class LibraryHelperTest &lt; 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
  
@@ -4,8 +4,7 @@ class SoftwareDatabaseTest &lt; 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 &lt; 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
@@ -12,8 +12,7 @@ class SoftwareInfoValidationTest &lt; 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 &lt; 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
@@ -9,9 +9,9 @@ class SoftwareLanguageHelperTest &lt; 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 &lt; 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
@@ -35,19 +35,6 @@ class SoftwareLanguageValidationTest &lt; 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 &lt; 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
...	...	@@ -9,8 +9,8 @@ class DatabaseHelperTest < ActiveSupport::TestCase
9	9	dd2 = DatabaseDescription.create!(:name => "MySQL")
10	10
11	11	@database_objects = [
12		- {:database_description_id => dd1.id.to_s ,:version => "2.0", :operating_system => "debian"},
13		- {:database_description_id => dd2.id.to_s ,:version => "2.1", :operating_system => "debian"}
	12	+ {:database_description_id => dd1.id.to_s ,:version => "2.0"},
	13	+ {:database_description_id => dd2.id.to_s ,:version => "2.1"}
14	14	]
15	15	end
16	16
...	...	@@ -47,28 +47,10 @@ class DatabaseHelperTest < ActiveSupport::TestCase
47	47	assert_equal false,DatabaseHelper.valid_list_database?(list_compare)
48	48	end
49	49
50		- should "return a html text with operating system equals to linux" do
51		- databases = []
52		-
53		- database_description = DatabaseDescription.new
54		- database_description.name = "teste"
55		-
56		- software_database = SoftwareDatabase.new
57		- software_database.version = 2
58		- software_database.operating_system = "linux"
59		- software_database.database_description = database_description
60		-
61		- databases << software_database
62		- db_tables = DatabaseHelper.database_as_tables(databases)
63		-
64		- assert_not_nil db_tables.first.call.index("linux")
65		- end
66		-
67	50	should "remove invalid tables from the list" do
68	51	@database_objects.push({
69	52	:database_description_id => "I'm not a valid id",
70		- :version => "2.5",
71		- :operating_system => "debian"
	53	+ :version => "2.5"
72	54	})
73	55
74	56	database_objects_length = @database_objects.count
...	...
...	...	@@ -7,7 +7,6 @@ class DatabaseValidationTest < ActiveSupport::TestCase
7	7	@database = SoftwareDatabase.new
8	8	@database.database_description = @database_desc
9	9	@database.version = "MYSQL"
10		- @database.operating_system = "debian"
11	10	@database
12	11	end
13	12
...	...	@@ -26,11 +25,6 @@ class DatabaseValidationTest < ActiveSupport::TestCase
26	25	assert_equal true, !@database.save
27	26	end
28	27
29		- should "not save database if operating system are empty" do
30		- @database.operating_system = " "
31		- assert_equal true, !@database.save
32		- end
33		-
34	28	should "not save database if version are empty" do
35	29	@database.version = " "
36	30	assert_equal true, !@database.save
...	...	@@ -40,9 +34,4 @@ class DatabaseValidationTest < ActiveSupport::TestCase
40	34	@database.version = "A too long version to be a valid version for database"
41	35	assert !@database.save
42	36	end
43		-
44		- should "not save database if operating system is too long" do
45		- @database.operating_system = "A too long operating system to be a valid db"
46		- assert !@database.save
47		- end
48	37	end
...	...
...	...	@@ -27,7 +27,7 @@ class LibraryHelperTest < ActiveSupport::TestCase
27	27	end
28	28
29	29	should "have same information from the list passed as parameter" do
30		- list_compare = LibraryHelper.list_libraries(@license_objects)
	30	+ list_compare = LibraryHelper.list_library(@license_objects)
31	31	assert_equal @license_objects.first[:name], list_compare.first.name
32	32	end
33	33
...	...
...	...	@@ -4,8 +4,7 @@ class SoftwareDatabaseTest < ActiveSupport::TestCase
4	4	def setup
5	5	DatabaseDescription.create!(name: "PostgreSQL")
6	6	@software_database = SoftwareDatabase.new(
7		- :version => "1.0",
8		- :operating_system => "Debian"
	7	+ :version => "1.0"
9	8	)
10	9	@software_database.database_description_id = 1
11	10	end
...	...	@@ -33,15 +32,4 @@ class SoftwareDatabaseTest < ActiveSupport::TestCase
33	32	@software_database.version = "a"*21
34	33	assert !@software_database.save, "Version must have until 20 characters"
35	34	end
36		-
37		- should "not save if operating system is empty" do
38		- @software_database.operating_system = nil
39		- assert !@software_database.save, "Operating system must be filled"
40		- end
41		-
42		- should "not save if operating system has more than 20 characters" do
43		- invalid_msg = "Operating system must have until 20 characters"
44		- @software_database.operating_system = "a"*21
45		- assert !@software_database.save, invalid_msg
46		- end
47	35	end
...	...
...	...	@@ -12,8 +12,7 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase
12	12	@language = ProgrammingLanguage.new(:name => 'C++')
13	13	@language.save
14	14	@software_language = SoftwareLanguage.new(
15		- :version => '1',
16		- :operating_system => 'os'
	15	+ :version => '1'
17	16	)
18	17	@software_language.programming_language = @language
19	18	@software_language.save
...	...	@@ -21,8 +20,7 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase
21	20	@database = DatabaseDescription.new(:name => 'Oracle')
22	21	@database.save
23	22	@software_database = SoftwareDatabase.new(
24		- :version => '2',
25		- :operating_system => 'os2'
	23	+ :version => '2'
26	24	)
27	25	@software_database.database_description = @database
28	26	@software_database.save
...	...
...	...	@@ -9,9 +9,9 @@ class SoftwareLanguageHelperTest < ActiveSupport::TestCase
9	9	pl2 = ProgrammingLanguage.create(:name => "Java")
10	10
11	11	@software_language_objects = [
12		- {:programming_language_id => pl1.id.to_s ,:version => "2.0", :operating_system => "debian"},
13		- {:programming_language_id => pl2.id.to_s ,:version => "2.1", :operating_system => "debian"},
14		- {:programming_language_id => pl1.id.to_s ,:version => "2.2", :operating_system => "debian"}]
	12	+ {:programming_language_id => pl1.id.to_s ,:version => "2.0"},
	13	+ {:programming_language_id => pl2.id.to_s ,:version => "2.1"},
	14	+ {:programming_language_id => pl1.id.to_s ,:version => "2.2"}]
15	15	@software_language_objects
16	16	end
17	17
...	...	@@ -48,27 +48,10 @@ class SoftwareLanguageHelperTest < ActiveSupport::TestCase
48	48	assert_equal false,SoftwareLanguageHelper.valid_list_language?(list_compare)
49	49	end
50	50
51		- should "return a html text with operating system equals to linux" do
52		- softwares_languages = []
53		-
54		- programming_language = ProgrammingLanguage.new
55		- programming_language.name = "teste"
56		-
57		- software_language = SoftwareLanguage.new
58		- software_language.version = 2
59		- software_language.operating_system = "linux"
60		- software_language.programming_language = programming_language
61		-
62		- softwares_languages << software_language
63		- lang_table = SoftwareLanguageHelper.language_as_tables(softwares_languages)
64		- assert_not_nil lang_table.first.call.index("linux")
65		- end
66		-
67	51	should "remove invalid tables from the list" do
68	52	@software_language_objects.push({
69	53	:programming_language_id => "I'm not a valid id",
70		- :version => "2.0",
71		- :operating_system => "debian"
	54	+ :version => "2.0"
72	55	})
73	56
74	57	software_language_objects_length = @software_language_objects.count
...	...
...	...	@@ -35,19 +35,6 @@ class SoftwareLanguageValidationTest < ActiveSupport::TestCase
35	35	assert_equal true, !@software_language.save
36	36	end
37	37
38		- should "Don't save SoftwareLanguage if operating system is too long" do
39		- operating_system = "A too long to be valid as a operating system"
40		- @software_language = create_software_language
41		- @software_language.operating_system = operating_system
42		- assert_equal true, !@software_language.save
43		- end
44		-
45		- should "Save SoftwareLanguage if operating_system is not filed" do
46		- @software_language = create_software_language
47		- @software_language.operating_system = ""
48		- assert_equal false, @software_language.save
49		- end
50		-
51	38	private
52	39
53	40	def create_software_language
...	...	@@ -55,7 +42,6 @@ class SoftwareLanguageValidationTest < ActiveSupport::TestCase
55	42	software_language.software_info = @software_info
56	43	software_language.programming_language = ProgrammingLanguage.last
57	44	software_language.version = "version"
58		- software_language.operating_system = "GNU/Linux"
59	45	software_language
60	46	end
61	47
...	...