[Tests] Use revLoadLibrary for loading the "_inputlib" library

peter-b · peter-b · commit e01c7b939549 · 2015-12-08T17:08:01.000Z
diff --git a/tests/_inputlib.livecodescript b/tests/_inputlib.livecodescript
@@ -16,6 +16,10 @@ 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/>.  */
 
+on revLoadLibrary
+   insert the script of me into back
+end revLoadLibrary
+
 local sTestStrings, sTestNumbers, sTestConversionStrings, sTestFilePaths, sArrayData
 local sInitialised
 
diff --git a/tests/_testrunner.livecodescript b/tests/_testrunner.livecodescript
@@ -172,15 +172,14 @@ end invokeTest
 
 -- Add the unit test library stack and the input library to the backscripts
 private command invokeLoadLibrary pInfo
-   -- Compute the filename of the library stack and load it
-   local tStackname
-   put invokeGetLibraryStack(pInfo) into tStackFile
-   put the name of stack tStackFile into tStackName
-
-   send "revLoadLibrary" to stack tStackname
-   
-   -- Use the test input library
-   start using stack invokeGetInputLibraryStack(pInfo)
+   local tLibrary, tStackName, tStackFile
+   repeat for each item tLibrary in "_testlib,_inputlib"
+      -- Compute the filename of the library stack and load it
+      put invokeGetStackFolder(pInfo) & slash & tLibrary & ".livecodescript" into tStackFile
+      put the name of stack tStackFile into tStackName
+      
+      send "revLoadLibrary" to stack tStackname
+   end repeat
 end invokeLoadLibrary
 
 private function invokeGetStackFolder pInfo
@@ -191,15 +190,6 @@ private function invokeGetStackFolder pInfo
    return item 1 to -2 of tFilename
 end invokeGetStackFolder
 
--- Return the filename of the unit test library stack
-private function invokeGetLibraryStack pInfo
-   return invokeGetStackFolder(pInfo) & slash & "_testlib.livecodescript"
-end invokeGetLibraryStack
-
-private function invokeGetInputLibraryStack pInfo
-   return invokeGetStackFolder(pInfo) & slash & "_inputlib.livecodescript"
-end invokeGetInputLibraryStack
-
 ----------------------------------------------------------------
 -- Support for running tests
 ----------------------------------------------------------------
