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

Unified Diff: Source/platform/fonts/mac/FontFamilyMatcherMacTest.mm

Issue 1292593003: Revert "Revert "Reland 2: mac: Use a placeholder string for the family name of the system font." Br… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
« no previous file with comments | « Source/platform/fonts/mac/FontFamilyMatcherMac.mm ('k') | Source/platform/mac/ThemeMac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/mac/FontFamilyMatcherMacTest.mm
diff --git a/Source/platform/fonts/mac/FontFamilyMatcherMacTest.mm b/Source/platform/fonts/mac/FontFamilyMatcherMacTest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..e70ac1a9bc552fa9ae09a8bb1103d80e15e72ebc
--- /dev/null
+++ b/Source/platform/fonts/mac/FontFamilyMatcherMacTest.mm
@@ -0,0 +1,41 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "config.h"
+#import "platform/fonts/mac/FontFamilyMatcherMac.h"
+
+#include <AppKit/AppKit.h>
+#include <gtest/gtest.h>
+
+#import "platform/mac/VersionUtilMac.h"
+
+@interface NSString (YosemiteAdditions)
+- (BOOL)containsString:(NSString*)string;
+@end
+
+namespace blink {
+
+void TestSystemFontContainsString(FontWeight desiredWeight, NSString* substring)
+{
+ NSFont* font = MatchNSFontFamily(@"BlinkMacSystemFont", 0, desiredWeight, 11);
+ EXPECT_TRUE([font.description containsString:substring]);
+}
+
+TEST(FontFamilyMatcherMacTest, YosemiteFontWeights)
+{
+ if (IsOSMavericksOrEarlier())
+ return;
+
+ TestSystemFontContainsString(FontWeight100, @"-UltraLight");
+ TestSystemFontContainsString(FontWeight200, @"-Thin");
+ TestSystemFontContainsString(FontWeight300, @"-Light");
+ TestSystemFontContainsString(FontWeight400, @"-Regular");
+ TestSystemFontContainsString(FontWeight500, @"-Medium");
+ TestSystemFontContainsString(FontWeight600, @"-Bold");
+ TestSystemFontContainsString(FontWeight700, @"-Bold");
+ TestSystemFontContainsString(FontWeight800, @"-Heavy");
+ TestSystemFontContainsString(FontWeight900, @"-Heavy");
+}
+
+} // namespace blink
« no previous file with comments | « Source/platform/fonts/mac/FontFamilyMatcherMac.mm ('k') | Source/platform/mac/ThemeMac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698