commit bb0a0bbd3f4e1869377a3bdeaf5a3b339e697133
author Geoff Lang <geofflang@chromium.org> Fri Mar 27 12:16:57 2015 -0400
committer Geoff Lang <geofflang@chromium.org> Wed Apr 15 18:07:03 2015 +0000
tree 1aa0ebd3ad5ec23cdf5dc8057deb4a1902aa7dfe
parent cfaeaa9f67638cdf2fdee72ad4d39bbeb7104bcb

Rename TransformFeedback members to match the spec.

BUG=angleproject:763

Change-Id: I12fa57de9263eb0cb5ff1840cf44b0a8f2a40912
Reviewed-on: https://chromium-review.googlesource.com/263721
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/TransformFeedback_unittest.cpp

diff --git a/src/libANGLE/TransformFeedback_unittest.cpp b/src/libANGLE/TransformFeedback_unittest.cpp
index 4aafd3d..185c01b 100644
--- a/src/libANGLE/TransformFeedback_unittest.cpp
+++ b/src/libANGLE/TransformFeedback_unittest.cpp
@@ -63,32 +63,32 @@
 {
     testing::InSequence seq;
 
-    EXPECT_EQ(GL_FALSE, mFeedback->isStarted());
+    EXPECT_FALSE(mFeedback->isActive());
     EXPECT_CALL(*mImpl, begin(GL_TRIANGLES));
-    mFeedback->start(GL_TRIANGLES);
-    EXPECT_EQ(GL_TRUE, mFeedback->isStarted());
-    EXPECT_EQ(static_cast<GLenum>(GL_TRIANGLES), mFeedback->getDrawMode());
+    mFeedback->begin(GL_TRIANGLES);
+    EXPECT_TRUE(mFeedback->isActive());
+    EXPECT_EQ(static_cast<GLenum>(GL_TRIANGLES), mFeedback->getPrimitiveMode());
     EXPECT_CALL(*mImpl, end());
-    mFeedback->stop();
-    EXPECT_EQ(GL_FALSE, mFeedback->isStarted());
+    mFeedback->end();
+    EXPECT_FALSE(mFeedback->isActive());
 }
 
 TEST_F(TransformFeedbackTest, SideEffectsOfPauseAndResume)
 {
     testing::InSequence seq;
 
-    EXPECT_FALSE(mFeedback->isStarted());
+    EXPECT_FALSE(mFeedback->isActive());
     EXPECT_CALL(*mImpl, begin(GL_TRIANGLES));
-    mFeedback->start(GL_TRIANGLES);
-    EXPECT_EQ(GL_FALSE, mFeedback->isPaused());
+    mFeedback->begin(GL_TRIANGLES);
+    EXPECT_FALSE(mFeedback->isPaused());
     EXPECT_CALL(*mImpl, pause());
     mFeedback->pause();
-    EXPECT_EQ(GL_TRUE, mFeedback->isPaused());
+    EXPECT_TRUE(mFeedback->isPaused());
     EXPECT_CALL(*mImpl, resume());
     mFeedback->resume();
-    EXPECT_EQ(GL_FALSE, mFeedback->isPaused());
+    EXPECT_FALSE(mFeedback->isPaused());
     EXPECT_CALL(*mImpl, end());
-    mFeedback->stop();
+    mFeedback->end();
 }
 
 } // namespace