X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftest%2Furl.c;h=3ae9798140a52fe64f99b280f6cb9f88f872a820;hb=42b03d10ecdcd1e9abbb73f32aa6d5bfb942eea3;hp=61df8475a5c1d0cddcd1216daff20c677f48aa1d;hpb=b40cd0ce13ebf7d7f97433678ad16a29516d30b8;p=vlc

diff --git a/src/test/url.c b/src/test/url.c
index 61df8475a5..3ae9798140 100644
--- a/src/test/url.c
+++ b/src/test/url.c
@@ -19,32 +19,79 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include "vlc_url.h"
+#include "vlc_strings.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+typedef char * (*conv_t) (const char *);
+
+static void test (conv_t f, const char *in, const char *out)
+{
+    char *res;
+
+    printf ("\"%s\" -> \"%s\" ?\n", in, out);
+    res = f (in);
+    if (res == NULL)
+        exit (1);
+
+    if (strcmp (res, out))
+    {
+        printf (" ERROR: got \"%s\"\n", res);
+        exit (2);
+    }
+
+    free (res);
+}
+
+static inline void test_decode (const char *in, const char *out)
+{
+    test (decode_URI_duplicate, in, out);
+}
 
-#undef NDEBUG
-#include <assert.h>
+static inline void test_b64 (const char *in, const char *out)
+{
+    test (vlc_b64_encode, in, out);
+}
 
 int main (void)
 {
-    const char url1[] = "this_should_not_be_modified_1234";
-    const char url2[] = "This+should+be+modified+1234!";
-    const char url3[] = "This%20should%20be%20modified%201234!";
-
-    char *durl = decode_URI_duplicate (url1);
-    assert (durl != NULL);
-    assert (!strcmp (durl, url1));
-    free (durl);
-
-    durl = decode_URI_duplicate (url2);
-    assert (durl != NULL);
-    assert (!strcmp (durl, "This should be modified 1234!"));
-    free (durl);
-
-    durl = decode_URI_duplicate (url3);
-    assert (durl != NULL);
-    assert (!strcmp (durl, "This should be modified 1234!"));
-    free (durl);
+    (void)setvbuf (stdout, NULL, _IONBF, 0);
+    test_decode ("this_should_not_be_modified_1234",
+                 "this_should_not_be_modified_1234");
+
+    test_decode ("This+should+be+modified+1234!",
+                 "This should be modified 1234!");
+
+    test_decode ("This%20should%20be%20modified%201234!",
+                 "This should be modified 1234!");
+
+    test_decode ("%7E", "~");
+
+    /* tests with invalid input */
+    test_decode ("%", "%");
+    test_decode ("%2", "%2");
+    test_decode ("%0000", "");
+
+    /* UTF-8 tests */
+    test_decode ("T%C3%a9l%c3%A9vision+%e2%82%Ac", "Télévision €");
+    test_decode ("T%E9l%E9vision", "T?l?vision");
+    test_decode ("%C1%94%C3%a9l%c3%A9vision", "??élévision"); /* overlong */
+
+    /* Base 64 tests */
+    test_b64 ("", "");
+    test_b64 ("f", "Zg==");
+    test_b64 ("fo", "Zm8=");
+    test_b64 ("foo", "Zm9v");
+    test_b64 ("foob", "Zm9vYg==");
+    test_b64 ("fooba", "Zm9vYmE=");
+    test_b64 ("foobar", "Zm9vYmFy");
 
     return 0;
 }