From 6abd8e40bf05d2470f55e9ad89537e1621f2e8a6 Mon Sep 17 00:00:00 2001
From: Alejandro Brugarolas <abrugaro@redhat.com>
Date: Fri, 2 Aug 2024 16:18:26 +0200
Subject: [PATCH 1/2] add hello-world dotnet analysis test

Signed-off-by: Alejandro Brugarolas <abrugaro@redhat.com>
---
 data/applications/dotnet-hello-world.zip      | Bin 0 -> 5011 bytes
 data/dotnet_analysis.json                     |   6 ++++
 data/yaml/dotnet/example_rules/example.yaml   |  14 +++++++++
 data/yaml/dotnet/example_rules/ruleset.yaml   |   3 ++
 fixtures/analysis.py                          |   7 +++++
 tests/analysis/__init__.py                    |   0
 tests/analysis/dotnet/__init__.py             |   0
 tests/analysis/dotnet/test_dotnet_analysis.py |  29 ++++++++++++++++++
 tests/analysis/java/__init__.py               |   0
 .../java/test_java_analysis.py}               |   0
 utils/common.py                               |  26 ++++++++++++++++
 11 files changed, 85 insertions(+)
 create mode 100644 data/applications/dotnet-hello-world.zip
 create mode 100644 data/dotnet_analysis.json
 create mode 100644 data/yaml/dotnet/example_rules/example.yaml
 create mode 100644 data/yaml/dotnet/example_rules/ruleset.yaml
 create mode 100644 tests/analysis/__init__.py
 create mode 100644 tests/analysis/dotnet/__init__.py
 create mode 100644 tests/analysis/dotnet/test_dotnet_analysis.py
 create mode 100644 tests/analysis/java/__init__.py
 rename tests/{test_analysis.py => analysis/java/test_java_analysis.py} (100%)
 create mode 100644 utils/common.py

diff --git a/data/applications/dotnet-hello-world.zip b/data/applications/dotnet-hello-world.zip
new file mode 100644
index 0000000000000000000000000000000000000000..5fd221c639ee898bacffca485780d3f7d7616a63
GIT binary patch
literal 5011
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

literal 0
HcmV?d00001

diff --git a/data/dotnet_analysis.json b/data/dotnet_analysis.json
new file mode 100644
index 0000000..3baaacd
--- /dev/null
+++ b/data/dotnet_analysis.json
@@ -0,0 +1,6 @@
+{
+  "hello_world": {
+    "app_name": "dotnet-hello-world",
+    "file_name": "dotnet-hello-world.zip"
+  }
+}
diff --git a/data/yaml/dotnet/example_rules/example.yaml b/data/yaml/dotnet/example_rules/example.yaml
new file mode 100644
index 0000000..f76a057
--- /dev/null
+++ b/data/yaml/dotnet/example_rules/example.yaml
@@ -0,0 +1,14 @@
+- category: mandatory
+  customVariables: []
+  description: MVC Method names have changed from .NET Framework
+  effort: 1
+  labels:
+  - konveyor.io/source=dotnetframework
+  message: |-
+    HttpNotFound was replaced with NotFound in .NET Core
+  ruleID: removed-dotnet-framework-00000
+  when:
+    or:
+    - dotnet.referenced:
+        pattern: "HttpNotFound"
+        namespace: "System.Web.Mvc"
diff --git a/data/yaml/dotnet/example_rules/ruleset.yaml b/data/yaml/dotnet/example_rules/ruleset.yaml
new file mode 100644
index 0000000..b0ba056
--- /dev/null
+++ b/data/yaml/dotnet/example_rules/ruleset.yaml
@@ -0,0 +1,3 @@
+name: dotnet8/dotnetframework45
+description: This ruleset provides analysis with respect to API changes between
+  .NET Framework 4.5 and .NET 8.
diff --git a/fixtures/analysis.py b/fixtures/analysis.py
index 45b3375..b8e823f 100644
--- a/fixtures/analysis.py
+++ b/fixtures/analysis.py
@@ -7,3 +7,10 @@ def analysis_data():
     with open('data/analysis.json', 'r') as file:
         json_list = json.load(file)
     return json_list
