diff --git a/plugins/generate-tests/prepare-test-schema/index.js b/plugins/generate-tests/prepare-test-schema/index.js index a1fc996..2886cf4 100644 --- a/plugins/generate-tests/prepare-test-schema/index.js +++ b/plugins/generate-tests/prepare-test-schema/index.js @@ -10,7 +10,6 @@ const TestXmlGenerator = require('./helpers/test-xml-generator'); const IGNORED_TEST_FILES_PATH_PATTERN = '/components/**/_tests/**/*_*.brs'; const MAIN_FILE_LOCATION = '/source/Main.brs'; -const TEST_FILE_NAME_REGEX = /[^/]+(?=\.test\.brs)/; const TEST_FILES_PATH_PATTERN = '/components/**/_tests/**/*.test.brs'; const TESTS_LOCATION = '/components/tests/auto-generated/'; @@ -33,15 +32,6 @@ module.exports = async function prepareTestSchema(dir) { ); } -function _matchesPattern(str, pattern) { - const regex = new RegExp( - '^' + pattern.replace(/[.+^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*').replace(/\?/g, '.') + '$', - 'i', - ); - - return regex.test(str); -} - async function prepareSchema(testFilePath, testXmlGenerator, rootDir) { const testSchema = await TestSchema.load(testFilePath); if (!testSchema) { diff --git a/src/source/UnitTestFramework.brs b/src/source/UnitTestFramework.brs index fc2e74d..fa91c56 100644 --- a/src/source/UnitTestFramework.brs +++ b/src/source/UnitTestFramework.brs @@ -1711,8 +1711,13 @@ function TestRunner__Run(statObj = m.Logger.CreateTotalStatistic() as Object, te if m.testsFilter.count() > 0 filteredNodes = [] for each testNodeName in testNodes - for each filterName in m.testsFilter - if testNodeName = filterName then filteredNodes.push(testNodeName) + for each filterPattern in m.testsFilter + regexStr = filterPattern.replace("*", ".*") + regex = CreateObject("roRegex", "^" + regexStr + "$", "i") + if regex.isMatch(testNodeName) + filteredNodes.push(testNodeName) + exit for + end if end for end for testNodes = filteredNodes