| 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 "webkit/plugins/npapi/plugin_group.h" | 5 #include "webkit/plugins/npapi/plugin_utils.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
| 12 #include "base/version.h" | 12 #include "base/version.h" |
| 13 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
| 14 | 14 |
| 15 namespace webkit { | 15 namespace webkit { |
| 16 namespace npapi { | 16 namespace npapi { |
| 17 | 17 |
| 18 TEST(PluginGroupTest, VersionExtraction) { | 18 TEST(PluginUtilsTest, VersionExtraction) { |
| 19 // Some real-world plugin versions (spaces, commata, parentheses, 'r', oh my) | 19 // Some real-world plugin versions (spaces, commata, parentheses, 'r', oh my) |
| 20 const char* versions[][2] = { | 20 const char* versions[][2] = { |
| 21 { "7.6.6 (1671)", "7.6.6.1671" }, // Quicktime | 21 { "7.6.6 (1671)", "7.6.6.1671" }, // Quicktime |
| 22 { "2, 0, 0, 254", "2.0.0.254" }, // DivX | 22 { "2, 0, 0, 254", "2.0.0.254" }, // DivX |
| 23 { "3, 0, 0, 0", "3.0.0.0" }, // Picasa | 23 { "3, 0, 0, 0", "3.0.0.0" }, // Picasa |
| 24 { "1, 0, 0, 1", "1.0.0.1" }, // Earth | 24 { "1, 0, 0, 1", "1.0.0.1" }, // Earth |
| 25 { "10,0,45,2", "10.0.45.2" }, // Flash | 25 { "10,0,45,2", "10.0.45.2" }, // Flash |
| 26 { "10.1 r102", "10.1.102"}, // Flash | 26 { "10.1 r102", "10.1.102"}, // Flash |
| 27 { "10.3 d180", "10.3.180" }, // Flash (Debug) | 27 { "10.3 d180", "10.3.180" }, // Flash (Debug) |
| 28 { "11.5.7r609", "11.5.7.609"}, // Shockwave | 28 { "11.5.7r609", "11.5.7.609"}, // Shockwave |
| 29 { "1.6.0_22", "1.6.0.22"}, // Java | 29 { "1.6.0_22", "1.6.0.22"}, // Java |
| 30 { "1.07.00_0005", "1.7.0.5"}, // Java with leading zeros | 30 { "1.07.00_0005", "1.7.0.5"}, // Java with leading zeros |
| 31 { "1..0", "1.0.0" } // Empty version component | 31 { "1..0", "1.0.0" } // Empty version component |
| 32 }; | 32 }; |
| 33 | 33 |
| 34 for (size_t i = 0; i < arraysize(versions); i++) { | 34 for (size_t i = 0; i < arraysize(versions); i++) { |
| 35 Version version; | 35 Version version; |
| 36 PluginGroup::CreateVersionFromString(ASCIIToUTF16(versions[i][0]), | 36 CreateVersionFromString(ASCIIToUTF16(versions[i][0]), &version); |
| 37 &version); | |
| 38 | 37 |
| 39 ASSERT_TRUE(version.IsValid()); | 38 ASSERT_TRUE(version.IsValid()); |
| 40 EXPECT_EQ(versions[i][1], version.GetString()); | 39 EXPECT_EQ(versions[i][1], version.GetString()); |
| 41 } | 40 } |
| 42 } | 41 } |
| 43 | 42 |
| 44 } // namespace npapi | 43 } // namespace npapi |
| 45 } // namespace webkit | 44 } // namespace webkit |
| OLD | NEW |