Merge branch 'unit-test-suite'

Author: line0

modules/DependencyControl.moon

@@ -7,6 +7,7 @@ UpdateFeed = require "l0.DependencyControl.UpdateFeed"
 ConfigHandler = require "l0.DependencyControl.ConfigHandler"
 fileOps = require "l0.DependencyControl.FileOps"
 Updater = require "l0.DependencyControl.Updater"
+UnitTestSuite = require "l0.DependencyControl.UnitTestSuite"
 DownloadManager = require "DM.DownloadManager"
 PreciseTimer = require "PT.PreciseTimer"
 
@@ -75,6 +76,7 @@ class DependencyControl
     @UpdateFeed = UpdateFeed
     @Logger = Logger
     @Updater = Updater
+    @UnitTestSuite = UnitTestSuite
     @FileOps = fileOps
 
     automationDir: {macros:  aegisub.decode_path("?user/automation/autoload"),
@@ -128,6 +130,7 @@ class DependencyControl
 
         @configFile = configFile or "#{@namespace}.json"
         @automationDir = @@automationDir[@type]
+        @testDir = UnitTestSuite.testDir[@type]
         @version, err = @getVersionNumber version
         assert @version, msgs.new.badRecordError\format msgs.new.badRecord.badVersion\format err
 
@@ -439,10 +442,24 @@ class DependencyControl
             reqVersion = reqVersion and " (v#{reqVersion})" or ""
             return msgs.formatVersionErrorTemplate.missing\format name, reqVersion, url, reason
 
+    registerTests: (...) =>
+        -- load external tests
+        haveTests, tests = pcall require, "DepUnit.#{@type}.#{@namespace}"
 
-    register: (selfRef) =>
+        if haveTests and not @testsLoaded
+            @tests, tests.name = tests, @name
+            modules =  table.pack @requireModules!
+            if @moduleName
+                @tests\import @ref, modules, ...
+            else @tests\import modules, ...
+
+            @tests\registerMacros!
+            @testsLoaded = true
+
+    register: (selfRef, ...) =>
         -- replace dummy refs with real refs to own module
         @ref.__index, @ref, LOADED_MODULES[@moduleName] = selfRef, selfRef, selfRef
+        @registerTests selfRef, ...
         return selfRef
 
     registerMacro: (name=@name, description=@description, process, validate, isActive, useSubmenu) =>

modules/DependencyControl/Logger.moon

@@ -42,13 +42,13 @@ class Logger
         @fileName = @fileTemplate\format aegisub.decode_path(@logDir), os.date("%Y-%m-%d-%H-%M-%S"),
                                           math.random(0, 16^4-1), @fileBaseName, @fileSubName
 
-    logEx: (level = @defaultLevel, msg = "", insertLineFeed = true, prefix = @prefix,  ...) =>
+    logEx: (level = @defaultLevel, msg = "", insertLineFeed = true, prefix = @prefix, indent = @indent, ...) =>
         return false if msg == ""
 
         prefixWin = @usePrefixWindow and prefix or ""
         lineFeed = insertLineFeed and "\n" or ""
-        indentStr = @indent==0 and "" or @indentStr\rep(@indent) .. " "
-        msg = @lastHadLineFeed and @format(msg, @indent, ...) or msg\format ...
+        indentStr = indent==0 and "" or @indentStr\rep(indent) .. " "
+        msg = @lastHadLineFeed and @format(msg, indent, ...) or msg\format ...
 
         show = aegisub.log and @toWindow
         if @toFile and level <= @maxToFileLevel
@@ -80,8 +80,8 @@ class Logger
         return false unless level or msg
 
         if "number" != type level
-            return @logEx @defaultLevel, level, true, nil, msg, ...
-        else return @logEx level, msg, true, nil, ...
+            return @logEx @defaultLevel, level, true, nil, nil, msg, ...
+        else return @logEx level, msg, true, nil, nil, ...
 
     fatal: (...) => @log 0, ...
     error: (...) => @log 1, ...
@@ -103,7 +103,7 @@ class Logger
             unless @progressStep
                 @progressStep = 0
                 msg ..= " " if #msg>0
-                @logEx nil, "#{msg}[", false, nil, ...
+                @logEx nil, "#{msg}[", false, nil, nil, ...
             step = math.floor(progress * 0.01 + 0.5) / 0.1
             @logEx nil, "■"\rep(step-@progressStep), false, ""
             @progressStep = step