X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=unittests%2FADT%2FPointerIntPairTest.cpp;h=e27a5823a51ed9cc5023749de4adfd57ac6d6c8c;hp=3da31e7dfe7bfc56c33d63e75b4e8e02d4e9f8fc;hb=1093924e4575f8b0db279709f71e81a372585ed4;hpb=bc3b24269eabf6e9e54598c82ede3c741d8a6e61

diff --git a/unittests/ADT/PointerIntPairTest.cpp b/unittests/ADT/PointerIntPairTest.cpp
index 3da31e7dfe7..e27a5823a51 100644
--- a/unittests/ADT/PointerIntPairTest.cpp
+++ b/unittests/ADT/PointerIntPairTest.cpp
@@ -14,35 +14,36 @@ using namespace llvm;
 
 namespace {
 
-// Test fixture
-class PointerIntPairTest : public testing::Test {
-};
+TEST(PointerIntPairTest, GetSet) {
+  struct S {
+    int i;
+  };
+  S s;
 
-TEST_F(PointerIntPairTest, GetSet) {
-  PointerIntPair<PointerIntPairTest *, 2> Pair{this, 1U};
-  EXPECT_EQ(this, Pair.getPointer());
+  PointerIntPair<S *, 2> Pair(&s, 1U);
+  EXPECT_EQ(&s, Pair.getPointer());
   EXPECT_EQ(1U, Pair.getInt());
 
   Pair.setInt(2);
-  EXPECT_EQ(this, Pair.getPointer());
+  EXPECT_EQ(&s, Pair.getPointer());
   EXPECT_EQ(2U, Pair.getInt());
 
   Pair.setPointer(nullptr);
   EXPECT_EQ(nullptr, Pair.getPointer());
   EXPECT_EQ(2U, Pair.getInt());
 
-  Pair.setPointerAndInt(this, 3U);
-  EXPECT_EQ(this, Pair.getPointer());
+  Pair.setPointerAndInt(&s, 3U);
+  EXPECT_EQ(&s, Pair.getPointer());
   EXPECT_EQ(3U, Pair.getInt());
 }
 
-TEST_F(PointerIntPairTest, DefaultInitialize) {
-  PointerIntPair<PointerIntPairTest *, 2> Pair;
+TEST(PointerIntPairTest, DefaultInitialize) {
+  PointerIntPair<float *, 2> Pair;
   EXPECT_EQ(nullptr, Pair.getPointer());
   EXPECT_EQ(0U, Pair.getInt());
 }
 
-TEST_F(PointerIntPairTest, ManyUnusedBits) {
+TEST(PointerIntPairTest, ManyUnusedBits) {
   // In real code this would be a word-sized integer limited to 31 bits.
   struct Fixnum31 {
     uintptr_t Value;
@@ -61,11 +62,11 @@ TEST_F(PointerIntPairTest, ManyUnusedBits) {
 
   PointerIntPair<Fixnum31, 1, bool, FixnumPointerTraits> pair;
   EXPECT_EQ((uintptr_t)0, pair.getPointer().Value);
-  EXPECT_EQ(false, pair.getInt());
+  EXPECT_FALSE(pair.getInt());
 
   pair.setPointerAndInt({ 0x7FFFFFFF }, true );
   EXPECT_EQ((uintptr_t)0x7FFFFFFF, pair.getPointer().Value);
-  EXPECT_EQ(true, pair.getInt());
+  EXPECT_TRUE(pair.getInt());
 
   EXPECT_EQ(FixnumPointerTraits::NumLowBitsAvailable - 1,
             PointerLikeTypeTraits<decltype(pair)>::NumLowBitsAvailable);