From c7fd52e78f8f2a10a7e67ba3f9ac998e1819adae Mon Sep 17 00:00:00 2001
From: Jordan <21129425+ItIsJordan@users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:25:17 +0000
Subject: [PATCH] Update add_analyses test

Adds NUISANCE to test_add_analyses and fix files used for other file types.
---
 tests/search_test.py                          | 25 +++++++++++++++----
 .../test_analysis_submission/submission.yaml  |  4 +--
 .../{test.cxx => test.ProSelecta}             |  0
 .../test_analysis_submission/test.tar.gz      |  0
 4 files changed, 22 insertions(+), 7 deletions(-)
 rename tests/test_data/test_analysis_submission/{test.cxx => test.ProSelecta} (100%)
 create mode 100644 tests/test_data/test_analysis_submission/test.tar.gz

diff --git a/tests/search_test.py b/tests/search_test.py
index 5284e47a..cc27400c 100644
--- a/tests/search_test.py
+++ b/tests/search_test.py
@@ -433,13 +433,14 @@ def test_add_analyses(app):
     test_data = [
         {  # ProSelecta/NUISANCE
             "type": "NUISANCE",
-            "filename": "test.cxx"
+            "filename": "test.ProSelecta"
         },
         {  # HistFactory entry
             "type": "HistFactory",
-            "filename": "test.cxx"
-        }
+            "filename": "test.tar.gz"
+        },
     ]
+    # This should probably be changed to use SITE_URL or some similar concept
     analysis_url = "http://localhost:5000/record/resource/%s?landing_page=true"
 
     with app.app_context():
@@ -465,15 +466,29 @@ def test_add_analyses(app):
         # No errors should happen
         assert not errors
 
+        # Add MadAnalysis DataResource object separately
+        mad_analysis = DataResource(
+            file_location = "placeholder",
+            file_type = "MadAnalysis",
+            file_description = "placeholder"
+        )
+
+        # Adding object to database
+        hepsubmission.resources.append(mad_analysis)
+        db.session.add(mad_analysis)
+        db.session.add(hepsubmission)
+
         # Set up a generic doc object to match what add_analyses expects
         test_doc = {"analyses": [], "recid": hepsubmission.publication_recid}
         # Run the test add_analyses function
         add_analyses(test_doc)
 
-        # A sorted list of all DataResource object IDs from subm,ission
+        # A sorted list of all DataResource object IDs from submission
         data_ids = sorted([r.id for r in hepsubmission.resources])
 
-        assert len(data_ids) == len(test_doc["analyses"]) == len(test_data)
+        # There should be 3 analyses and 3 resources
+        assert len(data_ids) == len(test_doc["analyses"]) == 3
+
         # There should be one entry into test_data per resource ID
         # Looping through the test, resource IDs and the analysis outputs
         for test, d_id, analysis in zip(test_data, data_ids, test_doc["analyses"]):
diff --git a/tests/test_data/test_analysis_submission/submission.yaml b/tests/test_data/test_analysis_submission/submission.yaml
index b491df55..44667cb8 100644
--- a/tests/test_data/test_analysis_submission/submission.yaml
+++ b/tests/test_data/test_analysis_submission/submission.yaml
@@ -2,8 +2,8 @@
 description: "TestSubmission1-V1"
 comment: TestComment1-V1
 additional_resources:
-- {description: Test, location: test.cxx, type: ProSelecta }
-- {description: Test, location: test.cxx, type: HistFactory }
+- {description: Test, location: test.ProSelecta,  type: ProSelecta }
+- {description: Test, location: test.tar.gz, type: HistFactory }
 ---
 name: "TestTable1-V1"
 description: TestTable1-description-V1
diff --git a/tests/test_data/test_analysis_submission/test.cxx b/tests/test_data/test_analysis_submission/test.ProSelecta
similarity index 100%
rename from tests/test_data/test_analysis_submission/test.cxx
rename to tests/test_data/test_analysis_submission/test.ProSelecta
diff --git a/tests/test_data/test_analysis_submission/test.tar.gz b/tests/test_data/test_analysis_submission/test.tar.gz
new file mode 100644
index 00000000..e69de29b