summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-01 06:15:11 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-01 06:15:11 +0000
commit97d4797355ac01fb77ff5ee2697cbbd8facb9e19 (patch)
tree48903ab85ab0e5691e158313da011f31a14c761a /chrome
parentdfd84056ab03d21844376b5d95989440ed86e84a (diff)
downloadchromium_src-97d4797355ac01fb77ff5ee2697cbbd8facb9e19.zip
chromium_src-97d4797355ac01fb77ff5ee2697cbbd8facb9e19.tar.gz
chromium_src-97d4797355ac01fb77ff5ee2697cbbd8facb9e19.tar.bz2
Re-enable zip unit tests.
Git's empty directory issue strikes again. Review URL: http://codereview.chromium.org/115985 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/common/zip_unittest.cc4
-rwxr-xr-xchrome/test/data/zip/test.zipbin5052 -> 4952 bytes
-rwxr-xr-xchrome/test/data/zip/test_nocompress.zipbin14239 -> 14139 bytes
3 files changed, 0 insertions, 4 deletions
diff --git a/chrome/common/zip_unittest.cc b/chrome/common/zip_unittest.cc
index 9ed8757..17ab1fa 100644
--- a/chrome/common/zip_unittest.cc
+++ b/chrome/common/zip_unittest.cc
@@ -33,8 +33,6 @@ class ZipTest : public PlatformTest {
zip_contents_.insert(zip_path);
zip_contents_.insert(zip_path.AppendASCII("baz.txt"));
zip_contents_.insert(zip_path.AppendASCII("quux.txt"));
- zip_path = zip_path.AppendASCII("baz");
- zip_contents_.insert(zip_path);
}
virtual void TearDown() {
@@ -78,7 +76,6 @@ class ZipTest : public PlatformTest {
std::set<FilePath> zip_contents_;
};
-#if 0 // Temporarily disable tests while debugging
TEST_F(ZipTest, Unzip) {
TestUnzipFile(FILE_PATH_LITERAL("test.zip"));
}
@@ -104,6 +101,5 @@ TEST_F(ZipTest, Zip) {
EXPECT_TRUE(file_util::Delete(zip_file, false));
}
-#endif
} // namespace
diff --git a/chrome/test/data/zip/test.zip b/chrome/test/data/zip/test.zip
index dec8b2a..e32f108 100755
--- a/chrome/test/data/zip/test.zip
+++ b/chrome/test/data/zip/test.zip
Binary files differ
diff --git a/chrome/test/data/zip/test_nocompress.zip b/chrome/test/data/zip/test_nocompress.zip
index f70d473..f95e1d2 100755
--- a/chrome/test/data/zip/test_nocompress.zip
+++ b/chrome/test/data/zip/test_nocompress.zip
Binary files differ