Make the integration tests a bit more deterministic

source/Engine.cpp

@@ -64,7 +64,6 @@ this program. If not, see <https://www.gnu.org/licenses/>.
 #include "System.h"
 #include "SystemEntry.h"
 #include "Test.h"
-#include "TestContext.h"
 #include "Visual.h"
 #include "Weather.h"
 #include "Wormhole.h"
@@ -549,22 +548,8 @@ void Engine::Step(bool isActive)
 		if(!wasActive)
 			activeCommands.Clear();
 		else
-		{
-			// Do a testing step if we got an active testContext from main.cpp.
-			// Main.cpp will transfer the context every step where it wants the
-			// engine to handle the testing.
-			if(testContext)
-			{
-				const Test *runningTest = testContext->CurrentTest();
-				if(runningTest)
-					runningTest->Step(*testContext, player, activeCommands);
-			}
 			ai.UpdateKeys(player, activeCommands);
-		}
 	}
-	// Clear the testContext every step. Main.cpp will provide the context before
-	// every step where it expects the Engine to handle testing.
-	testContext = nullptr;
 
 	wasActive = isActive;
 	Audio::Update(center);
@@ -1009,6 +994,14 @@ void Engine::Go()
 
 
 
+// Give a command on behalf of the player, used for integration tests.
+void Engine::GiveCommand(const Command &command)
+{
+	activeCommands.Set(command);
+}
+
+
+
 // Pass the list of game events to MainPanel for handling by the player, and any
 // UI element generation.
 list<ShipEvent> &Engine::Events()
@@ -1189,14 +1182,6 @@ void Engine::Draw() const
 
 
 
