Skip to content

test: use a bit more realistic flow in tests. #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 2, 2022
Merged

test: use a bit more realistic flow in tests. #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f2b6233
test: use a bit more realistic flow in tests.
PiotrSikora Feb 28, 2022
142bac4
review: fix format.
PiotrSikora Mar 1, 2022
ba48a18
review: use smaller iteration count to avoid noise in logs.
PiotrSikora Mar 1, 2022
9b3e34e
Merge branch 'master' into test-refactor
PiotrSikora Mar 2, 2022
0236f00
review: pull stacktrace tests from #255.
PiotrSikora Mar 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/wasm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,9 @@ bool WasmBase::load(const std::string &code, bool allow_precompiled) {
fail(FailState::UnableToInitializeCode, message);
return false;
}
wasm_vm_->integration()->trace(message);
if (!message.empty()) {
wasm_vm_->integration()->trace(message);
}

// Get ABI version from the module.
if (!BytecodeUtil::getAbiVersion(code, abi_version_)) {
Expand Down
1 change: 1 addition & 0 deletions test/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ cc_test(
data = [
"//test/test_data:abi_export.wasm",
"//test/test_data:callback.wasm",
"//test/test_data:clock.wasm",
"//test/test_data:infinite_loop.wasm",
"//test/test_data:trap.wasm",
],
Expand Down
102 changes: 38 additions & 64 deletions test/exports_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,89 +30,63 @@
namespace proxy_wasm {
namespace {

INSTANTIATE_TEST_SUITE_P(WasmEngines, TestVM, testing::ValuesIn(getWasmEngines()),
INSTANTIATE_TEST_SUITE_P(WasmEngines, TestVm, testing::ValuesIn(getWasmEngines()),
[](const testing::TestParamInfo<std::string> &info) {
return info.param;
});

class TestContext : public ContextBase {
public:
TestContext(WasmBase *base) : ContextBase(base){};
WasmResult log(uint32_t /*log_level*/, std::string_view msg) override {
log_ += std::string(msg) + "\n";
return WasmResult::Ok;
}
std::string &log_msg() { return log_; }

private:
std::string log_;
};

TEST_P(TestVM, Environment) {
TEST_P(TestVm, Environment) {
std::unordered_map<std::string, std::string> envs = {{"KEY1", "VALUE1"}, {"KEY2", "VALUE2"}};
auto source = readTestWasmFile("env.wasm");

auto wasm_base = WasmBase(std::move(vm_), "vm_id", "", "", envs, {});
ASSERT_TRUE(wasm_base.wasm_vm()->load(source, {}, {}));

TestContext context(&wasm_base);
current_context_ = &context;

wasm_base.registerCallbacks();

ASSERT_TRUE(wasm_base.wasm_vm()->link(""));
ASSERT_FALSE(source.empty());
auto wasm = TestWasm(std::move(vm_), envs);
ASSERT_TRUE(wasm.load(source, false));
ASSERT_TRUE(wasm.initialize());

WasmCallVoid<0> run;
wasm_base.wasm_vm()->getFunction("run", &run);

run(current_context_);

auto msg = context.log_msg();
EXPECT_NE(std::string::npos, msg.find("KEY1: VALUE1\n")) << msg;
EXPECT_NE(std::string::npos, msg.find("KEY2: VALUE2\n")) << msg;
wasm.wasm_vm()->getFunction("run", &run);
ASSERT_TRUE(run != nullptr);
run(wasm.vm_context());

// Check application logs.
auto *context = dynamic_cast<TestContext *>(wasm.vm_context());
EXPECT_TRUE(context->isLogged("KEY1: VALUE1\n"));
EXPECT_TRUE(context->isLogged("KEY2: VALUE2\n"));
}

TEST_P(TestVM, WithoutEnvironment) {
TEST_P(TestVm, WithoutEnvironment) {
auto source = readTestWasmFile("env.wasm");
auto wasm_base = WasmBase(std::move(vm_), "vm_id", "", "", {}, {});
ASSERT_TRUE(wasm_base.wasm_vm()->load(source, {}, {}));

TestContext context(&wasm_base);
current_context_ = &context;

wasm_base.registerCallbacks();

ASSERT_TRUE(wasm_base.wasm_vm()->link(""));
ASSERT_FALSE(source.empty());
auto wasm = TestWasm(std::move(vm_), {});
ASSERT_TRUE(wasm.load(source, false));
ASSERT_TRUE(wasm.initialize());

WasmCallVoid<0> run;
wasm_base.wasm_vm()->getFunction("run", &run);

run(current_context_);
wasm.wasm_vm()->getFunction("run", &run);
ASSERT_TRUE(run != nullptr);
run(wasm.vm_context());

EXPECT_EQ(context.log_msg(), "");
// Check application logs.
auto *context = dynamic_cast<TestContext *>(wasm.vm_context());
EXPECT_TRUE(context->isLogEmpty());
}

TEST_P(TestVM, Clock) {
TEST_P(TestVm, Clock) {
auto source = readTestWasmFile("clock.wasm");
auto wasm_base = WasmBase(std::move(vm_), "vm_id", "", "", {}, {});
ASSERT_TRUE(wasm_base.wasm_vm()->load(source, {}, {}));

TestContext context(&wasm_base);
current_context_ = &context;

wasm_base.registerCallbacks();

ASSERT_TRUE(wasm_base.wasm_vm()->link(""));
ASSERT_FALSE(source.empty());
auto wasm = TestWasm(std::move(vm_));
ASSERT_TRUE(wasm.load(source, false));
ASSERT_TRUE(wasm.initialize());

WasmCallVoid<0> run;
wasm_base.wasm_vm()->getFunction("run", &run);
ASSERT_TRUE(run);
run(current_context_);

// Check logs.
auto msg = context.log_msg();
EXPECT_NE(std::string::npos, msg.find("monotonic: ")) << msg;
EXPECT_NE(std::string::npos, msg.find("realtime: ")) << msg;
wasm.wasm_vm()->getFunction("run", &run);
ASSERT_TRUE(run != nullptr);
run(wasm.vm_context());

// Check application logs.
auto *context = dynamic_cast<TestContext *>(wasm.vm_context());
EXPECT_TRUE(context->isLogged("monotonic: "));
EXPECT_TRUE(context->isLogged("realtime: "));
}

} // namespace
Expand Down
Loading