gpu/command_buffer/service/query_manager_unittest.cc - Issue 14308014: Clean up of GLES2 Command Decoder by moving some of the error state into a separate class.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gpu/command_buffer/service/query_manager_unittest.cc

Issue 14308014: Clean up of GLES2 Command Decoder by moving some of the error state into a separate class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed the remaining tests. Added mock ErrorState. Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« gpu/command_buffer/service/gles2_cmd_decoder.cc ('K') | « gpu/command_buffer/service/query_manager.cc ('k') | gpu/command_buffer/service/test_helper.h » ('j') | gpu/command_buffer/service/vertex_attrib_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/query_manager_unittest.cc

diff --git a/gpu/command_buffer/service/query_manager_unittest.cc b/gpu/command_buffer/service/query_manager_unittest.cc

index 74110145ee8e6ad0033e9c269d6b15bae8822c30..63ad4f5b27c426a9f95db383825953985d926d24 100644

--- a/gpu/command_buffer/service/query_manager_unittest.cc

+++ b/gpu/command_buffer/service/query_manager_unittest.cc

@@ -5,6 +5,7 @@

#include "gpu/command_buffer/service/query_manager.h"

#include "gpu/command_buffer/common/gles2_cmd_format.h"

#include "gpu/command_buffer/service/cmd_buffer_engine.h"

+#include "gpu/command_buffer/service/error_state_mock.h"

#include "gpu/command_buffer/service/gles2_cmd_decoder.h"

#include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"

#include "gpu/command_buffer/service/feature_info.h"

@@ -552,7 +553,10 @@ TEST_F(QueryManagerTest, GetErrorQuery) {

EXPECT_TRUE(manager->BeginQuery(query));

- EXPECT_CALL(*decoder_.get(), GetGLError())

+ MockErrorState mock_error_state;

+ EXPECT_CALL(*decoder_.get(), GetErrorState())

+ .WillRepeatedly(Return(&mock_error_state));

+ EXPECT_CALL(mock_error_state, GetGLError())

.WillOnce(Return(GL_INVALID_ENUM))

.RetiresOnSaturation();