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

While there, change the default integration log level to trace.

Signed-off-by: Piotr Sikora <[email protected]>

Author: PiotrSikora

src/wasm.cc

@@ -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_)) {

test/BUILD

@@ -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",
     ],

test/exports_test.cc

@@ -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