fix SingletonTest

[folly.git] / folly / test / UriTest.cpp

diff --git a/folly/test/UriTest.cpp b/folly/test/UriTest.cpp
index 710ad2c7a7f8e35ad7f2a3b0301562d6b375bd09..1431d63da0e74389eb691d0536d41b366a737ec3 100644 (file)
--- a/folly/test/UriTest.cpp
+++ b/folly/test/UriTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,15 @@
  * limitations under the License.
  */
 
-#include "folly/Uri.h"
+#include <folly/Uri.h>
+#include <folly/portability/GTest.h>
 
 #include <boost/algorithm/string.hpp>
 #include <glog/logging.h>
-#include <gtest/gtest.h>
+#include <map>
 
 using namespace folly;
 
-namespace {
-
-}  // namespace
-
 TEST(Uri, Simple) {
   {
     fbstring s("http://www.facebook.com/hello/world?query#fragment");
@@ -79,6 +76,7 @@ TEST(Uri, Simple) {
     EXPECT_EQ("", u.username());
     EXPECT_EQ("", u.password());
     EXPECT_EQ("[::1]", u.host());
+    EXPECT_EQ("::1", u.hostname());
     EXPECT_EQ(8080, u.port());
     EXPECT_EQ("[::1]:8080", u.authority());
     EXPECT_EQ("/hello/world", u.path());
@@ -87,6 +85,38 @@ TEST(Uri, Simple) {
     EXPECT_EQ(s, u.fbstr());  // canonical
   }
 
+  {
+    fbstring s("http://[2401:db00:20:7004:face:0:29:0]:8080/hello/world?query");
+    Uri u(s);
+    EXPECT_EQ("http", u.scheme());
+    EXPECT_EQ("", u.username());
+    EXPECT_EQ("", u.password());
+    EXPECT_EQ("[2401:db00:20:7004:face:0:29:0]", u.host());
+    EXPECT_EQ("2401:db00:20:7004:face:0:29:0", u.hostname());
+    EXPECT_EQ(8080, u.port());
+    EXPECT_EQ("[2401:db00:20:7004:face:0:29:0]:8080", u.authority());
+    EXPECT_EQ("/hello/world", u.path());
+    EXPECT_EQ("query", u.query());
+    EXPECT_EQ("", u.fragment());
+    EXPECT_EQ(s, u.fbstr());  // canonical
+  }
+
+  {
+    fbstring s("http://[2401:db00:20:7004:face:0:29:0]/hello/world?query");
+    Uri u(s);
+    EXPECT_EQ("http", u.scheme());
+    EXPECT_EQ("", u.username());
+    EXPECT_EQ("", u.password());
+    EXPECT_EQ("[2401:db00:20:7004:face:0:29:0]", u.host());
+    EXPECT_EQ("2401:db00:20:7004:face:0:29:0", u.hostname());
+    EXPECT_EQ(0, u.port());
+    EXPECT_EQ("[2401:db00:20:7004:face:0:29:0]", u.authority());
+    EXPECT_EQ("/hello/world", u.path());
+    EXPECT_EQ("query", u.query());
+    EXPECT_EQ("", u.fragment());
+    EXPECT_EQ(s, u.fbstr());  // canonical
+  }
+
   {
     fbstring s("http://user:pass@host.com/");
     Uri u(s);
@@ -204,7 +234,7 @@ TEST(Uri, Simple) {
     EXPECT_EQ("/etc/motd", u.path());
     EXPECT_EQ("", u.query());
     EXPECT_EQ("", u.fragment());
-    EXPECT_EQ("file:///etc/motd", u.fbstr());
+    EXPECT_EQ("file:/etc/motd", u.fbstr());
   }
 
   {
@@ -222,6 +252,73 @@ TEST(Uri, Simple) {
     EXPECT_EQ(s, u.fbstr());
   }
 
+  {
+    // test query parameters
+    fbstring s("http://localhost?&key1=foo&key2=&key3&=bar&=bar=&");
+    Uri u(s);
+    auto paramsList = u.getQueryParams();
+    std::map<fbstring, fbstring> params;
+    for (auto& param : paramsList) {
+      params[param.first] = param.second;
+    }
+    EXPECT_EQ(3, params.size());
+    EXPECT_EQ("foo", params["key1"]);
+    EXPECT_NE(params.end(), params.find("key2"));
+    EXPECT_EQ("", params["key2"]);
+    EXPECT_NE(params.end(), params.find("key3"));
+    EXPECT_EQ("", params["key3"]);
+  }
+
+  {
+    // test query parameters
+    fbstring s("http://localhost?&&&&&&&&&&&&&&&");
+    Uri u(s);
+    auto params = u.getQueryParams();
+    EXPECT_TRUE(params.empty());
+  }
+
+  {
+    // test query parameters
+    fbstring s("http://localhost?&=invalid_key&key2&key3=foo");
+    Uri u(s);
+    auto paramsList = u.getQueryParams();
+    std::map<fbstring, fbstring> params;
+    for (auto& param : paramsList) {
+      params[param.first] = param.second;
+    }
+    EXPECT_EQ(2, params.size());
+    EXPECT_NE(params.end(), params.find("key2"));
+    EXPECT_EQ("", params["key2"]);
+    EXPECT_EQ("foo", params["key3"]);
+  }
+
+  {
+    // test query parameters
+    fbstring s("http://localhost?&key1=====&&=key2&key3=");
+    Uri u(s);
+    auto paramsList = u.getQueryParams();
+    std::map<fbstring, fbstring> params;
+    for (auto& param : paramsList) {
+      params[param.first] = param.second;
+    }
+    EXPECT_EQ(1, params.size());
+    EXPECT_NE(params.end(), params.find("key3"));
+    EXPECT_EQ("", params["key3"]);
+  }
+
+  {
+    // test query parameters
+    fbstring s("http://localhost?key1=foo=bar&key2=foobar&");
+    Uri u(s);
+    auto paramsList = u.getQueryParams();
+    std::map<fbstring, fbstring> params;
+    for (auto& param : paramsList) {
+      params[param.first] = param.second;
+    }
+    EXPECT_EQ(1, params.size());
+    EXPECT_EQ("foobar", params["key2"]);
+  }
+
   {
     fbstring s("2http://www.facebook.com");
 
@@ -243,4 +340,71 @@ TEST(Uri, Simple) {
       EXPECT_TRUE(boost::algorithm::ends_with(ex.what(), s));
     }
   }
+
+  {
+    fbstring s("http://[::1:8080/hello/world?query#fragment");
+
+    try {
+      Uri u(s);
+      CHECK(false) << "Control should not have reached here";
+    } catch (const std::invalid_argument&) {
+      // success
+    }
+  }
+
+  {
+    fbstring s("http://::1]:8080/hello/world?query#fragment");
+
+    try {
+      Uri u(s);
+      CHECK(false) << "Control should not have reached here";
+    } catch (const std::invalid_argument&) {
+      // success
+    }
+  }
+
+  {
+    fbstring s("http://::1:8080/hello/world?query#fragment");
+
+    try {
+      Uri u(s);
+      CHECK(false) << "Control should not have reached here";
+    } catch (const std::invalid_argument&) {
+      // success
+    }
+  }
+
+  {
+    fbstring s("http://2401:db00:20:7004:face:0:29:0/hello/world?query");
+
+    try {
+      Uri u(s);
+      CHECK(false) << "Control should not have reached here";
+    } catch (const std::invalid_argument&) {
+      // success
+    }
+  }
+
+  // No authority (no "//") is valid
+  {
+    fbstring s("this:is/a/valid/uri");
+    Uri u(s);
+    EXPECT_EQ("this", u.scheme());
+    EXPECT_EQ("is/a/valid/uri", u.path());
+    EXPECT_EQ(s, u.fbstr());
+  }
+  {
+    fbstring s("this:is:another:valid:uri");
+    Uri u(s);
+    EXPECT_EQ("this", u.scheme());
+    EXPECT_EQ("is:another:valid:uri", u.path());
+    EXPECT_EQ(s, u.fbstr());
+  }
+  {
+    fbstring s("this:is@another:valid:uri");
+    Uri u(s);
+    EXPECT_EQ("this", u.scheme());
+    EXPECT_EQ("is@another:valid:uri", u.path());
+    EXPECT_EQ(s, u.fbstr());
+  }
 }