Refactor tests

Signed-off-by: yongjunhong <[email protected]>

Author: YongGoose

tests/pytest/conftest.py

@@ -2,13 +2,39 @@
 # -*- coding: utf-8 -*-
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
+import os
+import shutil
 import pytest
-import subprocess
 
+set_up_directories = [
+    "tests/result/android",
+    "tests/result/cocoapods",
+    "tests/result/exclude",
+    "tests/result/gradle",
+    "tests/result/gradle2",
+    "tests/result/helm",
+    "tests/result/maven1",
+    "tests/result/maven2",
+    "tests/result/multi_pypi_npm",
+    "tests/result/npm1",
+    "tests/result/npm2",
+    "tests/result/nuget1",
+    "tests/result/nuget2",
+    "tests/result/pub",
+    "tests/result/pypi",
+]
 
-@pytest.fixture
-def run_command():
-    def _run_command(command):
-        result = subprocess.run(command, shell=True, capture_output=True, text=True)
-        return result.returncode, result.stdout, result.stderr
-    return _run_command
+remove_directories = set_up_directories
+
+
+@pytest.fixture(scope="session", autouse=True)
+def setup_test_result_dir_and_teardown():
+    print("==============setup==============")
+    for directory in set_up_directories:
+        os.makedirs(directory, exist_ok=True)
+
+    yield
+
+    print("==============tearDown==============")
+    for directory in remove_directories:
+        shutil.rmtree(directory)

tests/pytest/package_manager/test_android.py

@@ -4,27 +4,28 @@
 # SPDX-License-Identifier: Apache-2.0
 import os
 import pytest
-
-UBUNTU_COMMANDS = [
-    "fosslight_dependency -p tests/test_android -o tests/result/android -m android"
-]
+import subprocess
 
 DIST_PATH = os.path.join(os.environ.get("TOX_PATH"), "dist", "cli.exe")
-INPUT_PATH = os.path.join("tests", "test_android", "sunflower")
-OUTPUT_PATH = os.path.join("tests", "result", "android")
-
-WINDOW_COMMANDS = [f"{DIST_PATH} -p {INPUT_PATH} -o {OUTPUT_PATH}"]
 
 
+@pytest.mark.parametrize("input_path, output_path, extra_args", [
+    ("tests/test_android", "tests/result/android", "-m android")
+])
 @pytest.mark.ubuntu
-def test_ubuntu(run_command):
-    for command in UBUNTU_COMMANDS:
-        return_code, stdout, stderr = run_command(command)
-        assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
+def test_ubuntu(input_path, output_path, extra_args):
+    command = f"fosslight_dependency -p {input_path} -o {output_path} {extra_args}"
+    result = subprocess.run(command, shell=True, capture_output=True, text=True)
+    assert result.returncode == 0, f"Command failed: {command}\nstdout: {result.stdout}\nstderr: {result.stderr}"
+    assert any(os.scandir(output_path)), f"Output file does not exist: {output_path}"
 
 
+@pytest.mark.parametrize("input_path, output_path", [
+    (os.path.join("tests", "test_android", "sunflower"), os.path.join("tests", "result", "android"))
+])
 @pytest.mark.windows
-def test_windows(run_command):
-    for command in WINDOW_COMMANDS:
-        return_code, stdout, stderr = run_command(command)
-        assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
+def test_windows(input_path, output_path):
+    command = f"{DIST_PATH} -p {input_path} -o {output_path}"
+    result = subprocess.run(command, shell=True, capture_output=True, text=True)
+    assert result.returncode == 0, f"Command failed: {command}\nstdout: {result.stdout}\nstderr: {result.stderr}"
+    assert any(os.scandir(output_path)), f"Output file does not exist: {output_path}"

tests/pytest/package_manager/test_cocoapods.py

@@ -2,15 +2,17 @@
 # -*- coding: utf-8 -*-
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
+import os
 import pytest
-
-UBUNTU_COMMANDS = [
-    "fosslight_dependency -p tests/test_cocoapods -o tests/result/cocoapods -m cocoapods"
-]
+import subprocess
 
 
+@pytest.mark.parametrize("input_path, output_path, extra_args", [
+    ("tests/test_cocoapods", "tests/result/cocoapods", "-m cocoapods")
+])
 @pytest.mark.ubuntu
-def test_ubuntu(run_command):
-    for command in UBUNTU_COMMANDS:
-        return_code, stdout, stderr = run_command(command)
-        assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
+def test_ubuntu(input_path, output_path, extra_args):
+    command = f"fosslight_dependency -p {input_path} -o {output_path} {extra_args}"
+    result = subprocess.run(command, shell=True, capture_output=True, text=True)
+    assert result.returncode == 0, f"Command failed: {command}\nstdout: {result.stdout}\nstderr: {result.stderr}"
+    assert any(os.scandir(output_path)), f"Output file does not exist: {output_path}"

