summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorsimonjam@chromium.org <simonjam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-07 02:49:03 +0000
committersimonjam@chromium.org <simonjam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-07 02:49:03 +0000
commit170303b7aa97f095064dd497c2d385c4253ecef1 (patch)
tree12c7af1667ce49a80dc51fcde2d42e6479fbf5ed /webkit
parent7d19d56a979b3f6712c95a18a09b467bd5ac8c69 (diff)
downloadchromium_src-170303b7aa97f095064dd497c2d385c4253ecef1.zip
chromium_src-170303b7aa97f095064dd497c2d385c4253ecef1.tar.gz
chromium_src-170303b7aa97f095064dd497c2d385c4253ecef1.tar.bz2
Re-enable speculatively disabled FileSystemURLRequestJobTest tests
BUG=122478 TBR=apavlov Review URL: https://chromiumcodereview.appspot.com/10023008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/fileapi/file_system_url_request_job_unittest.cc23
1 files changed, 11 insertions, 12 deletions
diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/fileapi/file_system_url_request_job_unittest.cc
index 110b9cd..015839f 100644
--- a/webkit/fileapi/file_system_url_request_job_unittest.cc
+++ b/webkit/fileapi/file_system_url_request_job_unittest.cc
@@ -220,7 +220,7 @@ net::URLRequestJob* FileSystemURLRequestJobTest::job_ = NULL;
namespace {
-TEST_F(FileSystemURLRequestJobTest, DISABLED_FileTest) {
+TEST_F(FileSystemURLRequestJobTest, FileTest) {
WriteFile("file1.dat", kTestFileData, arraysize(kTestFileData) - 1);
TestRequest(CreateFileSystemURL("file1.dat"));
@@ -234,7 +234,7 @@ TEST_F(FileSystemURLRequestJobTest, DISABLED_FileTest) {
EXPECT_EQ("no-cache", cache_control);
}
-TEST_F(FileSystemURLRequestJobTest, DISABLED_FileTestFullSpecifiedRange) {
+TEST_F(FileSystemURLRequestJobTest, FileTestFullSpecifiedRange) {
const size_t buffer_size = 4000;
scoped_array<char> buffer(new char[buffer_size]);
FillBuffer(buffer.get(), buffer_size);
@@ -258,7 +258,7 @@ TEST_F(FileSystemURLRequestJobTest, DISABLED_FileTestFullSpecifiedRange) {
EXPECT_TRUE(partial_buffer_string == delegate_->data_received());
}
-TEST_F(FileSystemURLRequestJobTest, DISABLED_FileTestHalfSpecifiedRange) {
+TEST_F(FileSystemURLRequestJobTest, FileTestHalfSpecifiedRange) {
const size_t buffer_size = 4000;
scoped_array<char> buffer(new char[buffer_size]);
FillBuffer(buffer.get(), buffer_size);
@@ -281,8 +281,7 @@ TEST_F(FileSystemURLRequestJobTest, DISABLED_FileTestHalfSpecifiedRange) {
}
-TEST_F(FileSystemURLRequestJobTest,
- DISABLED_FileTestMultipleRangesNotSupported) {
+TEST_F(FileSystemURLRequestJobTest, FileTestMultipleRangesNotSupported) {
WriteFile("file1.dat", kTestFileData, arraysize(kTestFileData) - 1);
net::HttpRequestHeaders headers;
headers.SetHeader(net::HttpRequestHeaders::kRange,
@@ -293,7 +292,7 @@ TEST_F(FileSystemURLRequestJobTest,
request_->status().error());
}
-TEST_F(FileSystemURLRequestJobTest, DISABLED_RangeOutOfBounds) {
+TEST_F(FileSystemURLRequestJobTest, RangeOutOfBounds) {
WriteFile("file1.dat", kTestFileData, arraysize(kTestFileData) - 1);
net::HttpRequestHeaders headers;
headers.SetHeader(net::HttpRequestHeaders::kRange, "bytes=500-1000");
@@ -305,7 +304,7 @@ TEST_F(FileSystemURLRequestJobTest, DISABLED_RangeOutOfBounds) {
request_->status().error());
}
-TEST_F(FileSystemURLRequestJobTest, DISABLED_FileDirRedirect) {
+TEST_F(FileSystemURLRequestJobTest, FileDirRedirect) {
CreateDirectory("dir");
TestRequest(CreateFileSystemURL("dir"));
@@ -318,28 +317,28 @@ TEST_F(FileSystemURLRequestJobTest, DISABLED_FileDirRedirect) {
MessageLoop::current()->Run();
}
-TEST_F(FileSystemURLRequestJobTest, DISABLED_InvalidURL) {
+TEST_F(FileSystemURLRequestJobTest, InvalidURL) {
TestRequest(GURL("filesystem:/foo/bar/baz"));
ASSERT_FALSE(request_->is_pending());
EXPECT_TRUE(delegate_->request_failed());
EXPECT_EQ(net::ERR_INVALID_URL, request_->status().error());
}
-TEST_F(FileSystemURLRequestJobTest, DISABLED_NoSuchRoot) {
+TEST_F(FileSystemURLRequestJobTest, NoSuchRoot) {
TestRequest(GURL("filesystem:http://remote/persistent/somefile"));
ASSERT_FALSE(request_->is_pending());
EXPECT_TRUE(delegate_->request_failed());
EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request_->status().error());
}
-TEST_F(FileSystemURLRequestJobTest, DISABLED_NoSuchFile) {
+TEST_F(FileSystemURLRequestJobTest, NoSuchFile) {
TestRequest(CreateFileSystemURL("somefile"));
ASSERT_FALSE(request_->is_pending());
EXPECT_TRUE(delegate_->request_failed());
EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request_->status().error());
}
-TEST_F(FileSystemURLRequestJobTest, DISABLED_Cancel) {
+TEST_F(FileSystemURLRequestJobTest, Cancel) {
WriteFile("file1.dat", kTestFileData, arraysize(kTestFileData) - 1);
TestRequestNoRun(CreateFileSystemURL("file1.dat"));
@@ -349,7 +348,7 @@ TEST_F(FileSystemURLRequestJobTest, DISABLED_Cancel) {
// If we get here, success! we didn't crash!
}
-TEST_F(FileSystemURLRequestJobTest, DISABLED_GetMimeType) {
+TEST_F(FileSystemURLRequestJobTest, GetMimeType) {
const char kFilename[] = "hoge.html";
std::string mime_type_direct;