Use assert command for tests

Also use proper name for var: test_envt confuse test discovery

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

tests/packagedcode/test_gemfile_lock.py

@@ -274,7 +274,7 @@ def test_Gem_as_nv_tree(self):
                 }
             }
         }
-        self.assertEqual(expected, a.as_nv_tree())
+        assert a.as_nv_tree() == expected
 
     def test_Gem_flatten(self):
         Gem = gemfile_lock.Gem
@@ -320,7 +320,6 @@ def test_Gem_as_nv_tree_with_no_deps(self):
         results = a.as_nv_tree()
         assert results == expected
 
-
     def test_Gem_to_dict(self):
         Gem = gemfile_lock.Gem
         a = Gem('a', '1')

tests/packagedcode/test_maven.py

@@ -250,7 +250,6 @@ def test_maven_unknown_reference_to_license_in_manifest(self):
         run_scan_click(['--package', '--license', '--license-diagnostics', '--processes', '-1', test_dir, '--json', result_file])
         check_json_scan(expected_file, result_file, remove_uuid=True, regen=REGEN_TEST_FIXTURES)
 
-
     def test_package_dependency_not_missing(self):
         test_file = self.get_test_loc('maven2/log4j/log4j-pom.xml')
         self.check_parse_to_package(test_file, regen=REGEN_TEST_FIXTURES)
@@ -275,7 +274,7 @@ def test_get_top_level_resources(self):
         pom_resource = codebase.get_resource(
             'activiti-image-generator-7-201802-EA-sources.jar-extract/META-INF/maven/org.activiti/activiti-image-generator/pom.xml'
         )
-        self.assertTrue(pom_resource)
+        assert pom_resource is True
         top_level_resources_paths = [
             r.path for r in maven.MavenPomXmlHandler.get_top_level_resources(pom_resource, codebase)
         ]
@@ -288,7 +287,7 @@ def test_get_top_level_resources(self):
             'activiti-image-generator-7-201802-EA-sources.jar-extract/META-INF/maven/org.activiti/activiti-image-generator/pom.properties',
             'activiti-image-generator-7-201802-EA-sources.jar-extract/META-INF/maven/org.activiti/activiti-image-generator/pom.xml',
         ]
-        self.assertEquals(expected_resource_paths, top_level_resources_paths)
+        assert top_level_resources_paths == expected_resource_paths
 
 
 class TestPomProperties(testcase.FileBasedTesting):

tests/packagedcode/test_pypi.py

@@ -282,10 +282,10 @@ def test_parse_metadata_prefer_pkg_info_from_egg_info_from_command_line(self):
         # `celery/celery.egg-info/PKG-INFO`
         vc = VirtualCodebase(location=result_file)
         for dep in vc.attributes.dependencies:
-            self.assertEqual(dep['datafile_path'], 'celery/celery.egg-info/PKG-INFO')
+            assert dep['datafile_path'] == 'celery/celery.egg-info/PKG-INFO'
         for pkg in vc.attributes.packages:
             for path in pkg['datafile_paths']:
-                self.assertEqual(path, 'celery/celery.egg-info/PKG-INFO')
+                assert path == 'celery/celery.egg-info/PKG-INFO'
 
 
 class TestPipRequirementsFileHandler(PackageTester):
@@ -417,47 +417,23 @@ def test_parse_dependency_file_with_invalid_does_not_fail(self):
         expected_loc = self.get_test_loc('pypi/requirements_txt/invalid_spec/output.expected.json')
         self.check_packages_data(package, expected_loc, regen=REGEN_TEST_FIXTURES)
 
