From 2261d5e82c0a0c3402c6e2a21616b1600d32f096 Mon Sep 17 00:00:00 2001
From: bkmartinjr <bruce@chanzuckerberg.com>
Date: Thu, 17 Jun 2021 08:06:42 -0700
Subject: [PATCH] fix unit tests for gene set load routes

---
 .../test_czi_hosted/unit/common/test_api.py   | 23 ++++++++++++---
 .../test/test_server/unit/common/test_api.py  | 28 +++++++++++++------
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/backend/test/test_czi_hosted/unit/common/test_api.py b/backend/test/test_czi_hosted/unit/common/test_api.py
index c32ae9c6..918eb387 100644
--- a/backend/test/test_czi_hosted/unit/common/test_api.py
+++ b/backend/test/test_czi_hosted/unit/common/test_api.py
@@ -554,6 +554,23 @@ class EndPointsCxg(unittest.TestCase, EndPoints):
                         "geneset_description": "",
                         "geneset_name": "summary test",
                     },
+                    {'genes': [], 'geneset_description': '', 'geneset_name': 'geneset_to_delete'},
+                    {'genes': [], 'geneset_description': '', 'geneset_name': 'geneset_to_edit'},
+                    {
+                        'genes': [{'gene_description': '', 'gene_symbol': 'RER1'}],
+                        'geneset_description': '',
+                        'geneset_name': 'fill_this_geneset'
+                    },
+                    {
+                        'genes': [{'gene_description': '', 'gene_symbol': 'SIK1'}],
+                        'geneset_description': '',
+                        'geneset_name': 'empty_this_geneset'
+                    },
+                    {
+                        'genes': [{'gene_description': '', 'gene_symbol': 'SIK1'}],
+                        'geneset_description': '',
+                        'geneset_name': 'brush_this_gene'
+                    }
                 ],
                 "tid": 0,
             },
@@ -569,14 +586,12 @@ class EndPointsCxg(unittest.TestCase, EndPoints):
             result.text,
             """gene_set_name,gene_set_description,gene_symbol,gene_description\r
 first gene set name,a description,F5, a gene_description\r
-first gene set name,a description,NO_SUCH_GENE, non-existent gene\r
-first gene set name,a description,F5, duplicate gene\r
 first gene set name,a description,SUMO3,\r
 first gene set name,a description,SRM,\r
 second_gene_set,,RER1,\r
 second_gene_set,,SIK1,\r
-third gene set,,NO_SUCH_GENE,\r
-fourth_gene_set,fourth description,,gene intentionally missing\r
+third gene set,,,\r
+fourth_gene_set,fourth description,,\r
 fifth_dataset,,,\r
 summary test,,ACD,\r
 summary test,,AATF,\r
diff --git a/backend/test/test_server/unit/common/test_api.py b/backend/test/test_server/unit/common/test_api.py
index 013c15af..f635ebcb 100644
--- a/backend/test/test_server/unit/common/test_api.py
+++ b/backend/test/test_server/unit/common/test_api.py
@@ -575,7 +575,7 @@ class EndPointsAnnDataGenesets(unittest.TestCase, EndPoints):
                             {"gene_description": "", "gene_symbol": "SIK1"},
                         ],
                         "geneset_description": "",
-                        "geneset_name": "second gene set",
+                        "geneset_name": "second_gene_set",
                     },
                     {"genes": [], "geneset_description": "", "geneset_name": "third gene set"},
                     {"genes": [], "geneset_description": "fourth description", "geneset_name": "fourth_gene_set"},
@@ -590,6 +590,23 @@ class EndPointsAnnDataGenesets(unittest.TestCase, EndPoints):
                         "geneset_description": "",
                         "geneset_name": "summary test",
                     },
+                    {'genes': [], 'geneset_description': '', 'geneset_name': 'geneset_to_delete'},
+                    {'genes': [], 'geneset_description': '', 'geneset_name': 'geneset_to_edit'},
+                    {
+                        'genes': [{'gene_description': '', 'gene_symbol': 'RER1'}],
+                        'geneset_description': '',
+                        'geneset_name': 'fill_this_geneset'
+                    },
+                    {
+                        'genes': [{'gene_description': '', 'gene_symbol': 'SIK1'}],
+                        'geneset_description': '',
+                        'geneset_name': 'empty_this_geneset'
+                    },
+                    {
+                        'genes': [{'gene_description': '', 'gene_symbol': 'SIK1'}],
+                        'geneset_description': '',
+                        'geneset_name': 'brush_this_gene'
+                    }
                 ],
                 "tid": 0,
             },
@@ -600,23 +617,18 @@ class EndPointsAnnDataGenesets(unittest.TestCase, EndPoints):
         endpoint = "genesets"
         url = f"{self.URL_BASE}{endpoint}"
         result = self.session.get(url, headers={"Accept": "text/csv"})
-        self.maxDiff=None
-        
-        print(result.text)
         self.assertEqual(result.status_code, HTTPStatus.OK)
         self.assertEqual(result.headers["Content-Type"], "text/csv")
         self.assertEqual(
             result.text,
             """gene_set_name,gene_set_description,gene_symbol,gene_description\r
 first gene set name,a description,F5, a gene_description\r
-first gene set name,a description,NO_SUCH_GENE, non-existent gene\r
-first gene set name,a description,F5, duplicate gene\r
 first gene set name,a description,SUMO3,\r
 first gene set name,a description,SRM,\r
 second_gene_set,,RER1,\r
 second_gene_set,,SIK1,\r
-third gene set,,NO_SUCH_GENE,\r
-fourth_gene_set,fourth description,,gene intentionally missing\r
+third gene set,,,\r
+fourth_gene_set,fourth description,,\r
 fifth_dataset,,,\r
 summary test,,ACD,\r
 summary test,,AATF,\r