Merge pull request #199 from jupp0r/use-expect-eq

Prefer EXPECT_EQ/GT over EXPECT_THAT

Author: gjasny

core/tests/family_test.cc

@@ -32,7 +32,7 @@ TEST(FamilyTest, counter_value) {
   auto collected = family.Collect();
   ASSERT_GE(collected.size(), 1);
   ASSERT_GE(collected[0].metric.size(), 1);
-  EXPECT_THAT(collected[0].metric.at(0).counter.value, ::testing::Eq(1));
+  EXPECT_EQ(1, collected[0].metric.at(0).counter.value);
 }
 
 TEST(FamilyTest, remove) {
@@ -53,8 +53,7 @@ TEST(FamilyTest, Histogram) {
   auto collected = family.Collect();
   ASSERT_EQ(collected.size(), 1);
   ASSERT_GE(collected[0].metric.size(), 1);
-  EXPECT_THAT(collected[0].metric.at(0).histogram.sample_count,
-              ::testing::Eq(1));
+  EXPECT_EQ(1, collected[0].metric.at(0).histogram.sample_count);
 }
 
 TEST(FamilyTest, add_twice) {

core/tests/gauge_test.cc

@@ -61,7 +61,7 @@ TEST(GaugeTest, set_multiple) {
 TEST(GaugeTest, set_to_current_time) {
   Gauge gauge;
   gauge.SetToCurrentTime();
-  EXPECT_THAT(gauge.Value(), ::testing::Gt(0.0));
+  EXPECT_GT(gauge.Value(), 0.0);
 }
 
 }  // namespace