+
+
+@pytest.fixture(scope="session")
+def dotnet_analysis_data():
+    with open('data/dotnet_analysis.json', 'r') as file:
+        json_list = json.load(file)
+    return json_list
diff --git a/tests/analysis/__init__.py b/tests/analysis/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/analysis/dotnet/__init__.py b/tests/analysis/dotnet/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/analysis/dotnet/test_dotnet_analysis.py b/tests/analysis/dotnet/test_dotnet_analysis.py
new file mode 100644
index 0000000..1d713fb
--- /dev/null
+++ b/tests/analysis/dotnet/test_dotnet_analysis.py
@@ -0,0 +1,29 @@
+import os
+import subprocess
+
+from utils import constants
+from utils.command import build_analysis_command
+from utils.common import extract_zip_to_temp_dir
+
+# Polarion TC MTA-568
+def test_hello_world_analysis_with_rules(dotnet_analysis_data):
+    application_data = dotnet_analysis_data["hello_world"]
+    application_path = os.path.join(
+        os.getenv(constants.PROJECT_PATH),
+        'data/applications',
+        application_data['file_name']
+    )
+    custom_rules_path = os.path.join(os.getenv(constants.PROJECT_PATH), 'data/yaml/dotnet/example_rules')
+
+    with extract_zip_to_temp_dir(application_path) as tempdir:
+
+        command = build_analysis_command(
+            tempdir,
+            "",
+            "",
+            **{'rules': custom_rules_path}
+        )
+
+        output = subprocess.run(command, shell=True, check=True, stdout=subprocess.PIPE, encoding='utf-8').stdout
+
+        assert 'Static report created' in output
diff --git a/tests/analysis/java/__init__.py b/tests/analysis/java/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_analysis.py b/tests/analysis/java/test_java_analysis.py
similarity index 100%
rename from tests/test_analysis.py
rename to tests/analysis/java/test_java_analysis.py
diff --git a/utils/common.py b/utils/common.py
new file mode 100644
index 0000000..4388d51
--- /dev/null
+++ b/utils/common.py
@@ -0,0 +1,26 @@
+import os
+import tempfile
+import zipfile
+from contextlib import contextmanager
+
+from utils import constants
+
+
+@contextmanager
+def extract_zip_to_temp_dir(application_path):
+    """
+    Creates a temporary directory and extracts a zip file to it.
+
+    :param application_path: Path to the zip file
+    :yield: path to the extracted zip file
+    """
+
+    tempdir = tempfile.TemporaryDirectory(dir=os.getenv(constants.PROJECT_PATH))
+
+    # Adjusts the permissions to allow access to subprocesses
+    os.chmod(tempdir.name, 0o777)
+
+    with zipfile.ZipFile(application_path, 'r') as zip_ref:
+        zip_ref.extractall(tempdir.name)
+
+    yield tempdir.name

From f0236ad6a4d01f2d05f34a13d1bf2c4b9e8eef27 Mon Sep 17 00:00:00 2001
From: Alejandro Brugarolas <abrugaro@redhat.com>
Date: Fri, 2 Aug 2024 16:27:23 +0200
Subject: [PATCH 2/2] fix pr

Signed-off-by: Alejandro Brugarolas <abrugaro@redhat.com>
---
 tests/analysis/dotnet/test_dotnet_analysis.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/analysis/dotnet/test_dotnet_analysis.py b/tests/analysis/dotnet/test_dotnet_analysis.py
index 1d713fb..4cf3055 100644
--- a/tests/analysis/dotnet/test_dotnet_analysis.py
+++ b/tests/analysis/dotnet/test_dotnet_analysis.py
@@ -5,8 +5,13 @@
 from utils.command import build_analysis_command
 from utils.common import extract_zip_to_temp_dir
 
+
 # Polarion TC MTA-568
 def test_hello_world_analysis_with_rules(dotnet_analysis_data):
+    # Avoid running this test on Windows
+    if os.name == 'nt':
+        return
+
     application_data = dotnet_analysis_data["hello_world"]
     application_path = os.path.join(
         os.getenv(constants.PROJECT_PATH),
@@ -16,7 +21,6 @@ def test_hello_world_analysis_with_rules(dotnet_analysis_data):
     custom_rules_path = os.path.join(os.getenv(constants.PROJECT_PATH), 'data/yaml/dotnet/example_rules')
 
     with extract_zip_to_temp_dir(application_path) as tempdir:
-
         command = build_analysis_command(
             tempdir,
             "",