test: fix deprecation warnings in unit tests

Author: ntamas

src/_igraph/convert.c

@@ -266,6 +266,7 @@ int igraphmodule_PyObject_to_attribute_combination_type_t(PyObject* o,
   static igraphmodule_enum_translation_table_entry_t attribute_combination_type_tt[] = {
         {"ignore", IGRAPH_ATTRIBUTE_COMBINE_IGNORE},
         {"sum", IGRAPH_ATTRIBUTE_COMBINE_SUM},
+        {"prod", IGRAPH_ATTRIBUTE_COMBINE_PROD},
         {"product", IGRAPH_ATTRIBUTE_COMBINE_PROD},
         {"min", IGRAPH_ATTRIBUTE_COMBINE_MIN},
         {"max", IGRAPH_ATTRIBUTE_COMBINE_MAX},
@@ -274,6 +275,7 @@ int igraphmodule_PyObject_to_attribute_combination_type_t(PyObject* o,
         {"last", IGRAPH_ATTRIBUTE_COMBINE_LAST},
         {"mean", IGRAPH_ATTRIBUTE_COMBINE_MEAN},
         {"median", IGRAPH_ATTRIBUTE_COMBINE_MEDIAN},
+        {"concat", IGRAPH_ATTRIBUTE_COMBINE_CONCAT},
         {"concatenate", IGRAPH_ATTRIBUTE_COMBINE_CONCAT},
         {0, 0}
   };
@@ -483,6 +485,7 @@ int igraphmodule_PyObject_to_community_comparison_t(PyObject *o,
         {"nmi", IGRAPH_COMMCMP_NMI},
         {"danon", IGRAPH_COMMCMP_NMI},
         {"split-join", IGRAPH_COMMCMP_SPLIT_JOIN},
+        {"split_join", IGRAPH_COMMCMP_SPLIT_JOIN},
         {"rand", IGRAPH_COMMCMP_RAND},
         {"adjusted_rand", IGRAPH_COMMCMP_ADJUSTED_RAND},
         {0,0}

src/igraph/clustering.py

@@ -352,7 +352,7 @@ def cluster_graph(self, combine_vertices=None, combine_edges=None):
         """
         result = self.graph.copy()
         result.contract_vertices(self.membership, combine_vertices)
-        if combine_edges != False:
+        if combine_edges is not False:
             result.simplify(combine_edges=combine_edges)
         return result
 

tests/test_conversion.py

@@ -64,7 +64,6 @@ def testToDirectedAcyclic(self):
         graph.to_directed("acyclic")
         self.assertTrue(graph.is_directed())
         self.assertTrue(graph.vcount() == 5)
-        print(graph.get_edgelist())
         self.assertTrue(
             sorted(graph.get_edgelist())
             == [(0, 1), (0, 2), (0, 3), (0, 3), (2, 4)]

tests/test_decomposition.py

@@ -583,7 +583,7 @@ def testCompareNMI(self):
 
     def testCompareSplitJoin(self):
         expected = [0, 3, 5, 11]
-        self._testMethod("split", expected)
+        self._testMethod("split_join", expected)
         l1 = [1, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3]
         l2 = [3, 1, 2, 1, 3, 1, 3, 1, 2, 1, 4, 2]
         self.assertEqual(split_join_distance(l1, l2), (6, 5))

tests/test_structural.py

@@ -434,7 +434,7 @@ def testHubScore(self):
 
     def testCoreness(self):
         g = Graph.Full(4) + Graph(4) + [(0, 4), (1, 5), (2, 6), (3, 7)]
-        self.assertEqual(g.coreness("A"), [3, 3, 3, 3, 1, 1, 1, 1])
+        self.assertEqual(g.coreness("all"), [3, 3, 3, 3, 1, 1, 1, 1])
 
 
 class NeighborhoodTests(unittest.TestCase):