Merge pull request #79 from chennes/cleanupImpreciseAsserts

Use assertIn instead of assertTrue

Author: chennes

AddonManagerTest/gui/test_installer_gui.py

@@ -225,9 +225,9 @@ def __init__(self):
         missing = MissingDependenciesMock()
         self.installer_gui.installer.allowed_packages = set(allowed_packages)
         self.installer_gui._clean_up_optional(missing)
-        self.assertTrue("allowed_packages_1" in missing.python_optional)
-        self.assertTrue("allowed_packages_2" in missing.python_optional)
-        self.assertFalse("disallowed_package" in missing.python_optional)
+        self.assertIn("allowed_packages_1", missing.python_optional)
+        self.assertIn("allowed_packages_2", missing.python_optional)
+        self.assertNotIn("disallowed_package", missing.python_optional)
 
     def intercept_run_dependency_installer(self, addons, python_requires, python_optional):
         self.assertEqual(python_requires, ["py_req_1", "py_req_2"])
@@ -515,7 +515,7 @@ def test_install_toolbar_button_first_custom_toolbar(self):
         self.installer._install_toolbar_button()
         self.assertTrue(tbi.install_macro_to_toolbar_called)
         self.assertFalse(tbi.ask_for_toolbar_called)
-        self.assertTrue("Custom_1" in self.installer.toolbar_params.GetGroups())
+        self.assertIn("Custom_1", self.installer.toolbar_params.GetGroups())
 
     def test_install_toolbar_button_existing_custom_toolbar_1(self):
         self.skipTest("Migration from toolbar_params is not reflected in the test yet")

AddonManagerTest/gui/test_python_deps_gui.py

@@ -50,7 +50,7 @@ def test_call_pip(self, mock_run_subprocess: MagicMock):
         call_pip(["arg1", "arg2", "arg3"])
         mock_run_subprocess.assert_called()
         args = mock_run_subprocess.call_args[0][0]
-        self.assertTrue("pip" in args)
+        self.assertIn("pip", args)
 
     @patch("addonmanager_python_deps_gui.utils.fci.get_python_exe")
     def test_call_pip_no_python(self, mock_get_python_exe: MagicMock):
@@ -107,8 +107,8 @@ def test_parse_pip_list_output_all_packages_no_updates(self):
             [],
         )
         self.assertEqual(len(results_dict), 2)
-        self.assertTrue("gitdb" in results_dict)
-        self.assertTrue("setuptools" in results_dict)
+        self.assertIn("gitdb", results_dict)
+        self.assertIn("setuptools", results_dict)
         self.assertEqual(results_dict["gitdb"]["installed_version"], "4.0.9")
         self.assertEqual(results_dict["gitdb"]["available_version"], "")
         self.assertEqual(results_dict["setuptools"]["installed_version"], "41.2.0")
@@ -125,8 +125,8 @@ def test_parse_pip_list_output_all_packages_with_updates(self):
             ],
         )
         self.assertEqual(len(results_dict), 2)
-        self.assertTrue("pip" in results_dict)
-        self.assertTrue("setuptools" in results_dict)
+        self.assertIn("pip", results_dict)
+        self.assertIn("setuptools", results_dict)
         self.assertEqual(results_dict["pip"]["installed_version"], "21.0.1")
         self.assertEqual(results_dict["pip"]["available_version"], "22.1.2")
         self.assertEqual(results_dict["setuptools"]["installed_version"], "41.2.0")