From 2b400943d9a2afd61708d7281e20fd0b447501cd Mon Sep 17 00:00:00 2001 From: Pietro Cerutti Date: Wed, 22 May 2019 14:12:52 +0000 Subject: [PATCH] Run clang-format over test/address --- test/address/mutt_addrlist_parse.c | 14 +++++++------- test/address/mutt_addrlist_parse2.c | 6 ++++-- test/address/mutt_addrlist_remove_xrefs.c | 3 ++- test/address/mutt_addrlist_to_intl.c | 21 ++++++--------------- test/address/mutt_addrlist_to_local.c | 1 - test/address/mutt_addrlist_write.c | 9 ++++++--- 6 files changed, 25 insertions(+), 29 deletions(-) diff --git a/test/address/mutt_addrlist_parse.c b/test/address/mutt_addrlist_parse.c index e96863a15..d597d0ffb 100644 --- a/test/address/mutt_addrlist_parse.c +++ b/test/address/mutt_addrlist_parse.c @@ -56,19 +56,19 @@ void test_mutt_addrlist_parse(void) { struct AddressList alist = TAILQ_HEAD_INITIALIZER(alist); - int parsed = mutt_addrlist_parse(&alist, - "Complete , Incomplete , Incomplete ," - "My Group: member1@group.org, member2@group.org, " - "\"John M. Doe\" ; Another One , " - "Elvis (The Pelvis) Presley "); + int parsed = mutt_addrlist_parse( + &alist, "Simple Address ," + "My Group: member1@group.org, member2@group.org, " + "\"John M. Doe\" ; Another One , " + "Elvis (The Pelvis) Presley "); TEST_CHECK(parsed == 6); TEST_CHECK(!TAILQ_EMPTY(&alist)); struct Address *a = TAILQ_FIRST(&alist); diff --git a/test/address/mutt_addrlist_parse2.c b/test/address/mutt_addrlist_parse2.c index 66e097b47..5c1f941dc 100644 --- a/test/address/mutt_addrlist_parse2.c +++ b/test/address/mutt_addrlist_parse2.c @@ -51,7 +51,8 @@ void test_mutt_addrlist_parse2(void) { /* Not extremely nice, but this is the way it works... */ struct AddressList alist = TAILQ_HEAD_INITIALIZER(alist); - int parsed = mutt_addrlist_parse2(&alist, "test@example.com John Doe "); + int parsed = mutt_addrlist_parse2( + &alist, "test@example.com John Doe "); TEST_CHECK(parsed == 1); TEST_CHECK(!TAILQ_EMPTY(&alist)); struct Address *a = TAILQ_FIRST(&alist); @@ -62,7 +63,8 @@ void test_mutt_addrlist_parse2(void) { struct AddressList alist = TAILQ_HEAD_INITIALIZER(alist); - int parsed = mutt_addrlist_parse2(&alist, "test@example.com john@doe.org foo@bar.baz"); + int parsed = mutt_addrlist_parse2( + &alist, "test@example.com john@doe.org foo@bar.baz"); TEST_CHECK(parsed == 3); TEST_CHECK(!TAILQ_EMPTY(&alist)); struct Address *a = TAILQ_FIRST(&alist); diff --git a/test/address/mutt_addrlist_remove_xrefs.c b/test/address/mutt_addrlist_remove_xrefs.c index 2035acc58..d67d4b42d 100644 --- a/test/address/mutt_addrlist_remove_xrefs.c +++ b/test/address/mutt_addrlist_remove_xrefs.c @@ -66,7 +66,8 @@ void test_mutt_addrlist_remove_xrefs(void) mutt_addrlist_append(&al1, mutt_addr_create(NULL, "john@doe.org")); mutt_addrlist_append(&al1, mutt_addr_create(NULL, "foo@bar.baz")); mutt_addrlist_append(&al2, mutt_addr_create(NULL, "foo@bar.baz")); - mutt_addrlist_append(&al2, mutt_addr_create(NULL, "mr.pink@reservoir.movie")); + mutt_addrlist_append(&al2, + mutt_addr_create(NULL, "mr.pink@reservoir.movie")); mutt_addrlist_remove_xrefs(&al1, &al2); struct Address *a = TAILQ_FIRST(&al1); TEST_CHECK_STR_EQ("foo@example.com", a->mailbox); diff --git a/test/address/mutt_addrlist_to_intl.c b/test/address/mutt_addrlist_to_intl.c index 09b1b687a..7ea34a8ad 100644 --- a/test/address/mutt_addrlist_to_intl.c +++ b/test/address/mutt_addrlist_to_intl.c @@ -43,23 +43,14 @@ void test_mutt_addrlist_to_intl(void) } { - struct { + struct + { const char *local; const char *intl; - } local2intl[] = { - { - .local = "test@äöüss.com", - .intl = "test@xn--ss-uia6e4a.com" - }, - { - .local = "test@nixieröhre.nixieclock-tube.com", - .intl = "test@xn--nixierhre-57a.nixieclock-tube.com" - }, - { - .local = "test@வலைப்பூ.com", - .intl = "test@xn--xlcawl2e7azb.com" - } - }; + } local2intl[] = { { .local = "test@äöüss.com", .intl = "test@xn--ss-uia6e4a.com" }, + { .local = "test@nixieröhre.nixieclock-tube.com", + .intl = "test@xn--nixierhre-57a.nixieclock-tube.com" }, + { .local = "test@வலைப்பூ.com", .intl = "test@xn--xlcawl2e7azb.com" } }; C_Charset = "utf-8"; C_IdnEncode = true; diff --git a/test/address/mutt_addrlist_to_local.c b/test/address/mutt_addrlist_to_local.c index 0f871b46e..78913f158 100644 --- a/test/address/mutt_addrlist_to_local.c +++ b/test/address/mutt_addrlist_to_local.c @@ -39,5 +39,4 @@ void test_mutt_addrlist_to_local(void) // Back and forth tests (to_intl <-> to_local) are done in // test_mutt_addrlist_to_intl } - } diff --git a/test/address/mutt_addrlist_write.c b/test/address/mutt_addrlist_write.c index cb5af1097..6d2956676 100644 --- a/test/address/mutt_addrlist_write.c +++ b/test/address/mutt_addrlist_write.c @@ -44,7 +44,8 @@ void test_mutt_addrlist_write(void) { struct AddressList al = TAILQ_HEAD_INITIALIZER(al); - const char in[] = "test@example.com, John Doe , \"Foo J. Bar\" "; + const char in[] = "test@example.com, John Doe , \"Foo J. " + "Bar\" "; int parsed = mutt_addrlist_parse(&al, in); TEST_CHECK(parsed == 3); @@ -73,8 +74,10 @@ void test_mutt_addrlist_write(void) char buf[76] = { 0 }; size_t nbytes = mutt_addrlist_write(buf, sizeof(buf), &al, false); TEST_CHECK(nbytes == sizeof(buf) - 1); - TEST_CHECK_STR_EQ("test@example.com, John Doe , \"Foo J. Bar\" ", buf); - TEST_CHECK(buf[sizeof(in)-1] == '\0'); + TEST_CHECK_STR_EQ("test@example.com, John Doe , \"Foo J. " + "Bar\" ", + buf); + TEST_CHECK(buf[sizeof(in) - 1] == '\0'); } mutt_addrlist_clear(&al); -- 2.40.0