@@ -24,7 +24,6 @@ class SuiteObjectExtractor extends BaseObjectExtractor
24
24
const INCLUDE_TAG_NAME = 'include ' ;
25
25
const EXCLUDE_TAG_NAME = 'exclude ' ;
26
26
const MODULE_TAG_NAME = 'module ' ;
27
- const MODULE_TAG_FILE_ATTRIBUTE = 'file ' ;
28
27
const TEST_TAG_NAME = 'test ' ;
29
28
const GROUP_TAG_NAME = 'group ' ;
30
29
@@ -182,7 +181,6 @@ private function parseObjectHooks($parsedSuite)
182
181
*/
183
182
private function isSuiteEmpty ($ suiteHooks , $ includeTests , $ excludeTests )
184
183
{
185
-
186
184
$ noHooks = count ($ suiteHooks ) == 0 ||
187
185
(
188
186
empty ($ suiteHooks ['before ' ]->getActions ()) &&
@@ -221,34 +219,17 @@ private function extractTestObjectsFromSuiteRef($suiteReferences)
221
219
TestObjectHandler::getInstance ()->getTestsByGroup ($ suiteRefData [self ::NAME ]);
222
220
break ;
223
221
case self ::MODULE_TAG_NAME :
224
- $ testObjectList = array_merge ($ testObjectList , $ this -> extractModuleAndFiles (
225
- $ suiteRefData [ self :: NAME ] ,
226
- $ suiteRefData [self ::MODULE_TAG_FILE_ATTRIBUTE ] ?? null
227
- )) ;
222
+ $ testObjectList = array_merge (
223
+ $ testObjectList ,
224
+ $ this -> resolveModulePathTestNames ( $ suiteRefData [self ::NAME ])
225
+ );
228
226
break ;
229
227
}
230
228
}
231
229
232
230
return $ testObjectList ;
233
231
}
234
232
235
- /**
236
- * Takes an array of modules/files and resolves to an array of test objects.
237
- *
238
- * @param string $moduleName
239
- * @param string $moduleFilePath
240
- * @return array
241
- * @throws \Exception
242
- */
243
- private function extractModuleAndFiles ($ moduleName , $ moduleFilePath )
244
- {
245
- if (empty ($ moduleFilePath )) {
246
- return $ this ->resolveModulePathTestNames ($ moduleName );
247
- }
248
-
249
- return $ this ->resolveFilePathTestNames ($ moduleFilePath , $ moduleName );
250
- }
251
-
252
233
/**
253
234
* Takes a filepath (and optionally a module name) and resolves to a test object.
254
235
*
0 commit comments