Consolidate unit testing code

luprex/cpp/core/eng-tests.hpp

@@ -1,5 +0,0 @@
-#ifndef DRIVERTESTS_HPP
-#define DRIVERTESTS_HPP
-
-#endif // DRIVERTESTS_HPP
-

luprex/cpp/core/source.cpp

@@ -433,43 +433,6 @@ eng::string SourceDB::rebuild_module(const eng::string &mod) {
     }
 }
 
-void SourceDB::run_unittests() {
-    lua_State *L = lua_state_;
-    LuaVar unittests, name, func, err, globtab;
-    LuaExtStack LS(L, unittests, name, func, err, globtab);
-
-    LS.getglobaltable(globtab);
-    LS.rawget(unittests, globtab, "unittests");
-
-    // Sort the unit test names.
-    eng::set<eng::string> names;
-    LS.set(name, LuaNil);
-    while (LS.next(unittests, name, func) != 0) {
-        if (LS.isfunction(func) && LS.isstring(name)) {
-            names.insert(LS.ckstring(name));
-        }
-    }
-
-    // Run the functions in order
-    bool any = false;
-    for (const eng::string &name : names) {
-        util::dprint("Running unittests: ", name);
-        LS.rawget(func, unittests, name);
-
-        lua_pushvalue(L, func.index());
-        eng::string msg = traceback_pcall(L, 0, 0);
-        if (!msg.empty()) {
-            LS.set(err, msg);
-            util::dprint(msg);
-            any = true;
-        }
-    }
-
-    if (any) {
-        exit(1);
-    }
-}
-
 void SourceDB::init(lua_State *L) {
     lua_state_ = L;
     LuaVar globtab, persist, unpersist, classname, classtab, funcname, funcp, rawfunc, nullstring;

luprex/cpp/core/source.hpp

@@ -181,13 +181,6 @@ public:
     void diff(const SourceDB &auth, StreamBuffer *sb);
     bool patch(StreamBuffer *sb, DebugCollector *dbc);
 
-    // run_unittests
-    //
-    // Run all the lua unit tests.  Print any errors to console.  If there
-    // are any errors, exits the program.
-    //
-    void run_unittests();
-
     // Get/Set code (for unit testing).
     //
     // These functions are direct getters/setters for values in the source

luprex/cpp/core/unit-testing.cpp

@@ -3,9 +3,80 @@
 #include "drivenengine.hpp"
 #include "streambuffer.hpp"
 #include "world.hpp"
+#include "traceback.hpp"
 
 #include <iomanip>
 
+static void run_unittests(lua_State *L) {
+    LuaVar unittests, name, func, err, globtab;
+    LuaExtStack LS(L, unittests, name, func, err, globtab);
+
+    LS.getglobaltable(globtab);
+    LS.rawget(unittests, globtab, "unittests");
+
+    // Sort the unit test names.
+    eng::set<eng::string> names;
+    LS.set(name, LuaNil);
+    while (LS.next(unittests, name, func) != 0) {
+        if (LS.isfunction(func) && LS.isstring(name)) {
+            names.insert(LS.ckstring(name));
+        }
+    }
+
+    // Run the functions in order
+    bool any = false;
+    for (const eng::string &name : names) {
+        util::dprint("Running unittests: ", name);
+        LS.rawget(func, unittests, name);
+
+        lua_pushvalue(L, func.index());
+        eng::string msg = traceback_pcall(L, 0, 0);
+        if (!msg.empty()) {
+            LS.set(err, msg);
+            util::dprint(msg);
+            any = true;
+        }
+    }
+
+    if (any) {
+        exit(1);
+    }
+}
+
+class RunUnitTests : public DrivenEngine {
+public:
+    UniqueWorld world_;
+
+    RunUnitTests(EngineWrapper *) {
+        world_.reset(new World(WORLD_TYPE_MASTER));
+        rescan_lua_source(true);
+    }
+
+    virtual void event_access(AccessKind kind, int64_t place_id, std::string_view datapk, StreamBuffer *retpk) override {
+        switch (kind) {
+            case AccessKind::INVOKE_LUA_SOURCE: {
+                world_->update_source(datapk);
+                run_unittests(world_->state());
+                stop_driver();
+                break;
+            }
+            default: break;
+        }
+    }
+
+    void event_update() override {}
+};
+
+////////////////////////////////////////////////////////////
+//
+// Driver tests.
+//
+// These tests can't go through the unit testing framework,
+// because they're tests of the driver-engine interface
+// and the driver.
+//
+////////////////////////////////////////////////////////////
+
 static void write_closed_message(Channel *ch) {
     util::dprint("Chan ", ch->chid(), " closed [", ch->error(), "]\n");
 }
@@ -89,30 +160,6 @@ public:
 };
 
 
-class RunUnitTests : public DrivenEngine {
-public:
-    UniqueWorld world_;
-
-    RunUnitTests(EngineWrapper *) {
-        world_.reset(new World(WORLD_TYPE_MASTER));
-        rescan_lua_source(true);
-    }
-
-    virtual void event_access(AccessKind kind, int64_t place_id, std::string_view datapk, StreamBuffer *retpk) override {
-        switch (kind) {
-            case AccessKind::INVOKE_LUA_SOURCE: {
-                world_->update_source(datapk);
-                world_->run_unittests();
-                stop_driver();
-                break;
-            }
-            default: break;
-        }
-    }
-
-    void event_update() override {}
-};
-
 DrivenEngineDefine("driverwebservertest", DriverWebServerTest);
 DrivenEngineDefine("driverdnsfailtest", DriverDNSFailTest);
 DrivenEngineDefine("driverprintclocktest", DriverPrintClockTest);

luprex/cpp/core/unit-testing.hpp

@@ -0,0 +1 @@
+#pragma once

luprex/cpp/core/world-core.cpp

@@ -713,12 +713,6 @@ HttpServerResponse World::http_serve(const HttpParser &request) {
     return response;
 }
 
-void World::run_unittests() {
-    assert(stack_is_clear());
-    source_db_.run_unittests();
-    assert(stack_is_clear());
-}
-
 void World::invoke(const Invocation &inv) {
     switch (inv.kind()) {
     case AccessKind::INVOKE_LUA_CALL:

luprex/cpp/core/world.hpp

@@ -317,10 +317,6 @@ public:
     //
     HttpServerResponse http_serve(const HttpParser &request);
     
-    // Run all unit tests.
-    //
-    void run_unittests();
-    
     // Install this world into an EngineWrapper's function pointers.
     //
     void expose_world_to_driver(EngineWrapper *w);