tests/pytest/package_manager/test_gradle.py

@@ -4,33 +4,30 @@
 # SPDX-License-Identifier: Apache-2.0
 import os
 import pytest
-
-UBUNTU_COMMANDS = [
-    "fosslight_dependency -p tests/test_gradle/jib -o tests/result/gradle",
-    "fosslight_dependency -p tests/test_gradle2 -o tests/result/gradle2"
-]
+import subprocess
 
 DIST_PATH = os.path.join(os.environ.get("TOX_PATH"), "dist", "cli.exe")
-INPUT_PATH = os.path.join("tests", "test_gradle", "jib")
-OUTPUT_PATH = os.path.join("tests", "result", "gradle")
-INPUT_PATH2 = os.path.join("tests", "test_gradle2")
-OUTPUT_PATH2 = os.path.join("tests", "result", "gradle2")
-
-WINDOW_COMMANDS = [
-    f"{DIST_PATH} -p {INPUT_PATH} -o {OUTPUT_PATH} -m gradle",
-    f"{DIST_PATH} -p {INPUT_PATH2} -o {OUTPUT_PATH2} -m gradle",
-]
 
 
+@pytest.mark.parametrize("input_path, output_path", [
+    ("tests/test_gradle/jib", "tests/result/gradle"),
+    ("tests/test_gradle2", "tests/result/gradle2")
+])
 @pytest.mark.ubuntu
-def test_ubuntu(run_command):
-    for command in UBUNTU_COMMANDS:
-        return_code, stdout, stderr = run_command(command)
-        assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
+def test_ubuntu(input_path, output_path):
+    command = f"fosslight_dependency -p {input_path} -o {output_path}"
+    result = subprocess.run(command, shell=True, capture_output=True, text=True)
+    assert result.returncode == 0, f"Command failed: {command}\nstdout: {result.stdout}\nstderr: {result.stderr}"
+    assert any(os.scandir(output_path)), f"Output file does not exist: {output_path}"
 
 
+@pytest.mark.parametrize("input_path, output_path", [
+    (os.path.join("tests", "test_gradle", "jib"), os.path.join("tests", "result", "gradle")),
+    (os.path.join("tests", "test_gradle2"), os.path.join("tests", "result", "gradle2"))
+])
 @pytest.mark.windows
-def test_windows(run_command):
-    for command in WINDOW_COMMANDS:
-        return_code, stdout, stderr = run_command(command)
-        assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
+def test_windows(input_path, output_path):
+    command = f"{DIST_PATH} -p {input_path} -o {output_path} -m gradle"
+    result = subprocess.run(command, shell=True, capture_output=True, text=True)
+    assert result.returncode == 0, f"Command failed: {command}\nstdout: {result.stdout}\nstderr: {result.stderr}"
+    assert any(os.scandir(output_path)), f"Output file does not exist: {output_path}"

tests/pytest/package_manager/test_helm.py

@@ -2,15 +2,17 @@
 # -*- coding: utf-8 -*-
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
+import os
 import pytest
-
-UBUNTU_COMMANDS = [
-    "fosslight_dependency -p tests/test_helm -o tests/result/helm -m helm"
-]
+import subprocess
 
 
+@pytest.mark.parametrize("input_path, output_path, extra_args", [
+    ("tests/test_helm", "tests/result/helm", "-m helm")
+])
 @pytest.mark.ubuntu
-def test_ubuntu(run_command):
-    for command in UBUNTU_COMMANDS:
-        return_code, stdout, stderr = run_command(command)
-        assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
+def test_ubuntu(input_path, output_path, extra_args):
+    command = f"fosslight_dependency -p {input_path} -o {output_path} {extra_args}"
+    result = subprocess.run(command, shell=True, capture_output=True, text=True)
+    assert result.returncode == 0, f"Command failed: {command}\nstdout: {result.stdout}\nstderr: {result.stderr}"
+    assert any(os.scandir(output_path)), f"Output file does not exist: {output_path}"

tests/pytest/package_manager/test_maven.py

@@ -4,28 +4,29 @@
 # SPDX-License-Identifier: Apache-2.0
 import os
 import pytest
-
-UBUNTU_COMMANDS = [
-    "fosslight_dependency -p tests/test_maven1/lombok.maven -o tests/result/maven1",
-    "fosslight_dependency -p tests/test_maven2 -o tests/result/maven2"
-]
+import subprocess
 
 DIST_PATH = os.path.join(os.environ.get("TOX_PATH"), "dist", "cli.exe")
