Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/mime_util_unittest.cc

Issue 642403002: git cl format the first third of the net/base directory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/base/keygen_handler_mac.cc ('K') | « net/base/mime_util.h ('k') | net/base/mock_file_stream.h » ('j') | net/base/net_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/mime_util_unittest.cc
diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
index 08a3dfd9321843525111a05ed4a762a968ef1a04..6b9f99bfbf3d93fc44981bd29b81723bfcae02d5 100644
--- a/net/base/mime_util_unittest.cc
+++ b/net/base/mime_util_unittest.cc
@@ -20,14 +20,14 @@ TEST(MimeUtilTest, ExtensionTest) {
const char* mime_type;
bool valid;
} tests[] = {
- { FILE_PATH_LITERAL("png"), "image/png", true },
- { FILE_PATH_LITERAL("css"), "text/css", true },
- { FILE_PATH_LITERAL("pjp"), "image/jpeg", true },
- { FILE_PATH_LITERAL("pjpeg"), "image/jpeg", true },
+ {FILE_PATH_LITERAL("png"), "image/png", true},
+ {FILE_PATH_LITERAL("css"), "text/css", true},
+ {FILE_PATH_LITERAL("pjp"), "image/jpeg", true},
+ {FILE_PATH_LITERAL("pjpeg"), "image/jpeg", true},
#if defined(OS_ANDROID)
- { FILE_PATH_LITERAL("m3u8"), "application/x-mpegurl", true },
+ {FILE_PATH_LITERAL("m3u8"), "application/x-mpegurl", true},
#endif
- { FILE_PATH_LITERAL("not an extension / for sure"), "", false },
+ {FILE_PATH_LITERAL("not an extension / for sure"), "", false},
};
std::string mime_type;
@@ -47,20 +47,19 @@ TEST(MimeUtilTest, FileTest) {
const char* mime_type;
bool valid;
} tests[] = {
- { FILE_PATH_LITERAL("c:\\foo\\bar.css"), "text/css", true },
- { FILE_PATH_LITERAL("c:\\blah"), "", false },
- { FILE_PATH_LITERAL("/usr/local/bin/mplayer"), "", false },
- { FILE_PATH_LITERAL("/home/foo/bar.css"), "text/css", true },
- { FILE_PATH_LITERAL("/blah."), "", false },
- { FILE_PATH_LITERAL("c:\\blah."), "", false },
- };
+ {FILE_PATH_LITERAL("c:\\foo\\bar.css"), "text/css", true},
+ {FILE_PATH_LITERAL("c:\\blah"), "", false},
+ {FILE_PATH_LITERAL("/usr/local/bin/mplayer"), "", false},
+ {FILE_PATH_LITERAL("/home/foo/bar.css"), "text/css", true},
+ {FILE_PATH_LITERAL("/blah."), "", false},
+ {FILE_PATH_LITERAL("c:\\blah."), "", false},
+ };
std::string mime_type;
bool rv;
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
- rv = GetMimeTypeFromFile(base::FilePath(tests[i].file_path),
- &mime_type);
+ rv = GetMimeTypeFromFile(base::FilePath(tests[i].file_path), &mime_type);
EXPECT_EQ(tests[i].valid, rv);
if (rv)
EXPECT_EQ(tests[i].mime_type, mime_type);
@@ -135,11 +134,10 @@ TEST(MimeUtilTest, MatchesMimeType) {
EXPECT_TRUE(MatchesMimeType("video/*", "video/x-mpeg"));
EXPECT_TRUE(MatchesMimeType("video/*", "video/*"));
EXPECT_TRUE(MatchesMimeType("video/x-mpeg", "video/x-mpeg"));
- EXPECT_TRUE(MatchesMimeType("application/*+xml",
- "application/html+xml"));
+ EXPECT_TRUE(MatchesMimeType("application/*+xml", "application/html+xml"));
EXPECT_TRUE(MatchesMimeType("application/*+xml", "application/+xml"));
- EXPECT_TRUE(MatchesMimeType("application/*+json",
- "application/x-myformat+json"));
+ EXPECT_TRUE(
+ MatchesMimeType("application/*+json", "application/x-myformat+json"));
EXPECT_TRUE(MatchesMimeType("aaa*aaa", "aaaaaa"));
EXPECT_TRUE(MatchesMimeType("*", std::string()));
EXPECT_FALSE(MatchesMimeType("video/", "video/x-mpeg"));
@@ -147,10 +145,8 @@ TEST(MimeUtilTest, MatchesMimeType) {
EXPECT_FALSE(MatchesMimeType(std::string(), std::string()));
EXPECT_FALSE(MatchesMimeType("video/x-mpeg", std::string()));
EXPECT_FALSE(MatchesMimeType("application/*+xml", "application/xml"));
- EXPECT_FALSE(MatchesMimeType("application/*+xml",
- "application/html+xmlz"));
- EXPECT_FALSE(MatchesMimeType("application/*+xml",
- "applcation/html+xml"));
+ EXPECT_FALSE(MatchesMimeType("application/*+xml", "application/html+xmlz"));
+ EXPECT_FALSE(MatchesMimeType("application/*+xml", "applcation/html+xml"));
EXPECT_FALSE(MatchesMimeType("aaa*aaa", "aaaaa"));
EXPECT_TRUE(MatchesMimeType("*", "video/x-mpeg;param=val"));
@@ -159,12 +155,12 @@ TEST(MimeUtilTest, MatchesMimeType) {
EXPECT_FALSE(MatchesMimeType("video/*;param=val", "video/mpeg;param=other"));
EXPECT_TRUE(MatchesMimeType("video/*;param=val", "video/mpeg;param=val"));
EXPECT_TRUE(MatchesMimeType("video/x-mpeg", "video/x-mpeg;param=val"));
- EXPECT_TRUE(MatchesMimeType("video/x-mpeg;param=val",
- "video/x-mpeg;param=val"));
- EXPECT_FALSE(MatchesMimeType("video/x-mpeg;param2=val2",
- "video/x-mpeg;param=val"));
- EXPECT_FALSE(MatchesMimeType("video/x-mpeg;param2=val2",
- "video/x-mpeg;param2=val"));
+ EXPECT_TRUE(
+ MatchesMimeType("video/x-mpeg;param=val", "video/x-mpeg;param=val"));
+ EXPECT_FALSE(
+ MatchesMimeType("video/x-mpeg;param2=val2", "video/x-mpeg;param=val"));
+ EXPECT_FALSE(
+ MatchesMimeType("video/x-mpeg;param2=val2", "video/x-mpeg;param2=val"));
EXPECT_TRUE(MatchesMimeType("video/x-mpeg;param=val",
"video/x-mpeg;param=val;param2=val2"));
EXPECT_TRUE(MatchesMimeType("video/x-mpeg;param=val;param2=val2",
@@ -262,17 +258,17 @@ TEST(MimeUtilTest, ParseCodecString) {
size_t expected_size;
const char* results[2];
} tests[] = {
- { "\"bogus\"", 1, { "bogus" } },
- { "0", 1, { "0" } },
- { "avc1.42E01E, mp4a.40.2", 2, { "avc1", "mp4a" } },
- { "\"mp4v.20.240, mp4a.40.2\"", 2, { "mp4v", "mp4a" } },
- { "mp4v.20.8, samr", 2, { "mp4v", "samr" } },
- { "\"theora, vorbis\"", 2, { "theora", "vorbis" } },
- { "", 0, { } },
- { "\"\"", 0, { } },
- { "\" \"", 0, { } },
- { ",", 2, { "", "" } },
- };
+ {"\"bogus\"", 1, {"bogus"}},
+ {"0", 1, {"0"}},
+ {"avc1.42E01E, mp4a.40.2", 2, {"avc1", "mp4a"}},
+ {"\"mp4v.20.240, mp4a.40.2\"", 2, {"mp4v", "mp4a"}},
+ {"mp4v.20.8, samr", 2, {"mp4v", "samr"}},
+ {"\"theora, vorbis\"", 2, {"theora", "vorbis"}},
+ {"", 0, {}},
+ {"\"\"", 0, {}},
+ {"\" \"", 0, {}},
+ {",", 2, {"", ""}},
+ };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
std::vector<std::string> codecs_out;
@@ -334,7 +330,7 @@ TEST(MimeUtilTest, TestParseMimeTypeWithoutParameter) {
EXPECT_FALSE(ParseMimeTypeWithoutParameter("application/a/b/c", NULL, NULL));
- //EXPECT_TRUE(ParseMimeTypeWithoutParameter("video/mime;parameter"));
+ // EXPECT_TRUE(ParseMimeTypeWithoutParameter("video/mime;parameter"));
}
TEST(MimeUtilTest, TestIsValidTopLevelMimeType) {
@@ -386,19 +382,19 @@ TEST(MimeUtilTest, TestGetExtensionsForMimeType) {
size_t min_expected_size;
const char* contained_result;
} tests[] = {
- { "text/plain", 2, "txt" },
- { "*", 0, NULL },
- { "message/*", 1, "eml" },
- { "MeSsAge/*", 1, "eml" },
- { "image/bmp", 1, "bmp" },
- { "video/*", 6, "mp4" },
+ {"text/plain", 2, "txt"},
+ {"*", 0, NULL},
+ {"message/*", 1, "eml"},
+ {"MeSsAge/*", 1, "eml"},
+ {"image/bmp", 1, "bmp"},
+ {"video/*", 6, "mp4"},
#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_IOS)
- { "video/*", 6, "mpg" },
+ {"video/*", 6, "mpg"},
#else
- { "video/*", 6, "mpeg" },
+ {"video/*", 6, "mpeg"},
#endif
- { "audio/*", 6, "oga" },
- { "aUDIo/*", 6, "wav" },
+ {"audio/*", 6, "oga"},
+ {"aUDIo/*", 6, "wav"},
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
@@ -444,17 +440,17 @@ TEST(MimeUtilTest, TestGetCertificateMimeTypeForMimeType) {
}
TEST(MimeUtilTest, TestAddMultipartValueForUpload) {
- const char* ref_output = "--boundary\r\nContent-Disposition: form-data;"
- " name=\"value name\"\r\nContent-Type: content type"
- "\r\n\r\nvalue\r\n"
- "--boundary\r\nContent-Disposition: form-data;"
- " name=\"value name\"\r\n\r\nvalue\r\n"
- "--boundary--\r\n";
+ const char* ref_output =
+ "--boundary\r\nContent-Disposition: form-data;"
+ " name=\"value name\"\r\nContent-Type: content type"
+ "\r\n\r\nvalue\r\n"
+ "--boundary\r\nContent-Disposition: form-data;"
+ " name=\"value name\"\r\n\r\nvalue\r\n"
+ "--boundary--\r\n";
std::string post_data;
- AddMultipartValueForUpload("value name", "value", "boundary",
- "content type", &post_data);
- AddMultipartValueForUpload("value name", "value", "boundary",
- "", &post_data);
+ AddMultipartValueForUpload(
+ "value name", "value", "boundary", "content type", &post_data);
+ AddMultipartValueForUpload("value name", "value", "boundary", "", &post_data);
AddMultipartFinalDelimiterForUpload("boundary", &post_data);
EXPECT_STREQ(ref_output, post_data.c_str());
}
« net/base/keygen_handler_mac.cc ('K') | « net/base/mime_util.h ('k') | net/base/mock_file_stream.h » ('j') | net/base/net_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698