-// Set the given TestContext in the next step of the Engine.
-void Engine::SetTestContext(TestContext &newTestContext)
-{
-	testContext = &newTestContext;
-}
-
-
-
 // Select the object the player clicked on.
 void Engine::Click(const Point &from, const Point &to, bool hasShift, bool hasControl)
 {

source/Engine.h

@@ -49,7 +49,6 @@ class Projectile;
 class Ship;
 class ShipEvent;
 class Sprite;
-class TestContext;
 class Visual;
 class Weather;
 
@@ -80,16 +79,16 @@ class Engine {
 	// Begin the next step of calculations.
 	void Go();
 
+	// Give a command on behalf of the player, used for integration tests.
+	void GiveCommand(const Command &command);
+
 	// Get any special events that happened in this step.
 	// MainPanel::Step will clear this list.
 	std::list<ShipEvent> &Events();
 
 	// Draw a frame.
 	void Draw() const;
 
-	// Set the given TestContext in the next step of the Engine.
-	void SetTestContext(TestContext &newTestContext);
-
 	// Select the object the player clicked on.
 	void Click(const Point &from, const Point &to, bool hasShift, bool hasControl);
 	void RClick(const Point &point);
@@ -270,9 +269,6 @@ class Engine {
 	std::set<std::string> asteroidsScanned;
 	bool isAsteroidCatalogComplete = false;
 
-	// Input, Output and State handling for automated tests.
-	TestContext *testContext = nullptr;
-
 	Zoom zoom;
 	// Tracks the next zoom change so that objects aren't drawn at different zooms in a single frame.
 	Zoom nextZoom;

source/MainPanel.cpp

@@ -187,6 +187,13 @@ bool MainPanel::AllowsFastForward() const noexcept
 
 
 
+Engine &MainPanel::GetEngine()
+{
+	return engine;
+}
+
+
+
 // Only override the ones you need; the default action is to return false.
 bool MainPanel::KeyDown(SDL_Keycode key, Uint16 mod, const Command &command, bool isNewPress)
 {
@@ -212,14 +219,6 @@ bool MainPanel::KeyDown(SDL_Keycode key, Uint16 mod, const Command &command, boo
 
 
 
-// Forward the given TestContext to the Engine under MainPanel.
-void MainPanel::SetTestContext(TestContext &testContext)
-{
-	engine.SetTestContext(testContext);
-}
-
-
-
 bool MainPanel::Click(int x, int y, int clicks)
 {
 	// Don't respond to clicks if another panel is active.

source/MainPanel.h

@@ -44,12 +44,12 @@ class MainPanel : public Panel {
 	// The hail panel calls this when it closes.
 	void OnBribeCallback(const Government *bribed);
 
-	// Forward the given TestContext to the Engine under MainPanel.
-	virtual void SetTestContext(TestContext &testContext) override;
-
 	// The main panel allows fast-forward.
 	bool AllowsFastForward() const noexcept final;
 
+	// Get the underlying game engine used by the game.
+	Engine &GetEngine();
+
 
 protected:
 	// Only override the ones you need; the default action is to return false.

source/Panel.cpp

@@ -108,13 +108,6 @@ bool Panel::ZoneClick(const Point &point)
 
 
 
-// Forward the given TestContext to the Engine under MainPanel.
-void Panel::SetTestContext(TestContext &testContext)
-{
-}
-
-
-
 // Panels will by default not allow fast-forward. The ones that do allow
 // it will override this (virtual) function and return true.
 bool Panel::AllowsFastForward() const noexcept

source/Panel.h

@@ -65,9 +65,6 @@ class Panel {
 	// so, apply that zone's action and return true.
 	bool ZoneClick(const Point &point);
 
-	// Forward the given TestContext to the Engine under MainPanel.
-	virtual void SetTestContext(TestContext &testContext);
-
 	// Is fast-forward allowed to be on when this panel is on top of the GUI stack?
 	virtual bool AllowsFastForward() const noexcept;
 

source/Test.cpp

@@ -54,7 +54,6 @@ namespace {
 		{Test::TestStep::Type::INPUT, "input"},
 		{Test::TestStep::Type::LABEL, "label"},
 		{Test::TestStep::Type::NAVIGATE, "navigate"},
-		{Test::TestStep::Type::WATCHDOG, "watchdog"},
 	};
 
 	template<class K, class... Args>
@@ -286,9 +285,6 @@ void Test::LoadSequence(const DataNode &node)
 					}
 				}
 				break;
-			case TestStep::Type::WATCHDOG:
-				step.watchdog = child.Size() >= 2 ? child.Value(1) : 0;
-				break;
 			default:
 				child.PrintTrace("Error: unknown step type in test");
 				status = Status::BROKEN;
@@ -433,12 +429,6 @@ void Test::Step(TestContext &context, PlayerInfo &player, Command &commandToGive
 
 	while(context.callstack.back().step < steps.size() && !continueGameLoop)
 	{
-		// Fail if we encounter a watchdog timeout
-		if(context.watchdog == 1)
-			Fail(context, player, "watchdog timeout");
-		else if(context.watchdog > 1)
-			--(context.watchdog);
-
 		const TestStep &stepToRun = steps[context.callstack.back().step];
 		switch(stepToRun.stepType)
 		{
@@ -513,10 +503,6 @@ void Test::Step(TestContext &context, PlayerInfo &player, Command &commandToGive
 				player.SetTravelDestination(stepToRun.travelDestination);
 				++(context.callstack.back().step);
 				break;
-			case TestStep::Type::WATCHDOG:
-				context.watchdog = stepToRun.watchdog;
-				++(context.callstack.back().step);
-				break;
 			default:
 				Fail(context, player, "Unknown step type");
 				break;

source/Test.h

@@ -70,9 +70,6 @@ class Test {
 			LABEL,
 			// Instructs the game to set navigation / travel plan to a target system
 			NAVIGATE,
-			// Sets the watchdog timer. No value or zero disables the watchdog. Non-zero gives
-			// a watchdog in number of frames/steps.
-			WATCHDOG,
 		};
 
 
@@ -98,8 +95,6 @@ class Test {
 		std::string jumpOnTrueTarget;
 		std::string jumpOnFalseTarget;
 
-		unsigned int watchdog = 0;
-
 		// Input variables.
 		Command command;
 		std::set<std::string> inputKeys;

source/TestContext.h

@@ -48,8 +48,6 @@ friend class Test;
 	// Reference to the currently running test and test-step within the test.
 	std::vector<ActiveTestStep> callstack;
 
-	// Teststep to run.
-	unsigned int watchdog = 0;
 	std::set<ActiveTestStep> branchesSinceGameStep;
 };