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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/mac/mac_util_unittest.mm

Issue 2271653006: base::mac::IsOSSierra() -> base::mac::IsOS10_12(), etc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Further simplify IsOS*, fix Blink changes, add static_asserts for mark@. Created 4 years, 4 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
« base/mac/mac_util.h ('K') | « base/mac/mac_util.mm ('k') | base/process/memory_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/mac/mac_util_unittest.mm
diff --git a/base/mac/mac_util_unittest.mm b/base/mac/mac_util_unittest.mm
index 11003fa0bc557e58a296addd7e310d9ffda7080f..cf567c684cb520528d67ddfcebc34f73dc23b5c9 100644
--- a/base/mac/mac_util_unittest.mm
+++ b/base/mac/mac_util_unittest.mm
@@ -146,49 +146,61 @@ TEST_F(MacUtilTest, IsOSEllipsis) {
if (major == 10) {
if (minor == 9) {
- EXPECT_TRUE(IsOSMavericks());
- EXPECT_FALSE(IsOSYosemite());
- EXPECT_TRUE(IsOSYosemiteOrEarlier());
- EXPECT_FALSE(IsOSYosemiteOrLater());
- EXPECT_FALSE(IsOSElCapitan());
- EXPECT_TRUE(IsOSElCapitanOrEarlier());
- EXPECT_FALSE(IsOSElCapitanOrLater());
- EXPECT_FALSE(IsOSSierra());
- EXPECT_FALSE(IsOSSierraOrLater());
- EXPECT_FALSE(IsOSLaterThanSierra_DontCallThis());
+ EXPECT_TRUE(IsOS10_9());
+ EXPECT_TRUE(IsAtMostOS10_9());
+ EXPECT_TRUE(IsAtLeastOS10_9());
+ EXPECT_FALSE(IsOS10_10());
+ EXPECT_TRUE(IsAtMostOS10_10());
+ EXPECT_FALSE(IsAtLeastOS10_10());
+ EXPECT_FALSE(IsOS10_11());
+ EXPECT_TRUE(IsAtMostOS10_11());
+ EXPECT_FALSE(IsAtLeastOS10_11());
+ EXPECT_FALSE(IsOS10_12());
+ EXPECT_FALSE(IsAtLeastOS10_12());
+ EXPECT_TRUE(IsAtMostOS10_12());
+ EXPECT_FALSE(IsOSLaterThan10_12_DontCallThis());
} else if (minor == 10) {
- EXPECT_FALSE(IsOSMavericks());
- EXPECT_TRUE(IsOSYosemite());
- EXPECT_TRUE(IsOSYosemiteOrEarlier());
- EXPECT_TRUE(IsOSYosemiteOrLater());
- EXPECT_FALSE(IsOSElCapitan());
- EXPECT_TRUE(IsOSElCapitanOrEarlier());
- EXPECT_FALSE(IsOSElCapitanOrLater());
- EXPECT_FALSE(IsOSSierra());
- EXPECT_FALSE(IsOSSierraOrLater());
- EXPECT_FALSE(IsOSLaterThanSierra_DontCallThis());
+ EXPECT_FALSE(IsOS10_9());
+ EXPECT_FALSE(IsAtMostOS10_9());
+ EXPECT_TRUE(IsAtLeastOS10_9());
+ EXPECT_TRUE(IsOS10_10());
+ EXPECT_TRUE(IsAtMostOS10_10());
+ EXPECT_TRUE(IsAtLeastOS10_10());
+ EXPECT_FALSE(IsOS10_11());
+ EXPECT_TRUE(IsAtMostOS10_11());
+ EXPECT_FALSE(IsAtLeastOS10_11());
+ EXPECT_FALSE(IsOS10_12());
+ EXPECT_FALSE(IsAtLeastOS10_12());
+ EXPECT_TRUE(IsAtMostOS10_12());
+ EXPECT_FALSE(IsOSLaterThan10_12_DontCallThis());
} else if (minor == 11) {
- EXPECT_FALSE(IsOSMavericks());
- EXPECT_FALSE(IsOSYosemite());
- EXPECT_FALSE(IsOSYosemiteOrEarlier());
- EXPECT_TRUE(IsOSYosemiteOrLater());
- EXPECT_TRUE(IsOSElCapitan());
- EXPECT_TRUE(IsOSElCapitanOrEarlier());
- EXPECT_TRUE(IsOSElCapitanOrLater());
- EXPECT_FALSE(IsOSSierra());
- EXPECT_FALSE(IsOSSierraOrLater());
- EXPECT_FALSE(IsOSLaterThanSierra_DontCallThis());
+ EXPECT_FALSE(IsOS10_9());
+ EXPECT_FALSE(IsAtMostOS10_9());
+ EXPECT_TRUE(IsAtLeastOS10_9());
+ EXPECT_FALSE(IsOS10_10());
+ EXPECT_FALSE(IsAtMostOS10_10());
+ EXPECT_TRUE(IsAtLeastOS10_10());
+ EXPECT_TRUE(IsOS10_11());
+ EXPECT_TRUE(IsAtMostOS10_11());
+ EXPECT_TRUE(IsAtLeastOS10_11());
+ EXPECT_FALSE(IsOS10_12());
+ EXPECT_FALSE(IsAtLeastOS10_12());
+ EXPECT_TRUE(IsAtMostOS10_12());
+ EXPECT_FALSE(IsOSLaterThan10_12_DontCallThis());
} else if (minor == 12) {
- EXPECT_FALSE(IsOSMavericks());
- EXPECT_FALSE(IsOSYosemite());
- EXPECT_FALSE(IsOSYosemiteOrEarlier());
- EXPECT_TRUE(IsOSYosemiteOrLater());
- EXPECT_FALSE(IsOSElCapitan());
- EXPECT_FALSE(IsOSElCapitanOrEarlier());
- EXPECT_TRUE(IsOSElCapitanOrLater());
- EXPECT_TRUE(IsOSSierra());
- EXPECT_TRUE(IsOSSierraOrLater());
- EXPECT_FALSE(IsOSLaterThanSierra_DontCallThis());
+ EXPECT_FALSE(IsOS10_9());
+ EXPECT_FALSE(IsAtMostOS10_9());
+ EXPECT_TRUE(IsAtLeastOS10_9());
+ EXPECT_FALSE(IsOS10_10());
+ EXPECT_FALSE(IsAtMostOS10_10());
+ EXPECT_TRUE(IsAtLeastOS10_10());
+ EXPECT_FALSE(IsOS10_11());
+ EXPECT_FALSE(IsAtMostOS10_11());
+ EXPECT_TRUE(IsAtLeastOS10_11());
+ EXPECT_TRUE(IsOS10_12());
+ EXPECT_TRUE(IsAtMostOS10_12());
+ EXPECT_TRUE(IsAtLeastOS10_12());
+ EXPECT_FALSE(IsOSLaterThan10_12_DontCallThis());
} else {
// Not nine, ten, eleven, or twelve. Ah, ah, ah.
EXPECT_TRUE(false);
« base/mac/mac_util.h ('K') | « base/mac/mac_util.mm ('k') | base/process/memory_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698