From 1aa0af21c4fe874dd72f987cfdb1f279930d76d9 Mon Sep 17 00:00:00 2001 From: Bronley Date: Sun, 31 Jan 2021 22:08:02 -0500 Subject: [PATCH] Undo rooibos changes since not validating tests --- tests/source/rooibos/rooibosDist.brs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/source/rooibos/rooibosDist.brs b/tests/source/rooibos/rooibosDist.brs index 8259a1c7..b2ba0873 100644 --- a/tests/source/rooibos/rooibosDist.brs +++ b/tests/source/rooibos/rooibosDist.brs @@ -851,7 +851,7 @@ function RBS_BTS_AssertNodeNotContainsFields(node , subset , msg = "" ) as dynam key = item value = item[key] end if - if RBS_CMN_NodeContains(node, value) + if RBS_CMN_NodeContains(node, value, key) msg = "Node has the '" + RBS_CMN_AsString(value) + "' value." m.currentResult.AddResult(msg) return m.GetLegacyCompatibleReturnValue(false) @@ -1225,7 +1225,7 @@ function RBS_BTS_CleanMocks() as void else if (aa <> invalid and GetInterface(aa, "ifSGNodeChildren") <> invalid) value = aa.getChild(key) else if (aa <> invalid and GetInterface(aa, "ifAssociativeArray") <> invalid) - key = key.ToStr() + key = tostr(key) if not aa.doesExist(key) exit while end if @@ -1260,7 +1260,6 @@ end function function RBS_CMN_GetFunction(filename, functionName) as object if (not RBS_CMN_IsNotEmptyString(functionName)) then return invalid if (not RBS_CMN_IsNotEmptyString(filename)) then return invalid - 'bs:disable-next-line mapFunction = RBSFM_getFunctionsForFile(filename) if mapFunction <> invalid map = mapFunction() @@ -1275,11 +1274,9 @@ function RBS_CMN_GetFunction(filename, functionName) as object end function function RBS_CMN_GetFunctionBruteForce(functionName) as object if (not RBS_CMN_IsNotEmptyString(functionName)) then return invalid - 'bs:disable-next-line filenames = RBSFM_getFilenames() for i = 0 to filenames.count() - 1 filename = filenames[i] - 'bs:disable-next-line mapFunction = RBSFM_getFunctionsForFile(filename) if mapFunction <> invalid map = mapFunction() @@ -1604,7 +1601,6 @@ function UnitTestRuntimeConfig() return this end function function RBS_CreateSuites() - 'bs:disable-next-line suites = RBSFM_getTestSuitesForProject() includedSuites = [] for i = 0 to suites.count() -1