-    def test_PipRequirementsFileHandler_is_datafile(self):
-        self.assertEqual(
-            pypi.PipRequirementsFileHandler.is_datafile('dev-requirements.txt', _bare_filename=True),
-            True
-        )
-        self.assertEqual(
-            pypi.PipRequirementsFileHandler.is_datafile('requirements.txt', _bare_filename=True),
-            True
-        )
-        self.assertEqual(
-            pypi.PipRequirementsFileHandler.is_datafile('requirement.txt', _bare_filename=True),
-            True
-        )
-        self.assertEqual(
-            pypi.PipRequirementsFileHandler.is_datafile('requirements.in', _bare_filename=True),
-            True
-        )
-        self.assertEqual(
-            pypi.PipRequirementsFileHandler.is_datafile('requirements.pip', _bare_filename=True),
-            True
-        )
-        self.assertEqual(
-            pypi.PipRequirementsFileHandler.is_datafile('requirements-dev.txt', _bare_filename=True),
-            True
-        )
-        self.assertEqual(
-            pypi.PipRequirementsFileHandler.is_datafile('some-requirements-dev.txt', _bare_filename=True),
-            True
-        )
-        self.assertEqual(
-            pypi.PipRequirementsFileHandler.is_datafile('requires.txt', _bare_filename=True),
-            True
-        )
-        self.assertEqual(
-            pypi.PipRequirementsFileHandler.is_datafile('requirements/base.txt', _bare_filename=True),
-            True
-        )
-        self.assertEqual(
-            pypi.PipRequirementsFileHandler.is_datafile('reqs.txt', _bare_filename=True),
-            True
-        )
+    @pytest.mark.parametrize(
+        'filename',
+        [
+            'dev-requirements.txt',
+            'reqs.txt',
+            'requirements/base.txt',
+            'requirements-dev.txt',
+            'requirements.in',
+            'requirements.pip',
+            'requirements.txt',
+            'requirement.txt',
+            'requires.txt',
+            'some-requirements-dev.txt',
+        ]
+    )
+    def test_PipRequirementsFileHandler_is_datafile(self, filename):
+        assert pypi.PipRequirementsFileHandler.is_datafile(filename, _bare_filename=True)
 
 
 class TestPyPiPipfile(PackageTester):
@@ -607,36 +583,36 @@ def check_setup_py_parsing(test_loc):
 
     expected_loc2 = f'{test_loc}-expected.json'
     packages_data = pypi.PythonSetupPyHandler.parse(test_loc)
-    test_envt.check_packages_data(
+    env.check_packages_data(
         packages_data=packages_data,
         expected_loc=expected_loc2,
         regen=REGEN_TEST_FIXTURES,
         must_exist=False,
     )
 
 
-test_envt = PackageTester()
+env = PackageTester()
 
 
 @pytest.mark.parametrize(
     'test_loc',
-    get_setup_py_test_files(os.path.abspath(os.path.join(test_envt.test_data_dir, 'pypi', 'setup.py-versions'))),
+    get_setup_py_test_files(os.path.abspath(os.path.join(env.test_data_dir, 'pypi', 'setup.py-versions'))),
 )
 def test_parse_setup_py_with_computed_versions(test_loc):
     check_setup_py_parsing(test_loc)
 
 
 @pytest.mark.parametrize(
     'test_loc',
-    get_setup_py_test_files(os.path.abspath(os.path.join(test_envt.test_data_dir, 'pypi', 'setup.py')))
+    get_setup_py_test_files(os.path.abspath(os.path.join(env.test_data_dir, 'pypi', 'setup.py')))
 )
 def test_parse_setup_py(test_loc):
     check_setup_py_parsing(test_loc)
 
 
 @pytest.mark.parametrize(
     'test_loc',
-    get_setup_py_test_files(os.path.abspath(os.path.join(test_envt.test_data_dir, 'pypi', 'more_setup.py'))),
+    get_setup_py_test_files(os.path.abspath(os.path.join(env.test_data_dir, 'pypi', 'more_setup.py'))),
 )
 def test_parse_more_setup_py(test_loc):
     check_setup_py_parsing(test_loc)

tests/packagedcode/test_win_reg.py

@@ -60,14 +60,14 @@ def test_win_reg_remove_drive_letter(self):
         test_path = 'C:\\Users\\Test\\Desktop'
         expected_path = 'Users/Test/Desktop'
         result = remove_drive_letter(test_path)
-        self.assertEqual(result, expected_path)
+        assert result == expected_path
 
     def test_win_reg_create_absolute_installed_file_path(self):
         root_dir = '/home/test/c/'
         test_path = 'C:\\Program Files\\Test Program\\'
         result = create_absolute_installed_file_path(root_dir, test_path)
         expected_path = '/home/test/c/Program Files/Test Program'
-        self.assertEqual(result, expected_path)
+        assert result == expected_path
 
     def test_scan_system_package_end_to_end_installed_win_reg(self):
         test_dir = self.get_test_loc('win_reg/get_installed_packages_docker/layer')

tests/textcode/test_strings.py

@@ -162,11 +162,11 @@ def test_strings_in_all_bin(self):
     def test_is_relative_path(self):
         # Win Path
         path = "c:\\usr\\lib\\librt.so.1."
-        self.assertFalse(strings.is_relative_path(path))
+        assert strings.is_relative_path(path) is False
 
         # Relative Posix Path
         path = "usr/lib/librt.so.1"
-        self.assertTrue(strings.is_relative_path(path))
+        assert strings.is_relative_path(path) is True
 
     def test_strings_with_lf(self):
         test_file = 'strings/with-lf/strings.exe'