Simplify dotmail test environment

The dm_mbox tool is not needed after ff847bb1. Remove it.
Modify dm_mesg to optionally take commands from the command line.
Use it instead of dm_mbox in testcases.

10 files changed, 157 insertions, 245 deletions

diff --git a/libproto/dotmail/tests/.gitignore b/libproto/dotmail/tests/.gitignore
index 3049d1569..015d6e9e8 100644
--- a/libproto/dotmail/tests/.gitignore
+++ b/libproto/dotmail/tests/.gitignore
@@ -1,7 +1,6 @@
 /atconfig
 /atlocal
 /dm_detect
-/dm_mbox
 /dm_mesg
 /dm_qget
 /package.m4
diff --git a/libproto/dotmail/tests/Makefile.am b/libproto/dotmail/tests/Makefile.am
index 8139e51b4..46330db53 100644
--- a/libproto/dotmail/tests/Makefile.am
+++ b/libproto/dotmail/tests/Makefile.am
@@ -40,7 +40,6 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 
 AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ 
 noinst_PROGRAMS = \
- dm_mbox\
  dm_mesg\
  dm_qget\
  dm_detect
diff --git a/libproto/dotmail/tests/append.at b/libproto/dotmail/tests/append.at
index e8950db73..91d9d5635 100644
--- a/libproto/dotmail/tests/append.at
+++ b/libproto/dotmail/tests/append.at
@@ -66,7 +66,7 @@ X-UID: 1034
 
 Then it wasn't very civil of you to offer it
 ])],
-[dm_mbox count],
+[dm_mesg count],
 [# Append new message
 append msg
 # Select it
@@ -92,7 +92,7 @@ Return-Path:alice@wonder.land
 
 4 body_text: Then it wasn't very civil of you to offer it
 
-4
+count: 4
 ])
 
 DM_MESG([append with uid],
@@ -151,7 +151,7 @@ X-UID: 1034
 
 Then it wasn't very civil of you to offer it
 ])],
-[dm_mbox count uidvalidity uidnext],
+[dm_mesg count\; uidvalidity\; uidnext],
 [# Append new message
 append msg
 # Select it
@@ -185,9 +185,9 @@ X-UID:140
 uidvalidity: 1027976406
 uidnext: 141
 sync: OK
-4
-1027976406
-141
+count: 4
+uidvalidity: 1027976406
+uidnext: 141
 ])
 
 DM_MESG([append to empty mailbox],
diff --git a/libproto/dotmail/tests/count.at b/libproto/dotmail/tests/count.at
index d86f429a9..d367e790e 100644
--- a/libproto/dotmail/tests/count.at
+++ b/libproto/dotmail/tests/count.at
@@ -15,7 +15,7 @@
 # along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
 DM_TEST([count],
-[dm_mbox count],
+[dm_mesg count],
 [Received: (from hare@wonder.land) 
         by wonder.land id 3301
         for alice@wonder.land; Mon, 29 Jul 2002 22:00:06 +0100
@@ -54,5 +54,5 @@ Return-Path: hare@wonder.land
 There isn't any
 .
 ],
-[3
+[count: 3
 ])
diff --git a/libproto/dotmail/tests/delete.at b/libproto/dotmail/tests/delete.at
index 212be15c5..84bdadb1b 100644
--- a/libproto/dotmail/tests/delete.at
+++ b/libproto/dotmail/tests/delete.at
@@ -64,7 +64,7 @@ Return-Path: alice@wonder.land
 Then it wasn't very civil of you to offer it
 .
 ],
-[],[dm_mbox count],
+[],[dm_mesg count],
 [# Mark third message as deleted
 3
 set_deleted
@@ -90,5 +90,5 @@ Return-Path:alice@wonder.land
 
 3 body_text: Then it wasn't very civil of you to offer it
 
-3
+count: 3
 ])
diff --git a/libproto/dotmail/tests/dm_mbox.c b/libproto/dotmail/tests/dm_mbox.c
deleted file mode 100644
index f0c67e005..000000000
--- a/libproto/dotmail/tests/dm_mbox.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2019 Free Software Foundation, Inc.
-
-   This library is free software; you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public License
-   along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <mailutils/mailutils.h>
-
-void
-dm_count (mu_mailbox_t mbx)
-{
-  size_t n;
-  MU_ASSERT (mu_mailbox_messages_count (mbx, &n));
-  mu_printf ("%lu\n", (unsigned long) n);
-}
-
-void
-dm_uidvalidity (mu_mailbox_t mbx)
-{
-  unsigned long v;
-  MU_ASSERT (mu_mailbox_uidvalidity (mbx, &v));
-  mu_printf ("%lu\n", v);
-}
-  
-void
-dm_uidnext (mu_mailbox_t mbx)
-{
-  size_t n;
-  MU_ASSERT (mu_mailbox_uidnext (mbx, &n));
-  mu_printf ("%lu\n", (unsigned long) n);
-}
-
-void
-dm_recent (mu_mailbox_t mbx)
-{
-  size_t n;
-  MU_ASSERT (mu_mailbox_messages_recent (mbx, &n));
-  mu_printf ("%lu\n", (unsigned long) n);
-}
-
-void
-dm_unseen (mu_mailbox_t mbx)
-{
-  size_t n;
-  MU_ASSERT (mu_mailbox_message_unseen (mbx, &n));
-  mu_printf ("%lu\n", (unsigned long) n);
-}
-
-typedef void (*dm_action) (mu_mailbox_t);
-
-static struct
-{
-  char *name;
-  dm_action act;
-} actions[] = {
-  { "count", dm_count },
-  { "uidnext", dm_uidnext },
-  { "uidvalidity", dm_uidvalidity },
-  { "recent", dm_recent },
-  { "unseen", dm_unseen },
-  { NULL }
-};
-
-static dm_action
-get_action (char const *s)
-{
-  size_t i;
-
-  for (i = 0; actions[i].name; i++)
-    if (strcmp (actions[i].name, s) == 0)
-      return actions[i].act;
-
-  return NULL;
-}
-
-int
-main (int argc, char **argv)
-{
-  mu_mailbox_t mbx;
-  
-  mu_set_program_name (argv[0]);
-  mu_stdstream_setup (MU_STDSTREAM_RESET_NONE);
-  mu_registrar_record (mu_dotmail_record);
-
-  argc--;