Test framework one file

.github/workflows/quick_deploy.yml → .github/workflows/test_and_deploy.yml

@@ -1,14 +1,45 @@
-# Workflow to push the change to deploy the change to players
-# on push to master much quicker without waiting for cron jobs.
-name: Deploy
+name: Run Tests
+
 on:
+#  pull_request
+  workflow_dispatch:
+  pull_request:
   push:
     branches:
-      - master
+      - 'master'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
 jobs:
+  run-tests:
+    name: Run Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Run Tests
+        run: docker compose -f tools/headless_testing/docker-compose.yml up
+        timeout-minutes: 30
+
+      - name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        with:
+          action_fail: true
+          action_fail_on_inconclusive: true
+          check_name: "Test Results"
+          time_unit: milliseconds
+          files: "tools/headless_testing/testlog/results.json"
+
   deploy:
+    name: Deploy
     runs-on: ubuntu-latest
-    if: github.repository == 'beyond-all-reason/Beyond-All-Reason'
+    needs: run-tests
+    if: |
+      github.repository == 'beyond-all-reason/Beyond-All-Reason' &&
+      github.event_name == 'push' &&
+      github.ref == 'refs/heads/master'
     permissions:
       id-token: write
     steps:
@@ -19,6 +50,7 @@ jobs:
           ssh -i id.key -o StrictHostKeyChecking=no debian@repos.beyondallreason.dev byar
         env:
           SSH_KEY: ${{ secrets.SSH_REPOS_DEPLOY_KEY }}
+
       - name: Authenticate to Google Cloud
         id: auth
         uses: google-github-actions/auth@v2
@@ -28,10 +60,12 @@ jobs:
           token_format: id_token
           id_token_audience: cdnupdater
           id_token_include_email: true
+
       - name: Sync files to CDN
         run: |
           curl --fail -H "Authorization: Bearer ${{ steps.auth.outputs.id_token }}" \
             -X POST -d '["byar"]' https://rapidsyncer-ssd-7xiouooxaa-ey.a.run.app/sync
+
       - name: Update CDN pointer
         run: |
           curl --fail -H "Authorization: Bearer ${{ steps.auth.outputs.id_token }}" \

common/testing/infologtest.lua

