[v2,0/3] test-ctype: test all classifiers

Commit Message

René Scharfe Feb. 13, 2023, 9:08 p.m. UTC

Add tests to cover the remaining character class test functions.

Changes since v1:
- More compact and readable isprint() test string specification by
  reusing the one for ispunct().

  test-ctype: test isascii
  test-ctype: test islower and isupper
  test-ctype: test iscntrl, ispunct, isxdigit and isprint

 t/helper/test-ctype.c | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

Interdiff against v1:

Range-diff against v1:
1:  f8a7889fb4 = 1:  f8a7889fb4 test-ctype: test isascii
2:  1e0c313b38 = 2:  1e0c313b38 test-ctype: test islower and isupper
3:  dcaffe6917 < -:  ---------- test-ctype: test iscntrl, ispunct, isxdigit and isprint
-:  ---------- > 3:  cb50e581d4 test-ctype: test iscntrl, ispunct, isxdigit and isprint

--
2.39.1

Comments

Junio C Hamano Feb. 13, 2023, 9:59 p.m. UTC | #1

René Scharfe <[e-mail]> writes:

> Add tests to cover the remaining character class test functions.
>
> Changes since v1:
> - More compact and readable isprint() test string specification by
>   reusing the one for ispunct().

Very nice.  Thanks.

Patch

diff --git a/t/helper/test-ctype.c b/t/helper/test-ctype.c
index d04da0d465..b21bd672d9 100644
--- a/t/helper/test-ctype.c
+++ b/t/helper/test-ctype.c
@@ -33,6 +33,7 @@  static int is_in(const char *s, int ch)
 #define DIGIT "0123456789"
 #define LOWER "abcdefghijklmnopqrstuvwxyz"
 #define UPPER "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+#define PUNCT "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~"
 #define ASCII \
 	"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" \
 	"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f" \
@@ -46,13 +47,6 @@  static int is_in(const char *s, int ch)
 	"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" \
 	"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f" \
 	"\x7f"
-#define PRINT \
-	"\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f" \
-	"\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f" \
-	"\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f" \
-	"\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f" \
-	"\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f" \
-	"\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e"

 int cmd__ctype(int argc, const char **argv)
 {
@@ -67,9 +61,9 @@  int cmd__ctype(int argc, const char **argv)
 	TEST_CLASS(islower, LOWER);
 	TEST_CLASS(isupper, UPPER);
 	TEST_CLASS(iscntrl, CNTRL);
-	TEST_CLASS(ispunct, "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~");
+	TEST_CLASS(ispunct, PUNCT);
 	TEST_CLASS(isxdigit, DIGIT "abcdefABCDEF");
-	TEST_CLASS(isprint, PRINT);
+	TEST_CLASS(isprint, LOWER UPPER DIGIT PUNCT " ");

 	return rc;
 }