AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-11-25 13:00:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove use of SetContextMessageConsumer from binary_parse_test (#1925)

Browse Source 
This CL removes the use of SetContextMessageConsumer from the
binary_parse_test tests and creates a Context object and uses
SetMessageConsumer instead.
This commit is contained in:
dan sinclair 2018-09-26 13:17:36 -07:00 committed by GitHub
parent 026309ab27
commit 45784eb2c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
test/binary_parse_test.cpp
View File

@ -267,46 +267,42 @@ TEST_F(BinaryParseTest, NullDiagnosticsIsOkForBadParse) {
TEST_F(BinaryParseTest, NullConsumerNullDiagnosticsForBadParse) { TEST_F(BinaryParseTest, NullConsumerNullDiagnosticsForBadParse) {
auto words = CompileSuccessfully(""); auto words = CompileSuccessfully("");
auto ctx = spvContextCreate(SPV_ENV_UNIVERSAL_1_1); auto ctx = spvtools::Context(SPV_ENV_UNIVERSAL_1_1);
SetContextMessageConsumer(ctx, nullptr); ctx.SetMessageConsumer(nullptr);
words.push_back(0xffffffff); // Certainly invalid instruction header. words.push_back(0xffffffff); // Certainly invalid instruction header.
EXPECT_HEADER(1).WillOnce(Return(SPV_SUCCESS)); EXPECT_HEADER(1).WillOnce(Return(SPV_SUCCESS));
EXPECT_CALL(client_, Instruction(_)).Times(0); // No instruction callback. EXPECT_CALL(client_, Instruction(_)).Times(0); // No instruction callback.
EXPECT_EQ(SPV_ERROR_INVALID_BINARY, EXPECT_EQ(SPV_ERROR_INVALID_BINARY,
spvBinaryParse(ctx, &client_, words.data(), words.size(), spvBinaryParse(ctx.CContext(), &client_, words.data(), words.size(),
invoke_header, invoke_instruction, nullptr)); invoke_header, invoke_instruction, nullptr));
spvContextDestroy(ctx);
} }
TEST_F(BinaryParseTest, SpecifyConsumerNullDiagnosticsForGoodParse) { TEST_F(BinaryParseTest, SpecifyConsumerNullDiagnosticsForGoodParse) {
const auto words = CompileSuccessfully(""); const auto words = CompileSuccessfully("");
auto ctx = spvContextCreate(SPV_ENV_UNIVERSAL_1_1); auto ctx = spvtools::Context(SPV_ENV_UNIVERSAL_1_1);
int invocation = 0; int invocation = 0;
SetContextMessageConsumer( ctx.SetMessageConsumer([&invocation](spv_message_level_t, const char*,
ctx, [&invocation](spv_message_level_t, const char*, const spv_position_t&,
const spv_position_t&, const char*) { ++invocation; }); const char*) { ++invocation; });
EXPECT_HEADER(1).WillOnce(Return(SPV_SUCCESS)); EXPECT_HEADER(1).WillOnce(Return(SPV_SUCCESS));
EXPECT_CALL(client_, Instruction(_)).Times(0); // No instruction callback. EXPECT_CALL(client_, Instruction(_)).Times(0); // No instruction callback.
EXPECT_EQ(SPV_SUCCESS, EXPECT_EQ(SPV_SUCCESS,
spvBinaryParse(ctx, &client_, words.data(), words.size(), spvBinaryParse(ctx.CContext(), &client_, words.data(), words.size(),
invoke_header, invoke_instruction, nullptr)); invoke_header, invoke_instruction, nullptr));
EXPECT_EQ(0, invocation); EXPECT_EQ(0, invocation);
spvContextDestroy(ctx);
} }
TEST_F(BinaryParseTest, SpecifyConsumerNullDiagnosticsForBadParse) { TEST_F(BinaryParseTest, SpecifyConsumerNullDiagnosticsForBadParse) {
auto words = CompileSuccessfully(""); auto words = CompileSuccessfully("");
auto ctx = spvContextCreate(SPV_ENV_UNIVERSAL_1_1); auto ctx = spvtools::Context(SPV_ENV_UNIVERSAL_1_1);
int invocation = 0; int invocation = 0;
SetContextMessageConsumer( ctx.SetMessageConsumer(
ctx, [&invocation](spv_message_level_t level, const char* source, [&invocation](spv_message_level_t level, const char* source,
const spv_position_t& position, const char* message) { const spv_position_t& position, const char* message) {
++invocation; ++invocation;
EXPECT_EQ(SPV_MSG_ERROR, level); EXPECT_EQ(SPV_MSG_ERROR, level);
EXPECT_STREQ("input", source); EXPECT_STREQ("input", source);
@ -320,52 +316,46 @@ TEST_F(BinaryParseTest, SpecifyConsumerNullDiagnosticsForBadParse) {
EXPECT_HEADER(1).WillOnce(Return(SPV_SUCCESS)); EXPECT_HEADER(1).WillOnce(Return(SPV_SUCCESS));
EXPECT_CALL(client_, Instruction(_)).Times(0); // No instruction callback. EXPECT_CALL(client_, Instruction(_)).Times(0); // No instruction callback.
EXPECT_EQ(SPV_ERROR_INVALID_BINARY, EXPECT_EQ(SPV_ERROR_INVALID_BINARY,
spvBinaryParse(ctx, &client_, words.data(), words.size(), spvBinaryParse(ctx.CContext(), &client_, words.data(), words.size(),
invoke_header, invoke_instruction, nullptr)); invoke_header, invoke_instruction, nullptr));
EXPECT_EQ(1, invocation); EXPECT_EQ(1, invocation);
spvContextDestroy(ctx);
} }
TEST_F(BinaryParseTest, SpecifyConsumerSpecifyDiagnosticsForGoodParse) { TEST_F(BinaryParseTest, SpecifyConsumerSpecifyDiagnosticsForGoodParse) {
const auto words = CompileSuccessfully(""); const auto words = CompileSuccessfully("");
auto ctx = spvContextCreate(SPV_ENV_UNIVERSAL_1_1); auto ctx = spvtools::Context(SPV_ENV_UNIVERSAL_1_1);
int invocation = 0; int invocation = 0;
SetContextMessageConsumer( ctx.SetMessageConsumer([&invocation](spv_message_level_t, const char*,
ctx, [&invocation](spv_message_level_t, const char*, const spv_position_t&,
const spv_position_t&, const char*) { ++invocation; }); const char*) { ++invocation; });
EXPECT_HEADER(1).WillOnce(Return(SPV_SUCCESS)); EXPECT_HEADER(1).WillOnce(Return(SPV_SUCCESS));
EXPECT_CALL(client_, Instruction(_)).Times(0); // No instruction callback. EXPECT_CALL(client_, Instruction(_)).Times(0); // No instruction callback.
EXPECT_EQ(SPV_SUCCESS, EXPECT_EQ(SPV_SUCCESS,
spvBinaryParse(ctx, &client_, words.data(), words.size(), spvBinaryParse(ctx.CContext(), &client_, words.data(), words.size(),
invoke_header, invoke_instruction, &diagnostic_)); invoke_header, invoke_instruction, &diagnostic_));
EXPECT_EQ(0, invocation); EXPECT_EQ(0, invocation);
EXPECT_EQ(nullptr, diagnostic_); EXPECT_EQ(nullptr, diagnostic_);
spvContextDestroy(ctx);
} }
TEST_F(BinaryParseTest, SpecifyConsumerSpecifyDiagnosticsForBadParse) { TEST_F(BinaryParseTest, SpecifyConsumerSpecifyDiagnosticsForBadParse) {
auto words = CompileSuccessfully(""); auto words = CompileSuccessfully("");
auto ctx = spvContextCreate(SPV_ENV_UNIVERSAL_1_1); auto ctx = spvtools::Context(SPV_ENV_UNIVERSAL_1_1);
int invocation = 0; int invocation = 0;
SetContextMessageConsumer( ctx.SetMessageConsumer([&invocation](spv_message_level_t, const char*,
ctx, [&invocation](spv_message_level_t, const char*, const spv_position_t&,
const spv_position_t&, const char*) { ++invocation; }); const char*) { ++invocation; });
words.push_back(0xffffffff); // Certainly invalid instruction header. words.push_back(0xffffffff); // Certainly invalid instruction header.
EXPECT_HEADER(1).WillOnce(Return(SPV_SUCCESS)); EXPECT_HEADER(1).WillOnce(Return(SPV_SUCCESS));
EXPECT_CALL(client_, Instruction(_)).Times(0); // No instruction callback. EXPECT_CALL(client_, Instruction(_)).Times(0); // No instruction callback.
EXPECT_EQ(SPV_ERROR_INVALID_BINARY, EXPECT_EQ(SPV_ERROR_INVALID_BINARY,
spvBinaryParse(ctx, &client_, words.data(), words.size(), spvBinaryParse(ctx.CContext(), &client_, words.data(), words.size(),
invoke_header, invoke_instruction, &diagnostic_)); invoke_header, invoke_instruction, &diagnostic_));
EXPECT_EQ(0, invocation); EXPECT_EQ(0, invocation);
EXPECT_STREQ("Invalid opcode: 65535", diagnostic_->error); EXPECT_STREQ("Invalid opcode: 65535", diagnostic_->error);
spvContextDestroy(ctx);
} }
TEST_F(BinaryParseTest, TEST_F(BinaryParseTest,