encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-04 04:06:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add missing "strlen" parameter for Device InjectError command.

Browse Source 
This CL adds a StringMessageMatcher to the wire unittests harness
to validate that messages are not degenerate.

Bug: chromium:1004368
Change-Id: I121a259e67938b06ccc5e9829abfa3e25fffc003
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/11740
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Austin Eng 2019-10-02 06:35:38 +00:00 committed by Commit Bot service account
parent 4379e8f34f
commit 867f72058a
4 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dawn.json
View File

@ -543,7 +543,7 @@
"name": "inject error", "name": "inject error",
"args": [ "args": [
{"name": "type", "type": "error type"}, {"name": "type", "type": "error type"},
{"name": "message", "type": "char", "annotation": "const*"} {"name": "message", "type": "char", "annotation": "const*", "length": "strlen"}
], ],
"TODO": "enga@: Make this a Dawn extension" "TODO": "enga@: Make this a Dawn extension"
}, },

2
src/tests/unittests/wire/WireErrorCallbackTests.cpp
View File

@ -193,7 +193,7 @@ TEST_F(WireErrorCallbackTests, PopErrorScopeDeviceDestroyed) {
FlushClient(); FlushClient();
// Incomplete callback called in Device destructor. // Incomplete callback called in Device destructor.
EXPECT_CALL(*mockDevicePopErrorScopeCallback, Call(DAWN_ERROR_TYPE_UNKNOWN, _, this)).Times(1); EXPECT_CALL(*mockDevicePopErrorScopeCallback, Call(DAWN_ERROR_TYPE_UNKNOWN, ValidStringMessage(), this)).Times(1);
} }
// Test that PopErrorScope returns false if there are no error scopes. // Test that PopErrorScope returns false if there are no error scopes.

12
src/tests/unittests/wire/WireFenceTests.cpp
View File

@ -107,18 +107,18 @@ TEST_F(WireFenceTests, QueueSignalSuccess) {
// than or equal to the current signaled value // than or equal to the current signaled value
TEST_F(WireFenceTests, QueueSignalValidationError) { TEST_F(WireFenceTests, QueueSignalValidationError) {
dawnQueueSignal(queue, fence, 0u); // Error dawnQueueSignal(queue, fence, 0u); // Error
EXPECT_CALL(api, DeviceInjectError(apiDevice, DAWN_ERROR_TYPE_VALIDATION, _)).Times(1); EXPECT_CALL(api, DeviceInjectError(apiDevice, DAWN_ERROR_TYPE_VALIDATION, ValidStringMessage())).Times(1);
FlushClient(); FlushClient();
dawnQueueSignal(queue, fence, 1u); // Error dawnQueueSignal(queue, fence, 1u); // Error
EXPECT_CALL(api, DeviceInjectError(apiDevice, DAWN_ERROR_TYPE_VALIDATION, _)).Times(1); EXPECT_CALL(api, DeviceInjectError(apiDevice, DAWN_ERROR_TYPE_VALIDATION, ValidStringMessage())).Times(1);
FlushClient(); FlushClient();
DoQueueSignal(4u); // Success DoQueueSignal(4u); // Success
FlushClient(); FlushClient();
dawnQueueSignal(queue, fence, 3u); // Error dawnQueueSignal(queue, fence, 3u); // Error
EXPECT_CALL(api, DeviceInjectError(apiDevice, DAWN_ERROR_TYPE_VALIDATION, _)).Times(1); EXPECT_CALL(api, DeviceInjectError(apiDevice, DAWN_ERROR_TYPE_VALIDATION, ValidStringMessage())).Times(1);
FlushClient(); FlushClient();
} }
@ -194,7 +194,7 @@ TEST_F(WireFenceTests, OnCompletionValidationError) {
dawnFenceOnCompletion(fence, 2u, ToMockFenceOnCompletionCallback, this + 0); dawnFenceOnCompletion(fence, 2u, ToMockFenceOnCompletionCallback, this + 0);
EXPECT_CALL(api, DeviceInjectError(apiDevice, DAWN_ERROR_TYPE_VALIDATION, _)).Times(1); EXPECT_CALL(api, DeviceInjectError(apiDevice, DAWN_ERROR_TYPE_VALIDATION, ValidStringMessage())).Times(1);
FlushClient(); FlushClient();
} }
@ -235,7 +235,7 @@ TEST_F(WireFenceTests, SignalWrongQueue) {
FlushClient(); FlushClient();
dawnQueueSignal(queue2, fence, 2u); // error dawnQueueSignal(queue2, fence, 2u); // error
EXPECT_CALL(api, DeviceInjectError(apiDevice, DAWN_ERROR_TYPE_VALIDATION, _)).Times(1); EXPECT_CALL(api, DeviceInjectError(apiDevice, DAWN_ERROR_TYPE_VALIDATION, ValidStringMessage())).Times(1);
FlushClient(); FlushClient();
} }
@ -247,7 +247,7 @@ TEST_F(WireFenceTests, SignalWrongQueueDoesNotUpdateValue) {
FlushClient(); FlushClient();
dawnQueueSignal(queue2, fence, 2u); // error dawnQueueSignal(queue2, fence, 2u); // error
EXPECT_CALL(api, DeviceInjectError(apiDevice, DAWN_ERROR_TYPE_VALIDATION, _)).Times(1); EXPECT_CALL(api, DeviceInjectError(apiDevice, DAWN_ERROR_TYPE_VALIDATION, ValidStringMessage())).Times(1);
FlushClient(); FlushClient();
// Fence value should be unchanged. // Fence value should be unchanged.

29
src/tests/unittests/wire/WireTest.h
View File

@ -66,6 +66,35 @@ inline testing::Matcher<MatcherLambdaArgument<Lambda>> MatchesLambda(Lambda lamb
return MakeMatcher(new LambdaMatcherImpl<Lambda, MatcherLambdaArgument<Lambda>>(lambda)); return MakeMatcher(new LambdaMatcherImpl<Lambda, MatcherLambdaArgument<Lambda>>(lambda));
} }
class StringMessageMatcher : public testing::MatcherInterface<const char*> {
public:
explicit StringMessageMatcher() {}
bool MatchAndExplain(const char* message, testing::MatchResultListener* listener) const override {
if (message == nullptr) {
*listener << "missing error message";
return false;
}
if (std::strlen(message) <= 1) {
*listener << "message is truncated";
return false;
}
return true;
}
void DescribeTo(std::ostream* os) const override {
*os << "valid error message";
}
void DescribeNegationTo(std::ostream* os) const override {
*os << "invalid error message";
}
};
inline testing::Matcher<const char*> ValidStringMessage() {
return MakeMatcher(new StringMessageMatcher());
}
namespace dawn_wire { namespace dawn_wire {
class WireClient; class WireClient;
class WireServer; class WireServer;