[[ Tests ]] Add helper function for getting built module file

livecodeali · livecodeali · commit 4c3a4d7de6f9 · 2017-10-13T17:31:29.000+01:00
Also correct spelling of TestLoadAuxiliaryExtension, and add
resource path parameter to it.
diff --git a/tests/_testlib.livecodescript b/tests/_testlib.livecodescript
@@ -394,7 +394,13 @@ on TestLoadExternal pExternal
 end TestLoadExternal 
 
 private function __GetCaller
-   get item 1 to -3 of line -3 of the executionContexts
+   local tLineNum
+   put -1 into tLineNum
+   repeat while item 1 of line tLineNum of the executionContexts \
+      is the long id of this me
+      subtract 1 from tLineNum
+   end repeat
+   get item 1 to -3 of line tLineNum of the executionContexts
    if there is not an it then
       delete item -1 of it
    end if
@@ -409,23 +415,38 @@ end __StackOfObject
 
 -- This loads an extension whose lcb source sits in the same folder as the
 -- current test.
-on TestLoadAuxillaryExtension pName
-	local tBasePath, tExtraPath
-	set the itemDelimiter to slash
-	put item 1 to -2 of the effective filename of __StackOfObject(__GetCaller()) into tBasePath
-	repeat while the last item of tBasePath is not "tests"
-		put item -1 of tBasePath & slash before tExtraPath
-		delete the last item of tBasePath
-	end repeat
-
-	local tModuleFile
-	put tBasePath & "/../_tests/_build/" & tExtraPath & pName & ".lcm" into tModuleFile
-
-	load extension from data url ("binfile:" & tModuleFile)
-	if the result is not empty then
-		throw "Failed to load auxillary extension:" && the result && tModuleFile
-	end if
-end TestLoadAuxillaryExtension
+on TestLoadAuxiliaryExtension pName, pResourceFolder
+   local tBytecodeFile
+   put TestGetBuiltBytecodeFile(pName) into tBytecodeFile
+   if pResourceFolder is empty then
+      load extension from data url ("binfile:" & tBytecodeFile)
+   else
+      load extension from data url ("binfile:" & tBytecodeFile) \
+            with resource path pResourceFolder
+   end if
+   
+   if the result is not empty then
+      throw "Failed to load auxiliary extension:" && \
+            the result && tBytecodeFile
+   end if
+end TestLoadAuxiliaryExtension
+
+constant kBytecodePathPrefix = "_tests/_build/"
+function TestGetBuiltBytecodeFile pName
+   local tBasePath, tExtraPath
+   set the itemDelimiter to slash
+   put item 1 to -2 of the effective filename of \
+         __StackOfObject(__GetCaller()) into tBasePath
+   repeat while the last item of tBasePath is not "tests"
+      put item -1 of tBasePath & slash before tExtraPath
+      delete the last item of tBasePath
+   end repeat
+   
+   local tModuleFile
+   put tBasePath & "/../" & kBytecodePathPrefix & tExtraPath & pName \
+      & ".lcm" into tModuleFile
+   return tModuleFile
+end TestGetBuiltBytecodeFile
 
 on TestLoadAllExtensions
    local tExtFolder
diff --git a/tests/lcs/core/engine/extension.livecodescript b/tests/lcs/core/engine/extension.livecodescript
@@ -16,8 +16,6 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
-constant kBytecodePath = "../_tests/_build/lcs/core/engine"
-
 local sTestExtension
 
 on TestSetup
@@ -42,7 +40,7 @@ private command buildMultiModuleExtension pInputs, pOutput
     -- Build a multi-module extension
     local tBasename, tBytecode, tFile, tResult
     repeat for each item tBasename in pInputs
-       put merge("[[kBytecodePath]]/[[tBasename]].lcm") into tFile
+       put TestGetBuiltBytecodeFile(tBasename) into tFile
        put url("binfile:" & tFile) after tBytecode
        put the result into tResult
        if tResult is not empty then
diff --git a/tests/lcs/core/engine/widget.livecodescript b/tests/lcs/core/engine/widget.livecodescript
@@ -21,9 +21,9 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 on TestSetup
    TestSkipIfNot "lcb"
    
-   TestLoadAuxillaryExtension "_widget"
-   TestLoadAuxillaryExtension "_widget_support"
-   TestLoadAuxillaryExtension "_widgetthrow"
+   TestLoadAuxiliaryExtension "_widget"
+   TestLoadAuxiliaryExtension "_widget_support"
+   TestLoadAuxiliaryExtension "_widgetthrow"
 end TestSetup
 
 //////////
@@ -104,7 +104,7 @@ on TestWidgetRetainRep
    save stack "WidgetRetainRepTest" as tPath
    delete stack "WidgetRetainRepTest"
    
-   TestLoadAuxillaryExtension "_widget_save"
+   TestLoadAuxiliaryExtension "_widget_save"
    
    go stack tPath
    
