[taler-merchant] branch master updated: add test for /public/config

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 5d67517  add test for /public/config
5d67517 is described below

commit 5d67517af45c4f652baa97242e090a52f966739f
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Apr 7 16:03:37 2020 +0200

    add test for /public/config
---
 src/include/taler_merchant_testing_lib.h |  16 +++
 src/lib/Makefile.am                      |   1 +
 src/lib/test_merchant_api.c              |   3 +
 src/lib/testing_api_cmd_config.c         | 164 +++++++++++++++++++++++++++++++
 4 files changed, 184 insertions(+)

diff --git a/src/include/taler_merchant_testing_lib.h 
b/src/include/taler_merchant_testing_lib.h
index 30b1bdf..e7c47f1 100644
--- a/src/include/taler_merchant_testing_lib.h
+++ b/src/include/taler_merchant_testing_lib.h
@@ -65,6 +65,22 @@ TALER_TESTING_run_merchant (const char *config_filename,
 
 /* ************** Specific interpreter commands ************ */
 
+
+/**
+ * Define a "config" CMD.
+ *
+ * @param label command label.
+ * @param merchant_url base URL of the merchant serving the
+ *        "config" request.
+ * @param http_code expected HTTP response code.
+ * @return the command.
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_config (const char *label,
+                          const char *merchant_url,
+                          unsigned int http_code);
+
+
 /**
  * Make the "proposal" command.
  *
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 02fd2a4..3d42777 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -47,6 +47,7 @@ libtalermerchant_la_LIBADD = \
 
 libtalermerchanttesting_la_SOURCES = \
   testing_api_cmd_check_payment.c \
+  testing_api_cmd_config.c \
   testing_api_cmd_history.c \
   testing_api_cmd_pay.c \
   testing_api_cmd_pay_abort.c \
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
index 6791fac..5f366f0 100644
--- a/src/lib/test_merchant_api.c
+++ b/src/lib/test_merchant_api.c
@@ -833,6 +833,9 @@ run (void *cls,
   };
 
   struct TALER_TESTING_Command commands[] = {
+    TALER_TESTING_cmd_config ("config",
+                              merchant_url,
+                              MHD_HTTP_OK),
     TALER_TESTING_cmd_batch ("pay",
                              pay),
     TALER_TESTING_cmd_batch ("double-spending",
diff --git a/src/lib/testing_api_cmd_config.c b/src/lib/testing_api_cmd_config.c
new file mode 100644
index 0000000..3e63869
--- /dev/null
+++ b/src/lib/testing_api_cmd_config.c
@@ -0,0 +1,164 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2020 Taler Systems SA
+
+  TALER is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 3, or
+  (at your option) any later version.
+
+  TALER 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 General Public License for more details.
+
+  You should have received a copy of the GNU General Public
+  License along with TALER; see the file COPYING.  If not, see
+  <http://www.gnu.org/licenses/>
+*/
+
+/**
+ * @file lib/testing_api_cmd_config.c
+ * @brief command to test config request
+ * @author Christian Grothoff
+ */
+
+#include "platform.h"
+#include <taler/taler_exchange_service.h>
+#include <taler/taler_testing_lib.h>
+#include "taler_merchant_service.h"
+#include "taler_merchant_testing_lib.h"
+
+
+/**
+ * State for a "config" CMD.
+ */
+struct ConfigState
+{
+  /**
+   * Operation handle for a GET /public/config request.
+   */
+  struct TALER_MERCHANT_ConfigGetHandle *vgh;
+
+  /**
+   * Base URL of the merchant serving the request.
+   */
+  const char *merchant_url;
+
+  /**
+   * Expected HTTP response code.
+   */
+  unsigned int http_code;
+
+  /**
+   * Interpreter state.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+};
+
+
+/**
+ * Free the state of a "config" CMD, and
+ * possibly cancel a pending "config" operation.
+ *
+ * @param cls closure with the `struct ConfigState`
+ * @param cmd command currently being freed.
+ */
+static void
+config_cleanup (void *cls,
+                const struct TALER_TESTING_Command *cmd)
+{
+  struct ConfigState *cs = cls;
+
+  if (NULL != cs->vgh)
+  {
+    TALER_LOG_WARNING ("config operation did not complete\n");
+    TALER_MERCHANT_config_get_cancel (cs->vgh);
+  }
+  GNUNET_free (cs);
+}
+
+
+/**
+ * Process "GET /public/config" (lookup) response.
+ *
+ * @param cls closure
+ * @param hr HTTP response we got
+ * @param ci basic information about the merchant
+ * @param compat protocol compatibility information
+ */
+static void
+config_cb (void *cls,
+           const struct TALER_MERCHANT_HttpResponse *hr,
+           const struct TALER_MERCHANT_ConfigInformation *ci,
+           enum TALER_MERCHANT_VersionCompatibility compat)
+{
+  struct ConfigState *cs = cls;
+
+  (void) ci;
+  cs->vgh = NULL;
+  if (cs->http_code != hr->http_status)
+    TALER_TESTING_FAIL (cs->is);
+  if (TALER_MERCHANT_VC_MATCH != compat)
+    TALER_TESTING_FAIL (cs->is);
+  TALER_TESTING_interpreter_next (cs->is);
+}
+
+
+/**
+ * Run the "config" CMD.
+ *
+ * @param cls closure.
+ * @param cmd command being currently run.
+ * @param is interpreter state.
+ */
+static void
+config_run (void *cls,
+            const struct TALER_TESTING_Command *cmd,
+            struct TALER_TESTING_Interpreter *is)
+{
+  struct ConfigState *cs = cls;
+
+  cs->is = is;
+  cs->vgh = TALER_MERCHANT_config_get (is->ctx,
+                                       cs->merchant_url,
+                                       &config_cb,
+                                       cs);
+  GNUNET_assert (NULL != cs->vgh);
+}
+
+
+/**
+ * Define a "config" CMD.
+ *
+ * @param label command label.
+ * @param merchant_url base URL of the merchant serving the
+ *        "config" request.
+ * @param http_code expected HTTP response code.
+ * @return the command.
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_config (const char *label,
+                          const char *merchant_url,
+                          unsigned int http_code)
+{
+  struct ConfigState *cs;
+
+  cs = GNUNET_new (struct ConfigState);
+  cs->merchant_url = merchant_url;
+  cs->http_code = http_code;
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = cs,
+      .label = label,
+      .run = &config_run,
+      .cleanup = &config_cleanup
+    };
+
+    return cmd;
+  }
+}
+
+
+/* end of testing_api_cmd_config.c */

-- 
To stop receiving notification emails like this one, please contact
address@hidden.