Merge branch 'develop' into sdl_console

Author: dhthwy

library/xml

@@ -1,3 +1,5 @@
+local utils = require('utils')
+
 config.target = 'core'
 config.mode = 'title' -- alters world state, not safe when a world is loaded
 
@@ -17,3 +19,28 @@ function test.removeJob()
     expect.true_(dfhack.job.removeJob(job))
     expect.nil_(df.global.world.jobs.list.next, 'job list is not empty after removeJob()')
 end
+
+-- EventManager job completion handling expects sorted order
+function test.jobIDsAreSortedAfterAdd()
+    local job1 = df.job:new()
+    dfhack.job.linkIntoWorld(job1)
+
+    local job2 = df.job:new()
+    dfhack.job.linkIntoWorld(job2)
+
+    local is_sorted = true
+    local prev_id = nil
+
+    for _, job in utils.listpairs(df.global.world.jobs.list) do
+        if prev_id and job.id < prev_id then
+            is_sorted = false
+            break
+        end
+        prev_id = job.id
+    end
+
+    dfhack.job.removeJob(job1)
+    dfhack.job.removeJob(job2)
+
+    expect.true_(is_sorted)
+end

scripts

@@ -0,0 +1,22 @@
+local utils = require('utils')
+
+config.target = 'core'
+config.mode = 'fortress'
+
+-- EventManager job completion handling expects sorted order
+function test.jobIDsAreSorted()
+    local is_sorted = true
+    local prev_id = nil
+
+    -- assumes there are at least some "naturally added" jobs currently in the list
+    -- but this should always be true for CI test saves
+    for _, job in utils.listpairs(df.global.world.jobs.list) do
+        if prev_id and job.id < prev_id then
+            is_sorted = false
+            break
+        end
+        prev_id = job.id
+    end
+
+    expect.true_(is_sorted)
+end