snake_case assertStrContentEqual to assert_str_content_equal

Author: janosh

pymatgen/analysis/tests/test_graphs.py

@@ -288,8 +288,8 @@ def test_str(self):
         # don't care about testing Py 2.7 unicode support,
         # change Å to A
         self.mos2_sg.graph.graph["edge_weight_units"] = "A"
-        self.assertStrContentEqual(str(self.square_sg), square_sg_str_ref)
-        self.assertStrContentEqual(str(self.mos2_sg), mos2_sg_str_ref)
+        self.assert_str_content_equal(str(self.square_sg), square_sg_str_ref)
+        self.assert_str_content_equal(str(self.mos2_sg), mos2_sg_str_ref)
 
     def test_mul(self):
         square_sg_mul = self.square_sg * (2, 1, 1)
@@ -323,7 +323,7 @@ def test_mul(self):
         square_sg_mul_ref_str = "\n".join(square_sg_mul_ref_str.splitlines()[11:])
         square_sg_mul_actual_str = "\n".join(square_sg_mul_actual_str.splitlines()[11:])
 
-        self.assertStrContentEqual(square_sg_mul_actual_str, square_sg_mul_ref_str)
+        self.assert_str_content_equal(square_sg_mul_actual_str, square_sg_mul_ref_str)
 
         # test sequential multiplication
         sq_sg_1 = self.square_sg * (2, 2, 1)

pymatgen/symmetry/tests/test_maggroups.py

@@ -109,7 +109,7 @@ def test_symmetry_ops(self):
 -x+5/4, y+1/2, -z+3/4, -1
 -x+1/2, y+3/4, z+1/4, -1
 x+3/4, -y+1/2, z+1/4, -1"""
-        self.assertStrContentEqual(msg_1_symmops, msg_1_symmops_ref)
+        self.assert_str_content_equal(msg_1_symmops, msg_1_symmops_ref)
 
         msg_2_symmops = "\n".join(map(str, self.msg_2.symmetry_ops))
         msg_2_symmops_ref = """x, y, z, +1
@@ -120,7 +120,7 @@ def test_symmetry_ops(self):
 -x+1/2, -y, z+1/2, -1
 -x+1/2, y+1/2, z+1/2, -1
 x+1/2, y, -z+1/2, -1"""
-        self.assertStrContentEqual(msg_2_symmops, msg_2_symmops_ref)
+        self.assert_str_content_equal(msg_2_symmops, msg_2_symmops_ref)
 
         msg_3_symmops = "\n".join(map(str, self.msg_3.symmetry_ops))
         msg_3_symmops_ref = """x, y, z, +1
@@ -200,8 +200,8 @@ def test_str(self):
 2b  (0,y,1/2;mx,0,mz) (0,y+1,-1/2;-mx,0,-mz)
 2a  (0,y,0;mx,0,mz) (0,y+1,0;-mx,0,-mz)"""
 
-        self.assertStrContentEqual(str(msg), ref_string)
-        self.assertStrContentEqual(msg.data_str(), ref_string_all)
+        self.assert_str_content_equal(str(msg), ref_string)
+        self.assert_str_content_equal(msg.data_str(), ref_string_all)
 
 
 if __name__ == "__main__":

pymatgen/util/testing.py

@@ -66,7 +66,7 @@ def assert_all_close(actual, desired, decimal=7, err_msg="", verbose=True):
         return assert_allclose(actual, desired, atol=10**-decimal, err_msg=err_msg, verbose=verbose)
 
     @staticmethod
-    def assertStrContentEqual(actual, desired, err_msg="", verbose=True):
+    def assert_str_content_equal(actual, desired, err_msg="", verbose=True):
         """
         Tests if two strings are equal, ignoring things like trailing spaces, etc.
         """