avformat/tests/url: make format more readable

Signed-off-by: Marton Balint <cus@passwd.hu>

diff --git a/libavformat/tests/url.c b/libavformat/tests/url.c
index 1623179128694edf8cd747249631ce58841fb1bc..11ed5bb0b796eb48797823c9cf7b750b3ff4b6da 100644 (file)
--- a/libavformat/tests/url.c
+++ b/libavformat/tests/url.c
@@ -24,7 +24,7 @@ static void test(const char *base, const char *rel)
 {
     char buf[200], buf2[200];
     ff_make_absolute_url(buf, sizeof(buf), base, rel);
-    printf("%s\n", buf);
+    printf("%50s %-20s => %s\n", base, rel, buf);
     if (base) {
         /* Test in-buffer replacement */
         snprintf(buf2, sizeof(buf2), "%s", base);
@@ -38,6 +38,7 @@ static void test(const char *base, const char *rel)
 
 int main(void)
 {
+    printf("Testing ff_make_absolute_url:\n");
     test(NULL, "baz");
     test("/foo/bar", "baz");
     test("/foo/bar", "../baz");

diff --git a/tests/ref/fate/url b/tests/ref/fate/url
index 1a6051ee0fdb940ceb49344e1c03edaf176ed760..b5deba88ae725ebdc247d898f2683b2622b57e43 100644 (file)
--- a/tests/ref/fate/url
+++ b/tests/ref/fate/url
@@ -1,13 +1,14 @@
-baz
-/foo/baz
-/baz
-/baz
-http://server/foo/baz
-http://server/foo/baz
-http://server/baz
-http://server/baz
-http://server/baz
-https://other/url
-http://server/baz
-http://server/foo/bar?someparam
-http://other/url
+Testing ff_make_absolute_url:
+                                            (null) baz                  => baz
+                                          /foo/bar baz                  => /foo/baz
+                                          /foo/bar ../baz               => /baz
+                                          /foo/bar /baz                 => /baz
+                                http://server/foo/ baz                  => http://server/foo/baz
+                             http://server/foo/bar baz                  => http://server/foo/baz
+                                http://server/foo/ ../baz               => http://server/baz
+                         http://server/foo/bar/123 ../../baz            => http://server/baz
+                         http://server/foo/bar/123 /baz                 => http://server/baz
+                         http://server/foo/bar/123 https://other/url    => https://other/url
+    http://server/foo/bar?param=value/with/slashes /baz                 => http://server/baz
+            http://server/foo/bar?param&otherparam ?someparam           => http://server/foo/bar?someparam
+                             http://server/foo/bar //other/url          => http://other/url