Skip to content

Commit 48b667c

Browse files
committed
Use EXPECT_* for assertions that cannot crash in the new cpu affinity tests
1 parent c925a1c commit 48b667c

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

‎engine/src/flutter/fml/cpu_affinity_unittests.cc‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ TEST(CpuAffinity, NoLittleCores) {
4545
}
4646
auto tracker = CPUSpeedTracker(speeds);
4747

48-
ASSERT_TRUE(tracker.IsValid());
49-
ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency).size(), 8u);
50-
ASSERT_EQ(tracker.GetIndices(CpuAffinity::kEfficiency).size(), 6u);
51-
ASSERT_EQ(tracker.GetIndices(CpuAffinity::kPerformance).size(), 2u);
48+
EXPECT_TRUE(tracker.IsValid());
49+
EXPECT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency).size(), 8u);
50+
EXPECT_EQ(tracker.GetIndices(CpuAffinity::kEfficiency).size(), 6u);
51+
EXPECT_EQ(tracker.GetIndices(CpuAffinity::kPerformance).size(), 2u);
5252
}
5353

5454
TEST(CpuAffinity, LittleCoresByCapacity) {
@@ -58,10 +58,11 @@ TEST(CpuAffinity, LittleCoresByCapacity) {
5858
CpuIndexAndSpeed{.index = 2, .speed = 3302400, .capacity = 1024}};
5959
auto tracker = CPUSpeedTracker(speeds);
6060

61-
ASSERT_TRUE(tracker.IsValid());
61+
EXPECT_TRUE(tracker.IsValid());
62+
// The size check guards the indexing below.
6263
ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency).size(), 2u);
63-
ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency)[0], 1u);
64-
ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency)[1], 2u);
64+
EXPECT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency)[0], 1u);
65+
EXPECT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency)[1], 2u);
6566
}
6667

6768
TEST(CpuAffinity, CapacitiesThatSayNothing) {
@@ -78,9 +79,9 @@ TEST(CpuAffinity, CapacitiesThatSayNothing) {
7879
}
7980
auto tracker = CPUSpeedTracker(speeds);
8081

81-
ASSERT_TRUE(tracker.IsValid());
82+
EXPECT_TRUE(tracker.IsValid());
8283
ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency).size(), 2u);
83-
ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency)[0], 1u);
84+
EXPECT_EQ(tracker.GetIndices(CpuAffinity::kNotEfficiency)[0], 1u);
8485
}
8586
}
8687

0 commit comments

Comments
 (0)