-INPUT_PATH = os.path.join("tests", "test_maven2")
-OUTPUT_PATH = os.path.join("tests", "result", "maven2")
-
-WINDOW_COMMANDS = [f"{DIST_PATH} -p {INPUT_PATH} -o {OUTPUT_PATH} -m maven"]
 
 
+@pytest.mark.parametrize("input_path, output_path", [
+    ("tests/test_maven1/lombok.maven", "tests/result/maven1"),
+    ("tests/test_maven2", "tests/result/maven2")
+])
 @pytest.mark.ubuntu
-def test_ubuntu(run_command):
-    for command in UBUNTU_COMMANDS:
-        return_code, stdout, stderr = run_command(command)
-        assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
+def test_ubuntu(input_path, output_path):
+    command = f"fosslight_dependency -p {input_path} -o {output_path}"
+    result = subprocess.run(command, shell=True, capture_output=True, text=True)
+    assert result.returncode == 0, f"Command failed: {command}\nstdout: {result.stdout}\nstderr: {result.stderr}"
+    assert any(os.scandir(output_path)), f"Output file does not exist: {output_path}"
 
 
+@pytest.mark.parametrize("input_path, output_path", [
+    (os.path.join("tests", "test_maven2"), os.path.join("tests", "result", "maven2"))
+])
 @pytest.mark.windows
-def test_windows(run_command):
-    for command in WINDOW_COMMANDS:
-        return_code, stdout, stderr = run_command(command)
-        assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
+def test_windows(input_path, output_path):
+    command = f"{DIST_PATH} -p {input_path} -o {output_path} -m maven"
+    result = subprocess.run(command, shell=True, capture_output=True, text=True)
+    assert result.returncode == 0, f"Command failed: {command}\nstdout: {result.stdout}\nstderr: {result.stderr}"
+    assert any(os.scandir(output_path)), f"Output file does not exist: {output_path}"

tests/pytest/package_manager/test_npm.py

@@ -2,16 +2,18 @@
 # -*- coding: utf-8 -*-
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
+import os
 import pytest
-
-UBUNTU_COMMANDS = [
-    "fosslight_dependency -p tests/test_npm1 -o tests/result/npm1",
-    "fosslight_dependency -p tests/test_npm2 -o tests/result/npm2 -m npm"
-]
+import subprocess
 
 
+@pytest.mark.parametrize("input_path, output_path, extra_args", [
+    ("tests/test_npm1", "tests/result/npm1", ""),
+    ("tests/test_npm2", "tests/result/npm2", "-m npm")
+])
 @pytest.mark.ubuntu
-def test_ubuntu(run_command):
-    for command in UBUNTU_COMMANDS:
-        return_code, stdout, stderr = run_command(command)
-        assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
+def test_ubuntu(input_path, output_path, extra_args):
+    command = f"fosslight_dependency -p {input_path} -o {output_path} {extra_args}"
+    result = subprocess.run(command, shell=True, capture_output=True, text=True)
+    assert result.returncode == 0, f"Command failed: {command}\nstdout: {result.stdout}\nstderr: {result.stderr}"
+    assert any(os.scandir(output_path)), f"Output file does not exist: {output_path}"

tests/pytest/package_manager/test_nuget.py

@@ -4,33 +4,35 @@
 # SPDX-License-Identifier: Apache-2.0
 import os
 import pytest
+import subprocess
 
 UBUNTU_COMMANDS = [
     "fosslight_dependency -p tests/test_nuget -o tests/result/nuget1",
     "fosslight_dependency -p tests/test_nuget2 -o tests/result/nuget2"
 ]
 
 DIST_PATH = os.path.join(os.environ.get("TOX_PATH"), "dist", "cli.exe")
-INPUT_PATH = os.path.join("tests", "test_nuget")
-OUTPUT_PATH = os.path.join("tests", "result", "nuget1")
-INPUT_PATH2 = os.path.join("tests", "test_nuget2")
-OUTPUT_PATH2 = os.path.join("tests", "result", "nuget2")
-
-WINDOW_COMMANDS = [
-    f"{DIST_PATH} -p {INPUT_PATH} -o {OUTPUT_PATH}",
-    f"{DIST_PATH} -p {INPUT_PATH2} -o {OUTPUT_PATH2}"
-]
 
 
+@pytest.mark.parametrize("input_path, output_path", [
+    ("tests/test_nuget", "tests/result/nuget1"),
+    ("tests/test_nuget2", "tests/result/nuget2")
+])
 @pytest.mark.ubuntu
