updated files being checked:

ntalluri · Sep 3, 2024 · b202639 · b202639
1 parent d786ec9
commit b202639
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 23 deletions.
diff --git a/test/parse-outputs/expected/oi2-expected/oi2-expected-empty.txt b/test/parse-outputs/expected/oi2-expected/oi2-expected-empty.txt
diff --git a/test/parse-outputs/expected/oi2-expected/oi2-expected.txt b/test/parse-outputs/expected/oi2-expected/oi2-expected.txt
diff --git a/test/parse-outputs/input/oi2-raw-pathways/oi2-correct.txt b/test/parse-outputs/input/oi2-raw-pathways/oi2-correct.txt
diff --git a/test/parse-outputs/input/oi2-raw-pathways/oi2-empty.txt b/test/parse-outputs/input/oi2-raw-pathways/oi2-empty.txt
diff --git a/test/parse-outputs/test_parse_outputs.py b/test/parse-outputs/test_parse_outputs.py
@@ -7,7 +7,6 @@
 OUTDIR = "test/parse-outputs/output/"
 EXPDIR = "test/parse-outputs/expected/"
 RAW_PATHS_INDIR = 'test/parse-outputs/input/oi2-raw-pathways/'
-RAW_PATHS_EXPDIR = 'test/parse-outputs/expected/oi2-expected/'
 
 # DOMINO input is the concatenated module_0.html and module_1.html file from
 # the DOMINO output of the network dip.sif and the nodes tnfa_active_genes_file.txt
@@ -39,26 +38,16 @@ def test_empty_file(self):
             runner.parse_output(algo, test_file, out_file)
             assert filecmp.cmp(OUTDIR + f"{algo}-empty-pathway.txt", EXPDIR + f"empty-pathway-expected.txt", shallow=False)
 
-    def test_oi2_correct_parse_output(self):
-        test_file = RAW_PATHS_INDIR + f"oi2-correct.txt"
-        out_file = OUTDIR + f"oi2-correct-pathway.txt"
-        runner.parse_output('omicsintegrator2', test_file, out_file)
-        assert filecmp.cmp(out_file, RAW_PATHS_EXPDIR + f"oi2-expected.txt", shallow=False)
-
-    def test_oi2_empty_parse_output(self):
-        test_file = RAW_PATHS_INDIR + f"oi2-empty.txt"
-        out_file = OUTDIR + f"oi2-empty-pathway.txt"
-        runner.parse_output('omicsintegrator2', test_file, out_file)
-        assert filecmp.cmp(out_file, RAW_PATHS_EXPDIR + f"oi2-expected-empty.txt", shallow=False)
-
     def test_oi2_miss_insolution_parse_output(self):
         test_file = RAW_PATHS_INDIR + f"oi2-miss-insolution.txt"
         out_file = OUTDIR + f"oi2-miss-insolution-pathway.txt"
+
         runner.parse_output('omicsintegrator2', test_file, out_file)
-        assert filecmp.cmp(out_file, RAW_PATHS_EXPDIR + f"oi2-expected-empty.txt", shallow=False)
+        assert filecmp.cmp(out_file, EXPDIR + f"empty-pathway-expected.txt", shallow=False)
 
     def test_oi2_wrong_order_parse_output(self):
         test_file = RAW_PATHS_INDIR + f"oi2-wrong-order.txt"
         out_file = OUTDIR + f"oi2-wrong-order-pathway.txt"
+
         runner.parse_output('omicsintegrator2', test_file, out_file)
-        assert filecmp.cmp(out_file, RAW_PATHS_EXPDIR + f"oi2-expected-empty.txt", shallow=False)
+        assert filecmp.cmp(out_file, EXPDIR + f"empty-pathway-expected.txt", shallow=False)