| Index: third_party/WebKit/Source/platform/fonts/UnicodeRangeSetTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/fonts/UnicodeRangeSetTest.cpp b/third_party/WebKit/Source/platform/fonts/UnicodeRangeSetTest.cpp
|
| index ebe95759d3889b1abb60247b9bb6d135819edb03..4a5082eddb77792756b9ff954d454edbd2b5158a 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/UnicodeRangeSetTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/fonts/UnicodeRangeSetTest.cpp
|
| @@ -13,29 +13,29 @@
|
| TEST(UnicodeRangeSet, Empty)
|
| {
|
| Vector<UnicodeRange> ranges;
|
| - RefPtr<UnicodeRangeSet> set = adoptRef(new UnicodeRangeSet(ranges));
|
| - EXPECT_TRUE(set->isEntireRange());
|
| - EXPECT_EQ(0u, set->size());
|
| - EXPECT_FALSE(set->intersectsWith(String()));
|
| - EXPECT_TRUE(set->intersectsWith(String("a")));
|
| - EXPECT_TRUE(set->intersectsWith(String(hiraganaA)));
|
| + UnicodeRangeSet set(ranges);
|
| + EXPECT_TRUE(set.isEntireRange());
|
| + EXPECT_EQ(0u, set.size());
|
| + EXPECT_FALSE(set.intersectsWith(String()));
|
| + EXPECT_TRUE(set.intersectsWith(String("a")));
|
| + EXPECT_TRUE(set.intersectsWith(String(hiraganaA)));
|
| }
|
|
|
| TEST(UnicodeRangeSet, SingleCharacter)
|
| {
|
| Vector<UnicodeRange> ranges;
|
| ranges.append(UnicodeRange('b', 'b'));
|
| - RefPtr<UnicodeRangeSet> set = adoptRef(new UnicodeRangeSet(ranges));
|
| - EXPECT_FALSE(set->isEntireRange());
|
| - EXPECT_FALSE(set->intersectsWith(String()));
|
| - EXPECT_FALSE(set->intersectsWith(String("a")));
|
| - EXPECT_TRUE(set->intersectsWith(String("b")));
|
| - EXPECT_FALSE(set->intersectsWith(String("c")));
|
| - EXPECT_TRUE(set->intersectsWith(String("abc")));
|
| - EXPECT_FALSE(set->intersectsWith(String(hiraganaA)));
|
| - ASSERT_EQ(1u, set->size());
|
| - EXPECT_EQ('b', set->rangeAt(0).from());
|
| - EXPECT_EQ('b', set->rangeAt(0).to());
|
| + UnicodeRangeSet set(ranges);
|
| + EXPECT_FALSE(set.isEntireRange());
|
| + EXPECT_FALSE(set.intersectsWith(String()));
|
| + EXPECT_FALSE(set.intersectsWith(String("a")));
|
| + EXPECT_TRUE(set.intersectsWith(String("b")));
|
| + EXPECT_FALSE(set.intersectsWith(String("c")));
|
| + EXPECT_TRUE(set.intersectsWith(String("abc")));
|
| + EXPECT_FALSE(set.intersectsWith(String(hiraganaA)));
|
| + ASSERT_EQ(1u, set.size());
|
| + EXPECT_EQ('b', set.rangeAt(0).from());
|
| + EXPECT_EQ('b', set.rangeAt(0).to());
|
| }
|
|
|
| TEST(UnicodeRangeSet, TwoRanges)
|
| @@ -43,22 +43,22 @@
|
| Vector<UnicodeRange> ranges;
|
| ranges.append(UnicodeRange('6', '7'));
|
| ranges.append(UnicodeRange('2', '4'));
|
| - RefPtr<UnicodeRangeSet> set = adoptRef(new UnicodeRangeSet(ranges));
|
| - EXPECT_FALSE(set->isEntireRange());
|
| - EXPECT_FALSE(set->intersectsWith(String()));
|
| - EXPECT_FALSE(set->intersectsWith(String("1")));
|
| - EXPECT_TRUE(set->intersectsWith(String("2")));
|
| - EXPECT_TRUE(set->intersectsWith(String("3")));
|
| - EXPECT_TRUE(set->intersectsWith(String("4")));
|
| - EXPECT_FALSE(set->intersectsWith(String("5")));
|
| - EXPECT_TRUE(set->intersectsWith(String("6")));
|
| - EXPECT_TRUE(set->intersectsWith(String("7")));
|
| - EXPECT_FALSE(set->intersectsWith(String("8")));
|
| - ASSERT_EQ(2u, set->size());
|
| - EXPECT_EQ('2', set->rangeAt(0).from());
|
| - EXPECT_EQ('4', set->rangeAt(0).to());
|
| - EXPECT_EQ('6', set->rangeAt(1).from());
|
| - EXPECT_EQ('7', set->rangeAt(1).to());
|
| + UnicodeRangeSet set(ranges);
|
| + EXPECT_FALSE(set.isEntireRange());
|
| + EXPECT_FALSE(set.intersectsWith(String()));
|
| + EXPECT_FALSE(set.intersectsWith(String("1")));
|
| + EXPECT_TRUE(set.intersectsWith(String("2")));
|
| + EXPECT_TRUE(set.intersectsWith(String("3")));
|
| + EXPECT_TRUE(set.intersectsWith(String("4")));
|
| + EXPECT_FALSE(set.intersectsWith(String("5")));
|
| + EXPECT_TRUE(set.intersectsWith(String("6")));
|
| + EXPECT_TRUE(set.intersectsWith(String("7")));
|
| + EXPECT_FALSE(set.intersectsWith(String("8")));
|
| + ASSERT_EQ(2u, set.size());
|
| + EXPECT_EQ('2', set.rangeAt(0).from());
|
| + EXPECT_EQ('4', set.rangeAt(0).to());
|
| + EXPECT_EQ('6', set.rangeAt(1).from());
|
| + EXPECT_EQ('7', set.rangeAt(1).to());
|
| }
|
|
|
| TEST(UnicodeRangeSet, Overlap)
|
| @@ -68,22 +68,22 @@
|
| ranges.append(UnicodeRange('1', '1'));
|
| ranges.append(UnicodeRange('3', '5'));
|
| ranges.append(UnicodeRange('4', '6'));
|
| - RefPtr<UnicodeRangeSet> set = adoptRef(new UnicodeRangeSet(ranges));
|
| - ASSERT_EQ(1u, set->size());
|
| - EXPECT_EQ('0', set->rangeAt(0).from());
|
| - EXPECT_EQ('6', set->rangeAt(0).to());
|
| + UnicodeRangeSet set(ranges);
|
| + ASSERT_EQ(1u, set.size());
|
| + EXPECT_EQ('0', set.rangeAt(0).from());
|
| + EXPECT_EQ('6', set.rangeAt(0).to());
|
| }
|
|
|
| TEST(UnicodeRangeSet, Non8Bit)
|
| {
|
| Vector<UnicodeRange> ranges;
|
| ranges.append(UnicodeRange(0x3042, 0x3042));
|
| - RefPtr<UnicodeRangeSet> set = adoptRef(new UnicodeRangeSet(ranges));
|
| - ASSERT_EQ(1u, set->size());
|
| - EXPECT_EQ(0x3042, set->rangeAt(0).from());
|
| - EXPECT_EQ(0x3042, set->rangeAt(0).to());
|
| - EXPECT_FALSE(set->intersectsWith(String("a")));
|
| - EXPECT_TRUE(set->intersectsWith(String(hiraganaA)));
|
| + UnicodeRangeSet set(ranges);
|
| + ASSERT_EQ(1u, set.size());
|
| + EXPECT_EQ(0x3042, set.rangeAt(0).from());
|
| + EXPECT_EQ(0x3042, set.rangeAt(0).to());
|
| + EXPECT_FALSE(set.intersectsWith(String("a")));
|
| + EXPECT_TRUE(set.intersectsWith(String(hiraganaA)));
|
| }
|
|
|
| } // namespace blink
|
|
|