From f32d9b1b10d38198d1f79dddcb3b29af2f8b51ec Mon Sep 17 00:00:00 2001 From: Common Lisp at Google Date: Tue, 6 Oct 2026 05:21:36 -0700 Subject: [PATCH] Remove assert-macro-error, expect-macro-error, and expect-macro-warning PiperOrigin-RevId: 994327789 --- flag-test.lisp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/flag-test.lisp b/flag-test.lisp index 5774f05..4a9e666 100644 --- a/flag-test.lisp +++ b/flag-test.lisp @@ -527,12 +527,13 @@ doc has embedded (test-missing-value "--some_flag")) (deftest invalid-names-test () - (expect-macro-warning (flag:define *f* t "na" :name "an_underscore-and-hyphens" :type integer)) - (expect-macro-warning (flag:define *f* t "na" :name "3rror" :type integer)) - (expect-macro-warning (flag:define *f* t "na" :names ("a-dash" "3rror") :type integer)) - (expect-macro-warning (flag:define *.* t "na" :type integer)) - (expect-macro-warning (flag:define *f.* t "na" :type integer)) - (expect-macro-warning (flag:define *funny/flag* t "na" :type integer))) + (expect-warning + (macroexpand '(flag:define *f* t "na" :name "an_underscore-and-hyphens" :type integer))) + (expect-warning (macroexpand '(flag:define *f* t "na" :name "3rror" :type integer))) + (expect-warning (macroexpand '(flag:define *f* t "na" :names ("a-dash" "3rror") :type integer))) + (expect-warning (macroexpand '(flag:define *.* t "na" :type integer))) + (expect-warning (macroexpand '(flag:define *f.* t "na" :type integer))) + (expect-warning (macroexpand '(flag:define *funny/flag* t "na" :type integer)))) (test-define *boo* t "Short test boolean flag." :names ("boo" "B")) @@ -704,7 +705,7 @@ doc has embedded (expect-error (parse-command-line* '("--color=orange"))))) (deftest syntax-errors () - (expect-macro-warning (flag:define *s* t "na" :name "s" :type vector))) + (expect-warning (macroexpand '(flag:define *s* t "na" :name "s" :type vector)))) (test-define *no-go* nil "no doc" :name "nogo" :type boolean) (test-define *rth* nil "no doc" :name "rth" :type boolean)