OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <algorithm> | 5 #include <algorithm> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 | 407 |
408 EXPECT_TRUE(db.UpgradeToVersion6()); | 408 EXPECT_TRUE(db.UpgradeToVersion6()); |
409 | 409 |
410 statement.Assign(db.db_.GetCachedStatement(SQL_FROM_HERE, | 410 statement.Assign(db.db_.GetCachedStatement(SQL_FROM_HERE, |
411 "SELECT id, url, icon_type, sizes FROM favicons")); | 411 "SELECT id, url, icon_type, sizes FROM favicons")); |
412 EXPECT_TRUE(statement.Step()); | 412 EXPECT_TRUE(statement.Step()); |
413 EXPECT_EQ(favicon_id, statement.ColumnInt(0)); | 413 EXPECT_EQ(favicon_id, statement.ColumnInt(0)); |
414 EXPECT_EQ(url, GURL(statement.ColumnString(1))); | 414 EXPECT_EQ(url, GURL(statement.ColumnString(1))); |
415 EXPECT_EQ(TOUCH_ICON, statement.ColumnInt(2)); | 415 EXPECT_EQ(TOUCH_ICON, statement.ColumnInt(2)); |
416 // Any previous data in sizes should be cleared. | 416 // Any previous data in sizes should be cleared. |
417 EXPECT_EQ(std::string(""), statement.ColumnString(3)); | 417 EXPECT_EQ(std::string(), statement.ColumnString(3)); |
418 | 418 |
419 statement.Assign(db.db_.GetCachedStatement(SQL_FROM_HERE, | 419 statement.Assign(db.db_.GetCachedStatement(SQL_FROM_HERE, |
420 "SELECT icon_id, last_updated, image_data, width, height " | 420 "SELECT icon_id, last_updated, image_data, width, height " |
421 "FROM favicon_bitmaps")); | 421 "FROM favicon_bitmaps")); |
422 EXPECT_TRUE(statement.Step()); | 422 EXPECT_TRUE(statement.Step()); |
423 EXPECT_EQ(favicon_id, statement.ColumnInt(0)); | 423 EXPECT_EQ(favicon_id, statement.ColumnInt(0)); |
424 EXPECT_EQ(last_updated, statement.ColumnInt64(1)); | 424 EXPECT_EQ(last_updated, statement.ColumnInt64(1)); |
425 EXPECT_EQ(static_cast<int>(bitmap_data->size()), | 425 EXPECT_EQ(static_cast<int>(bitmap_data->size()), |
426 statement.ColumnByteLength(2)); | 426 statement.ColumnByteLength(2)); |
427 EXPECT_EQ(0, statement.ColumnInt(3)); | 427 EXPECT_EQ(0, statement.ColumnInt(3)); |
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
847 &sizes_missing_height); | 847 &sizes_missing_height); |
848 EXPECT_EQ(0u, sizes_missing_height.size()); | 848 EXPECT_EQ(0u, sizes_missing_height.size()); |
849 | 849 |
850 FaviconSizes sizes_non_int; | 850 FaviconSizes sizes_non_int; |
851 ThumbnailDatabase::DatabaseStringToFaviconSizes("0 0 a 10", | 851 ThumbnailDatabase::DatabaseStringToFaviconSizes("0 0 a 10", |
852 &sizes_non_int); | 852 &sizes_non_int); |
853 EXPECT_EQ(0u, sizes_non_int.size()); | 853 EXPECT_EQ(0u, sizes_non_int.size()); |
854 | 854 |
855 // Valid input. | 855 // Valid input. |
856 FaviconSizes sizes_empty; | 856 FaviconSizes sizes_empty; |
857 ThumbnailDatabase::DatabaseStringToFaviconSizes("", &sizes_empty); | 857 ThumbnailDatabase::DatabaseStringToFaviconSizes(std::string(), &sizes_empty); |
858 EXPECT_EQ(0u, sizes_empty.size()); | 858 EXPECT_EQ(0u, sizes_empty.size()); |
859 | 859 |
860 FaviconSizes sizes_valid; | 860 FaviconSizes sizes_valid; |
861 ThumbnailDatabase::DatabaseStringToFaviconSizes("10 15 20 25", &sizes_valid); | 861 ThumbnailDatabase::DatabaseStringToFaviconSizes("10 15 20 25", &sizes_valid); |
862 EXPECT_EQ(2u, sizes_valid.size()); | 862 EXPECT_EQ(2u, sizes_valid.size()); |
863 if (sizes_valid[0] == gfx::Size(10, 15)) { | 863 if (sizes_valid[0] == gfx::Size(10, 15)) { |
864 EXPECT_EQ(sizes_valid[1], gfx::Size(20, 25)); | 864 EXPECT_EQ(sizes_valid[1], gfx::Size(20, 25)); |
865 } else { | 865 } else { |
866 EXPECT_EQ(sizes_valid[0], gfx::Size(20, 25)); | 866 EXPECT_EQ(sizes_valid[0], gfx::Size(20, 25)); |
867 EXPECT_EQ(sizes_valid[1], gfx::Size(10, 15)); | 867 EXPECT_EQ(sizes_valid[1], gfx::Size(10, 15)); |
868 } | 868 } |
869 | 869 |
870 std::string sizes_as_string; | 870 std::string sizes_as_string; |
871 ThumbnailDatabase::FaviconSizesToDatabaseString(sizes_valid, | 871 ThumbnailDatabase::FaviconSizesToDatabaseString(sizes_valid, |
872 &sizes_as_string); | 872 &sizes_as_string); |
873 EXPECT_TRUE(sizes_as_string == "10 15 20 25" || | 873 EXPECT_TRUE(sizes_as_string == "10 15 20 25" || |
874 sizes_as_string == "20 25 10 15"); | 874 sizes_as_string == "20 25 10 15"); |
875 } | 875 } |
876 | 876 |
877 } // namespace history | 877 } // namespace history |
OLD | NEW |