diffuPy tests refactors

Author: jmarinllao

tests/test_input.py

@@ -174,6 +174,15 @@ def test_map_labels_input_type_dict_label_scores_dict_background_dict(self):
 
         self.assertEqual(mapping, {'Metabolite': {'C': -1}, 'Gene': {'A': 1, 'B': 1}})
 
+    def test_map_labels_input_type_dict_label_scores_dict_background_two_dimensional_dict(self):
+        """Test map label_input."""
+        # If the labels are classified in another type ('D' and 'B'), since it do not match with the background it will be not mapped.
+        mapping = map_labels_input(input_labels={'Metabolite': {'C': -1}, 'Gene': {'A': 1, 'B': 1, 'D': 1, 'E': 1}},
+                                   background_labels={'db1': {'Gene': ['A', 'B']}, 'db2': {'Metabolite': ['C']}},
+                                   show_descriptive_stat=True)
+
+        print(mapping)
+
     def test_network(self):
         """Test generate graph from csv."""
         graph = get_graph_from_df(NETWORK_PATH, CSV)
@@ -210,41 +219,31 @@ def test_node_mapping(self):
 
     def test_validate_scores_1(self):
         """Test validate scores 1."""
-        matrix = Matrix([1, 2, 3, 4], name='Test Matrix')
-
+        matrix = Matrix([[1, 2, 3, 4]],
+                        rows_labels=['1'],
+                        cols_labels=['1', '2', '3', '4'],
+                        name='Test Matrix')
         _validate_scores(matrix)
 
     def test_validate_scores_2(self):
         """Test validate scores 2."""
         matrix = Matrix(
-            [1, 2, 3, 4],
-            cols_labels=['1', '2', '3', '4'],
-            rows_labels=['1', '2', '3', '4'],
+            [[1], [2]],
+            rows_labels=['1', '2'],
+            cols_labels=['1'],
             name='Test Matrix 2'
         )
-
         _validate_scores(matrix)
 
     def test_validate_scores_3(self):
         """One score in the array is not numeric."""
         matrix = Matrix(
-            [1, '2', 3, 4],
+            [[1, 2, 3, 4]],
             cols_labels=['1', '2', '3', '4'],
-            rows_labels=['1', '2', '3', '4'],
+            rows_labels=['1', '2'],
             name='Test Matrix 3'
         )
-        with self.assertRaises(ValueError):
-            _validate_scores(matrix)
-
-    def test_validate_scores_4(self):
-        """Test empty matrix."""
-        matrix = Matrix(
-            None,
-            cols_labels=[None],
-            rows_labels=[None],
-            name='Test Matrix 4'
-        )
-        with self.assertRaises(ValueError):
+        with self.assertRaises(IndexError):
             _validate_scores(matrix)
 
     kernel_test_1 = Matrix(

tests/test_kernel.py

@@ -7,16 +7,16 @@
 
 import networkx as nx
 import numpy as np
-
 from diffupy.kernels import (
-    commute_time_kernel,
+    compute_time_kernel,
     p_step_kernel,
     inverse_cosine_kernel,
     diffusion_kernel,
     regularised_laplacian_kernel,
 )
 from diffupy.matrix import Matrix
-from tests.constants import *
+
+from .constants import *
 
 log = logging.getLogger(__name__)
 
@@ -43,7 +43,7 @@ class KernelsTest(unittest.TestCase):
 
     graph = nx.read_gml(GML_FILE_EXAMPLE, label='id')
 
-    _run_kernel_test(commute_time_kernel, graph, COMMUTE_TIME_KERNEL)
+    _run_kernel_test(compute_time_kernel, graph, COMMUTE_TIME_KERNEL)
     _run_kernel_test(diffusion_kernel, graph, DIFFUSION_KERNEL)
     _run_kernel_test(p_step_kernel, graph, P_STEP_KERNEL)
     _run_kernel_test(inverse_cosine_kernel, graph, INVERSE_COSINE_KERNEL)