test/parser: Add check_resolved_url_resource

Add a check for external URL resources.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/test/parser/parser-test.h b/test/parser/parser-test.h
index 9d9ec7e77d0bf4acdf0939a6dc9dc9b66c5ad41b..53296180e3291b7a74c01b9c39d06194056bd4d8 100644 (file)
--- a/test/parser/parser-test.h
+++ b/test/parser/parser-test.h
@@ -85,6 +85,14 @@ void __check_resolved_local_resource(struct resource *res,
                struct discover_device *dev, const char *local_path,
                const char *file, int line);
 
                struct discover_device *dev, const char *local_path,
                const char *file, int line);
 

+/**
+ * Check that a resource (@res) is present, resolved, and has a URL of
+ * @url.
+ */
+#define check_resolved_url_resource(res, url) \
+       __check_resolved_url_resource(res, url, __FILE__, __LINE__)
+void __check_resolved_url_resource(struct resource *res,
+               const char *url, const char *file, int line);

 /**
  * Check that a resource (@res) is present but not resolved
  */
 /**
  * Check that a resource (@res) is present but not resolved
  */

diff --git a/test/parser/utils.c b/test/parser/utils.c
index f1604e06a30c0dedd8f3dcbbdd8de4f80fab9ca1..3e218e4af07d35292ab2acfde23cb9da2f7dd475 100644 (file)
--- a/test/parser/utils.c
+++ b/test/parser/utils.c
@@ -287,6 +287,26 @@ void __check_resolved_local_resource(struct resource *res,
        }
 }
 
        }
 }
 

+void __check_resolved_url_resource(struct resource *res,
+               const char *url, const char *file, int line)
+{
+       char *res_url;
+
+       if (!res)
+               errx(EXIT_FAILURE, "%s:%d: No resource", file, line);
+
+       if (!res->resolved)
+               errx(EXIT_FAILURE, "%s:%d: Resource is not resolved",
+                               file, line);
+
+       res_url = pb_url_to_string(res->url);
+       if (strcmp(url, res_url)) {
+               fprintf(stderr, "%s:%d: Resource mismatch\n", file, line);
+               fprintf(stderr, "  got      '%s'\n", res_url);
+               fprintf(stderr, "  expected '%s'\n", url);
+               exit(EXIT_FAILURE);
+       }
+}

 void __check_unresolved_resource(struct resource *res,
                const char *file, int line)
 {
 void __check_unresolved_resource(struct resource *res,
                const char *file, int line)
 {