-def test_ubuntu(run_command):
-    for command in UBUNTU_COMMANDS:
-        return_code, stdout, stderr = run_command(command)
-        assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
+def test_ubuntu(input_path, output_path):
+    command = f"fosslight_dependency -p {input_path} -o {output_path}"
+    result = subprocess.run(command, shell=True, capture_output=True, text=True)
+    assert result.returncode == 0, f"Command failed: {command}\nstdout: {result.stdout}\nstderr: {result.stderr}"
+    assert any(os.scandir(output_path)), f"Output file does not exist: {output_path}"
 
 
+@pytest.mark.parametrize("input_path, output_path", [
+    (os.path.join("tests", "test_nuget"), os.path.join("tests", "result", "nuget1")),
+    (os.path.join("tests", "test_nuget2"), os.path.join("tests", "result", "nuget2"))
+])
 @pytest.mark.windows
-def test_windows(run_command):
-    for command in WINDOW_COMMANDS:
-        return_code, stdout, stderr = run_command(command)
-        assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
+def test_windows(input_path, output_path):
+    command = f"{DIST_PATH} -p {input_path} -o {output_path}"
+    result = subprocess.run(command, shell=True, capture_output=True, text=True)
+    assert result.returncode == 0, f"Command failed: {command}\nstdout: {result.stdout}\nstderr: {result.stderr}"
+    assert any(os.scandir(output_path)), f"Output file does not exist: {output_path}"

tests/pytest/package_manager/test_pub.py

@@ -4,34 +4,31 @@
 # SPDX-License-Identifier: Apache-2.0
 import os
 import pytest
-
-UBUNTU_COMMANDS = [
-    "fosslight_dependency -p tests/test_pub -o tests/result/pub",
-    "fosslight_dependency -p tests/test_exclude -e requirements.txt -o tests/result/exclude"
-]
+import subprocess
 
 DIST_PATH = os.path.join(os.environ.get("TOX_PATH"), "dist", "cli.exe")
-INPUT_PATH = os.path.join("tests", "test_pub")
-OUTPUT_PATH = os.path.join("tests", "result", "pub")
-INPUT_PATH2 = os.path.join("tests", "test_exclude")
-OUTPUT_PATH2 = os.path.join("tests", "result", "exclude")
-
-WINDOW_COMMANDS = [
-    f"{DIST_PATH} -p {INPUT_PATH} -o {OUTPUT_PATH}",
-    f"{DIST_PATH} -p {INPUT_PATH} -o {OUTPUT_PATH} -f opossum",
-    f"{DIST_PATH} -p {INPUT_PATH} -e requirements.txt -o {OUTPUT_PATH}"
-]
 
 
+@pytest.mark.parametrize("input_path, output_path", [
+    ("tests/test_pub", "tests/result/pub"),
+    ("tests/test_exclude -e requirements.txt", "tests/result/exclude")
+])
 @pytest.mark.ubuntu
-def test_ubuntu(run_command):
-    for command in UBUNTU_COMMANDS:
-        return_code, stdout, stderr = run_command(command)
-        assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
+def test_ubuntu(input_path, output_path):
+    command = f"fosslight_dependency -p {input_path} -o {output_path}"
+    result = subprocess.run(command, shell=True, capture_output=True, text=True)
+    assert result.returncode == 0, f"Command failed: {command}\nstdout: {result.stdout}\nstderr: {result.stderr}"
+    assert any(os.scandir(output_path)), f"Output file does not exist: {output_path}"
 
 
+@pytest.mark.parametrize("input_path, output_path, extra_args", [
+    (os.path.join("tests", "test_pub"), os.path.join("tests", "result", "pub"), ""),
+    (os.path.join("tests", "test_pub"), os.path.join("tests", "result", "pub"), "-f opossum"),
+    (os.path.join("tests", "test_exclude") + " -e requirements.txt", os.path.join("tests", "result", "exclude"), "")
+])
 @pytest.mark.windows
-def test_windows(run_command):
-    for command in WINDOW_COMMANDS:
-        return_code, stdout, stderr = run_command(command)
-        assert return_code == 0, f"Command failed: {command}\nstdout: {stdout}\nstderr: {stderr}"
+def test_windows(input_path, output_path, extra_args):
+    command = f"{DIST_PATH} -p {input_path} -o {output_path} {extra_args}"
+    result = subprocess.run(command, shell=True, capture_output=True, text=True)
+    assert result.returncode == 0, f"Command failed: {command}\nstdout: {result.stdout}\nstderr: {result.stderr}"
+    assert any(os.scandir(output_path)), f"Output file does not exist: {output_path}"