Merge branch '1.0-bugfix'

[vlc] / src / test / url.c

diff --git a/src/test/url.c b/src/test/url.c
index df8961704d8159a6f9e2857a4b2349fd22556b80..875c9a5f7b37a588f8fbba482e712428abe679b7 100644 (file)
--- a/src/test/url.c
+++ b/src/test/url.c
@@ -19,11 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include "vlc_url.h"
+#include "vlc_strings.h"
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <assert.h>
 
 typedef char * (*conv_t) (const char *);
 
@@ -55,8 +61,24 @@ static inline void test_b64 (const char *in, const char *out)
     test (vlc_b64_encode, in, out);
 }
 
+static inline void test_path (const char *in, const char *out)
+{
+    test (make_URI, in, out);
+}
+
+static inline void test_current_directory_path (const char *in, const char *cwd, const char *out)
+{
+    char * expected_result = NULL;
+    int val = asprintf(&expected_result, "file://%s/%s", cwd, out);
+    assert (val != -1);
+    
+    test (make_URI, in, expected_result);
+}
+
 int main (void)
 {
+    int val;
+
     (void)setvbuf (stdout, NULL, _IONBF, 0);
     test_decode ("this_should_not_be_modified_1234",
                  "this_should_not_be_modified_1234");
@@ -81,10 +103,38 @@ int main (void)
 
     /* Base 64 tests */
     test_b64 ("", "");
-    test_b64 ("d", "ZA==");
-    test_b64 ("ab", "YWI=");
-    test_b64 ("abc", "YWJj");
-    test_b64 ("abcd", "YWJjZA==");
+    test_b64 ("f", "Zg==");
+    test_b64 ("fo", "Zm8=");
+    test_b64 ("foo", "Zm9v");
+    test_b64 ("foob", "Zm9vYg==");
+    test_b64 ("fooba", "Zm9vYmE=");
+    test_b64 ("foobar", "Zm9vYmFy");
+
+    /* Path test */
+    test_path ("file:///", "file:///");
+    test_path ("http://www.example.com/%7Ejohn/",
+               "http://www.example.com/%7Ejohn/");
+    test_path ("/", "file:///");
+    test_path ("/home/john/", "file:///home/john/");
+    test_path ("/home/john/music.ogg", "file:///home/john/music.ogg");
+    //test_path ("\\\\server/pub/music.ogg", "file://server/pub/music.ogg");
+
+    /*int fd = open (".", O_RDONLY);
+    assert (fd != -1);*/
+    val = chdir ("/tmp");
+    assert (val != -1);
+
+    char buf[256];
+    char * tmpdir;
+    tmpdir = getcwd(buf, sizeof(buf)/sizeof(*buf));
+    assert (tmpdir);
+
+    test_current_directory_path ("movie.ogg", tmpdir, "movie.ogg");
+    test_current_directory_path (".", tmpdir, ".");
+    test_current_directory_path ("", tmpdir, "");
+
+    /*val = fchdir (fd);
+    assert (val != -1);*/
 
     return 0;
 }