diff --git a/imagery/i.gensig/testsuite/test_i_gensig.py b/imagery/i.gensig/testsuite/test_i_gensig.py index 836550fd1e6..cffea461894 100644 --- a/imagery/i.gensig/testsuite/test_i_gensig.py +++ b/imagery/i.gensig/testsuite/test_i_gensig.py @@ -136,28 +136,28 @@ def test_creation(self): self.assertEqual(Sn.sig[0].have_color, 0) self.assertEqual(Sn.sig[0].npoints, 4) self.assertEqual(Sn.sig[0].oclass, 1) - self.assertTrue(abs(Sn.sig[0].mean[0] - 2.9) < 0.1) - self.assertTrue(abs(Sn.sig[0].mean[1] - 7.0) < 0.1) - self.assertTrue(abs(Sn.sig[0].var[0][0] - 0.03) < 0.01) - self.assertTrue(abs(Sn.sig[0].var[1][1] - 0.6) < 0.1) + self.assertLess(abs(Sn.sig[0].mean[0] - 2.9), 0.1) + self.assertLess(abs(Sn.sig[0].mean[1] - 7.0), 0.1) + self.assertLess(abs(Sn.sig[0].var[0][0] - 0.03), 0.01) + self.assertLess(abs(Sn.sig[0].var[1][1] - 0.6), 0.1) # 6 self.assertEqual(Sn.sig[1].status, 1) self.assertEqual(Sn.sig[1].have_color, 0) self.assertEqual(Sn.sig[1].npoints, 4) self.assertEqual(Sn.sig[1].oclass, 6) - self.assertTrue(abs(Sn.sig[1].mean[0] - 8.9) < 0.1) - self.assertTrue(abs(Sn.sig[1].mean[1] - 1.5) < 0.1) - self.assertTrue(abs(Sn.sig[1].var[0][0] - 0.003) < 0.001) - self.assertTrue(abs(Sn.sig[1].var[1][1] - 0.3) < 0.1) + self.assertLess(abs(Sn.sig[1].mean[0] - 8.9), 0.1) + self.assertLess(abs(Sn.sig[1].mean[1] - 1.5), 0.1) + self.assertLess(abs(Sn.sig[1].var[0][0] - 0.003), 0.001) + self.assertLess(abs(Sn.sig[1].var[1][1] - 0.3), 0.1) # 9 self.assertEqual(Sn.sig[2].status, 1) self.assertEqual(Sn.sig[2].have_color, 0) self.assertEqual(Sn.sig[2].npoints, 3) self.assertEqual(Sn.sig[2].oclass, 9) - self.assertTrue(abs(Sn.sig[2].mean[0] - 6.7) < 0.1) - self.assertTrue(abs(Sn.sig[2].mean[1] - 8.3) < 0.1) - self.assertTrue(abs(Sn.sig[2].var[0][0] - 0.043) < 0.01) - self.assertTrue(abs(Sn.sig[2].var[1][1] - 0.3) < 0.1) + self.assertLess(abs(Sn.sig[2].mean[0] - 6.7), 0.1) + self.assertLess(abs(Sn.sig[2].mean[1] - 8.3), 0.1) + self.assertLess(abs(Sn.sig[2].var[0][0] - 0.043), 0.01) + self.assertLess(abs(Sn.sig[2].var[1][1] - 0.3), 0.1) if __name__ == "__main__": diff --git a/imagery/i.svm.predict/testsuite/test_i_svm_predict.py b/imagery/i.svm.predict/testsuite/test_i_svm_predict.py index 3662124f45d..04c52430d59 100644 --- a/imagery/i.svm.predict/testsuite/test_i_svm_predict.py +++ b/imagery/i.svm.predict/testsuite/test_i_svm_predict.py @@ -167,9 +167,9 @@ def test_semantic_label_mismatch2(self): self.tmp_rasts.append(rast) self.assertModuleFail(isvm) self.assertTrue(isvm.outputs.stderr) - self.assertTrue( - "Signature band count: 2, imagery group band count: 3" - in isvm.outputs.stderr + self.assertIn( + "Signature band count: 2, imagery group band count: 3", + isvm.outputs.stderr, ) @unittest.skipIf(shutil.which("i.svm.predict") is None, "i.svm.predict not found.") diff --git a/imagery/i.svm.train/testsuite/test_i_svm_train.py b/imagery/i.svm.train/testsuite/test_i_svm_train.py index af2ab843172..cd8fe518874 100644 --- a/imagery/i.svm.train/testsuite/test_i_svm_train.py +++ b/imagery/i.svm.train/testsuite/test_i_svm_train.py @@ -296,10 +296,10 @@ def test_rescaling(self): lines = rf.readlines() M, R = lines[0].strip().split(" ") self.assertTrue(float(M) > -1 and float(M) < 1) - self.assertTrue(float(R) <= 2) + self.assertLessEqual(float(R), 2) M, R = lines[1].strip().split(" ") self.assertTrue(float(M) > -1 and float(M) < 1) - self.assertTrue(float(R) <= 20) + self.assertLessEqual(float(R), 20) @unittest.skipIf(shutil.which("i.svm.train") is None, "i.svm.train not found.") def test_fail_on_empty_raster(self): diff --git a/lib/imagery/testsuite/test_imagery_signature_management.py b/lib/imagery/testsuite/test_imagery_signature_management.py index 1bc2aecf6df..84b436b0422 100644 --- a/lib/imagery/testsuite/test_imagery_signature_management.py +++ b/lib/imagery/testsuite/test_imagery_signature_management.py @@ -985,7 +985,7 @@ def test_multiple_sigs_multiple_mapsets(self): # As temporary mapset is not in the search path, there must be # at least one sig file present # There could be more sigs if this is not an empty mapset - self.assertTrue(ret >= 1) + self.assertGreaterEqual(ret, 1) ret_list = list(map(utils.decode, sig_list[:ret])) golden = ( f"{rnd_sig1}@{self.rnd_mapset_name}", @@ -1007,7 +1007,7 @@ def test_multiple_sigs_multiple_mapsets(self): shutil.rmtree(sig_dir1) shutil.rmtree(sig_dir2) # There could be more sigs if this is not an empty mapset - self.assertTrue(ret >= 2) + self.assertGreaterEqual(ret, 2) ret_list = list(map(utils.decode, sig_list[:ret])) self.assertIn(golden[0], ret_list) self.assertIn(golden[1], ret_list) @@ -1032,7 +1032,7 @@ def test_multiple_sigsets_multiple_mapsets(self): # As temporary mapset is not in the search path, there must be # at least one sig file present # There could be more sigs if this is not an empty mapset - self.assertTrue(ret >= 1) + self.assertGreaterEqual(ret, 1) ret_list = list(map(utils.decode, sig_list[:ret])) golden = ( f"{rnd_sig1}@{self.rnd_mapset_name}", @@ -1054,7 +1054,7 @@ def test_multiple_sigsets_multiple_mapsets(self): shutil.rmtree(sig_dir1) shutil.rmtree(sig_dir2) # There could be more sigs if this is not an empty mapset - self.assertTrue(ret >= 2) + self.assertGreaterEqual(ret, 2) ret_list = list(map(utils.decode, sig_list[:ret])) self.assertIn(golden[0], ret_list) self.assertIn(golden[1], ret_list) @@ -1080,7 +1080,7 @@ def test_multiple_libsvms_multiple_mapsets(self): # As temporary mapset is not in the search path, there must be # at least one sig file present # There could be more sigs if this is not an empty mapset - self.assertTrue(ret >= 1) + self.assertGreaterEqual(ret, 1) ret_list = list(map(utils.decode, sig_list[:ret])) golden = ( f"{rnd_sig1}@{self.rnd_mapset_name}", @@ -1102,7 +1102,7 @@ def test_multiple_libsvms_multiple_mapsets(self): shutil.rmtree(sig_dir1) shutil.rmtree(sig_dir2) # There could be more sigs if this is not an empty mapset - self.assertTrue(ret >= 2) + self.assertGreaterEqual(ret, 2) ret_list = list(map(utils.decode, sig_list[:ret])) self.assertIn(golden[0], ret_list) self.assertIn(golden[1], ret_list) diff --git a/lib/init/testsuite/test_grass_tmp_mapset.py b/lib/init/testsuite/test_grass_tmp_mapset.py index 8ff92843d25..955074b7143 100644 --- a/lib/init/testsuite/test_grass_tmp_mapset.py +++ b/lib/init/testsuite/test_grass_tmp_mapset.py @@ -98,8 +98,9 @@ def test_mapset_deleted(self): [self.executable, "--tmp-mapset", self.location, "--exec", "g.proj", "-p"] ) for directory in os.listdir(self.location): - self.assertTrue( - directory in self.subdirs, + self.assertIn( + directory, + self.subdirs, msg="Directory {directory} should have been deleted".format(**locals()), ) diff --git a/python/grass/pygrass/vector/testsuite/test_geometry.py b/python/grass/pygrass/vector/testsuite/test_geometry.py index b29557f086d..6e164ca7779 100644 --- a/python/grass/pygrass/vector/testsuite/test_geometry.py +++ b/python/grass/pygrass/vector/testsuite/test_geometry.py @@ -81,9 +81,9 @@ def test_eq(self): point0 = Point(0, 0) point1 = Point(1, 0) self.assertFalse(point0 == point1) - self.assertFalse(point0 == (1, 0)) + self.assertNotEqual(point0, (1, 0)) self.assertTrue(point0 == point0) # noqa: PLR0124 # pylint: disable=R0124 - self.assertTrue(point0 == (0, 0)) + self.assertEqual(point0, (0, 0)) def test_repr(self): """Test __eq__""" diff --git a/python/grass/pygrass/vector/testsuite/test_geometry_attrs.py b/python/grass/pygrass/vector/testsuite/test_geometry_attrs.py index 8fa198bea0d..2e19ca61c3b 100644 --- a/python/grass/pygrass/vector/testsuite/test_geometry_attrs.py +++ b/python/grass/pygrass/vector/testsuite/test_geometry_attrs.py @@ -44,7 +44,7 @@ def test_getitem(self): with self.assertRaises(ValueError) as cm: self.attrs["not_existing_column_name"] - self.assertTrue("not_existing_column_name" in str(cm.exception)) + self.assertIn("not_existing_column_name", str(cm.exception)) def test_setitem(self): """Test __setitem__ magic method""" diff --git a/raster/r.smooth.edgepreserve/testsuite/test_r_smooth_edgepreserve.py b/raster/r.smooth.edgepreserve/testsuite/test_r_smooth_edgepreserve.py index 28b061c8ab4..6102a0283af 100644 --- a/raster/r.smooth.edgepreserve/testsuite/test_r_smooth_edgepreserve.py +++ b/raster/r.smooth.edgepreserve/testsuite/test_r_smooth_edgepreserve.py @@ -109,7 +109,7 @@ def test_exp_i_ram(self): function="exp", quiet=True, ) - self.assertTrue(raster_info(out_map_i)["datatype"] == "CELL") + self.assertEqual(raster_info(out_map_i)["datatype"], "CELL") self.assertRastersEqual(out_map_i, self.ref_exp_i) def test_exp_f_ram(self): @@ -132,7 +132,7 @@ def test_exp_f_ram(self): function="exp", quiet=True, ) - self.assertTrue(raster_info(out_map_f)["datatype"] == "FCELL") + self.assertEqual(raster_info(out_map_f)["datatype"], "FCELL") self.assertRastersEqual(out_map_f, self.ref_exp_f, precision=0.1) def test_exp_d_ram(self): @@ -155,7 +155,7 @@ def test_exp_d_ram(self): function="exp", quiet=True, ) - self.assertTrue(raster_info(out_map_d)["datatype"] == "DCELL") + self.assertEqual(raster_info(out_map_d)["datatype"], "DCELL") self.assertRastersEqual(out_map_d, self.ref_exp_f, precision=0.1) def test_quad_ram(self): diff --git a/temporal/t.rename/testsuite/test_t_rename.py b/temporal/t.rename/testsuite/test_t_rename.py index 13b94f411a4..b65d22af342 100755 --- a/temporal/t.rename/testsuite/test_t_rename.py +++ b/temporal/t.rename/testsuite/test_t_rename.py @@ -140,7 +140,7 @@ def test_rename(self): print(gs.read_command("t.info", type="strds", input="precip_abs6")) self.assertEqual(strds.metadata.get_description(), "This is the 3 test strds") - self.assertTrue("t.rename" in strds.metadata.get_command()) + self.assertIn("t.rename", strds.metadata.get_command()) def test_rename_with_overwrite(self): """Test renaming a space time raster dataset while overwriting @@ -159,7 +159,7 @@ def test_rename_with_overwrite(self): print(gs.read_command("t.info", type="strds", input="precip_abs2")) self.assertEqual(strds.metadata.get_description(), "This is the 1 test strds") - self.assertTrue("t.rename" in strds.metadata.get_command()) + self.assertIn("t.rename", strds.metadata.get_command()) def test_fail_overwrite_without_flag(self): """Test that renaming a space time raster dataset fails if the