@@ -0,0 +1,32 @@
+local maxErrors = 10
+
+local function skipErrors(line)
+	if string.find(line, 'Could not finalize projectile-texture atlas', nil, true) then
+		return true
+	end
+end
+
+local function infologTest()
+	local errors = {}
+	local infolog = VFS.LoadFile("infolog.txt")
+	if infolog then
+		local fileLines = string.lines(infolog)
+		for i, line in ipairs(fileLines) do
+			if string.find(line, 'Error:', nil, true) and not skipErrors(line) then
+				errors[#errors+1] = line
+				if #errors > maxErrors then
+					return errors
+				end
+			end
+		end
+	end
+	return errors
+end
+
+
+function test()
+	local errors = infologTest()
+	if #errors > 0 then
+		error(table.concat(errors, "\n"), 0)
+	end
+end

common/testing/mocha_json_reporter.lua

@@ -8,11 +8,13 @@ function MochaJSONReporter:new()
 	local obj = {
 		totalTests = 0,
 		totalPasses = 0,
+		totalSkipped = 0,
 		totalFailures = 0,
 		startTime = nil,
 		endTime = nil,
 		duration = nil,
-		tests = {}
+		tests = {},
+		skipped = {}
 	}
 	setmetatable(obj, self)
 	self.__index = self
@@ -28,21 +30,37 @@ function MochaJSONReporter:endTests(duration)
 	self.duration = duration
 end
 
-function MochaJSONReporter:testResult(label, filePath, success, duration, errorMessage)
+function MochaJSONReporter:extractError(text)
+	local errorIndex = text:match'^%[string "[%p%a%s]*%"]:[%d]+:().*'
+	if errorIndex and errorIndex > 0 then
+		text = text:sub(errorIndex + 1)
+		return text
+	end
+	errorIndex = text:match'^%[t=[%d%.:]*%]%[f=[%-%d]*%] ().*'
+	if errorIndex and errorIndex > 0 then
+		text = text:sub(errorIndex)
+	end
+	return text
+end
+
+function MochaJSONReporter:testResult(label, filePath, success, skipped, duration, errorMessage)
 	local result = {
 		title = label,
 		fullTitle = label,
 		file = filePath,
 		duration = duration,
 	}
-	if success then
+	if skipped then
+		self.totalSkipped = self.totalSkipped + 1
+		result.err = {}
+	elseif success then
 		self.totalPasses = self.totalPasses + 1
 		result.err = {}
 	else
 		self.totalFailures = self.totalFailures + 1
 		if errorMessage ~= nil then
 			result.err = {
-				message = errorMessage,
+				message = self:extractError(errorMessage),
 				stack = errorMessage
 			}
 		else
@@ -54,6 +72,9 @@ function MochaJSONReporter:testResult(label, filePath, success, duration, errorM
 
 	self.totalTests = self.totalTests + 1
 	self.tests[#(self.tests) + 1] = result
+	if skipped then
+		self.skipped[#(self.skipped) + 1] = {fullTitle = label}
+	end
 end
 
 function MochaJSONReporter:report(filePath)
@@ -63,12 +84,14 @@ function MochaJSONReporter:report(filePath)
 			["tests"] = self.totalTests,
 			["passes"] = self.totalPasses,
 			["pending"] = 0,
+			["skipped"] = self.totalSkipped,
 			["failures"] = self.totalFailures,
 			["start"] = formatTimestamp(self.startTime),
 			["end"] = formatTimestamp(self.endTime),
 			["duration"] = self.duration
 		},
-		["tests"] = self.tests
+		["tests"] = self.tests,
+		["pending"] = self.skipped
 	}
 
 	local encoded = Json.encode(output)

luaui/Widgets/Tests/balance/test_arm_vs_cor_fighters.lua

@@ -0,0 +1,97 @@
+function setup()
+	Test.clearMap()
+end
+
+function cleanup()
+	Test.clearMap()
+
+	Spring.SendCommands("setspeed " .. 1)
+end
+
+function test()
+	local units = {
+		[0] = "armfig",
+		[1] = "corveng"
+	}
+	local n = 200
+
+	local midX, midZ = Game.mapSizeX / 2, Game.mapSizeZ / 2
+	local xOffset = 1000
+	local zStep = 10
+	local startZ = midZ - zStep * n / 2
+
+	-- make two lines of units facing each other
+	SyncedRun(function(locals)
+		do
+			local x = locals.midX - locals.xOffset
+			for i = 1, locals.n do
+				local z = locals.startZ + locals.zStep * i
+				local y = Spring.GetGroundHeight(x, z)
+				local unitID = Spring.CreateUnit(locals.units[0], x, y, z, "east", 0)
+			end
+		end
+
+		do
+			local x = locals.midX + locals.xOffset
+			for i = 1, locals.n do
+				local z = locals.startZ + locals.zStep * i
+				local y = Spring.GetGroundHeight(x, z)
+				local unitID = Spring.CreateUnit(locals.units[1], x, y, z, "west", 1)
+			end
+
+		end
+	end)
+
+	Test.waitFrames(1)
+
+	if false then
+		Spring.GiveOrderToUnitArray(Spring.GetTeamUnits(0), CMD.FIGHT, { midX, 0, midZ }, 0)
+		Spring.GiveOrderToUnitArray(Spring.GetTeamUnits(1), CMD.FIGHT, { midX, 0, midZ }, 0)
+	else
+		SyncedRun(function(locals)
+			local midX = locals.midX
+			local midZ = locals.midZ
+			for _, unitID in ipairs(Spring.GetAllUnits()) do
+				local ux, uy, uz = Spring.GetUnitPosition(unitID)
+
+				Spring.GiveOrderToUnit(unitID, CMD.FIGHT, { 2 * midX - ux, 0, uz }, 0)
+				Spring.GiveOrderToUnit(unitID, CMD.FIGHT, { midX, 0, midZ }, { "shift" })
+			end
+		end)
+	end
+
+	Spring.SendCommands("setspeed " .. 5)
+
+	-- wait until one team has no units left
+	Test.waitUntil(function()
+		return #(Spring.GetTeamUnits(0)) == 0 or #(Spring.GetTeamUnits(1)) == 0
+	end, 60 * 30)
+
+	Spring.SendCommands("setspeed " .. 1)
+
+	if #(Spring.GetTeamUnits(0)) > #(Spring.GetTeamUnits(1)) then
+		winner = 0
+	elseif #(Spring.GetTeamUnits(1)) > #(Spring.GetTeamUnits(0)) then
+		winner = 1
+	end
+
+	resultStr = "RESULT: "
+	if winner ~= nil then
+		unitName = units[winner]
+		if UnitDefNames and units[winner] and UnitDefNames[units[winner]] then
+			unitName = UnitDefNames[units[winner]].translatedHumanName or units[winner]
+		end
+		unitsLeft = #(Spring.GetAllUnits())
+		resultStr = resultStr .. "team " .. winner .. " wins"
+		resultStr = resultStr .. " with " .. unitsLeft
+		resultStr = resultStr .. " (" .. string.format("%.f%%", 100 * unitsLeft / n) .. ")"
+		resultStr = resultStr .. " " .. unitName .. " left"
+	else
+		resultStr = resultStr .. "tie"
+	end
+
+	Spring.Echo(resultStr)
+
+	-- cor fighters should win
+	assert(winner == 1)
+end

luaui/Widgets/Tests/balance/test_grunts_vs_pawns.lua

@@ -0,0 +1,85 @@
+function skip()
+	return Game.mapName ~= "Full Metal Plate 1.5"
+end
+
+function setup()
+	Test.clearMap()
+end
+
+function cleanup()
+	Test.clearMap()
+
+	Spring.SendCommands("setspeed " .. 1)
+end
+
+function test()
+	local units = {
+		[0] = "armpw",
+		[1] = "corak"
+	}
+	local n = 20
+
+	local midX, midZ = Game.mapSizeX / 2, Game.mapSizeZ / 2
+	local xOffset = 200
+	local zStep = 30
+	local startZ = midZ - zStep * n / 2
+
+	-- make two lines of units facing each other
+	SyncedRun(function(locals)
+		do
+			local x = locals.midX - locals.xOffset
+			for i = 1, locals.n do
+				local z = locals.startZ
+				local y = Spring.GetGroundHeight(x, z)
+				Spring.CreateUnit(locals.units[0], x, y, z + locals.zStep * i, "east", 0)
+			end
+		end
+
+		do
+			local x = locals.midX + locals.xOffset
+			for i = 1, locals.n do
+				local z = locals.startZ
+				local y = Spring.GetGroundHeight(x, z)
+				Spring.CreateUnit(locals.units[1], x, y, z + locals.zStep * i, "west", 1)
+			end
+
+		end
+	end)
+
+	Test.waitFrames(1)
+
+	Spring.GiveOrderToUnitArray(Spring.GetTeamUnits(0), CMD.FIGHT, { midX, 0, midZ }, 0)
+	Spring.GiveOrderToUnitArray(Spring.GetTeamUnits(1), CMD.FIGHT, { midX, 0, midZ }, 0)
+
+	Spring.SendCommands("setspeed " .. 20)
+
+	-- wait until one team has no units left
+	Test.waitUntil(function()
+		return #(Spring.GetTeamUnits(0)) == 0 or #(Spring.GetTeamUnits(1)) == 0
+	end, 30 * 30)
+
+	Spring.SendCommands("setspeed " .. 1)
+
+	if #(Spring.GetTeamUnits(0)) > #(Spring.GetTeamUnits(1)) then
+		winner = 0
+	elseif #(Spring.GetTeamUnits(1)) > #(Spring.GetTeamUnits(0)) then
+		winner = 1
+	end
+
+	resultStr = "RESULT: "
+	if winner ~= nil then
+		unitName = units[winner]
+		if UnitDefNames and units[winner] and UnitDefNames[units[winner]] then
+			unitName = UnitDefNames[units[winner]].translatedHumanName or units[winner]
+		end
+		resultStr = resultStr .. "team " .. winner .. " wins"
+		resultStr = resultStr .. " with " .. #(Spring.GetAllUnits()) .. " " .. unitName .. " left"
+	else
+		resultStr = resultStr .. "tie"
+	end
+
+	Spring.Echo(resultStr)
+
+	-- pawns should win
+	assert(winner == 0)
+end

luaui/Widgets/Tests/cmd_blueprint/test_cmd_blueprint_line.lua

@@ -16,9 +16,9 @@ function setup()
 
 	initialCameraState = Spring.GetCameraState()
 
-	Spring.SetCameraState({
-		mode = 5,
-	})
+	--Spring.SetCameraState({
+	--	mode = 5,
+	--})
 end
 
 function cleanup()
@@ -112,11 +112,13 @@ function test()
 	end)
 
 	local sx, sy = Spring.WorldToScreenCoords(x, y, z)
+	Spring.SetCameraTarget(x, y, z)
 	Spring.WarpMouse(sx, sy)
 
 	Script.LuaUI.MousePress(sx, sy, 1)
 
 	sx, sy = Spring.WorldToScreenCoords(x, y, z + bpH * (bpCount - 1))
+	Spring.SetCameraTarget(x, y, z + bpH * (bpCount - 1))
 	Spring.WarpMouse(sx, sy)
 
 	Test.waitFrames(delay)