5555import org .junit .platform .launcher .listeners .UniqueIdTrackingListener ;
5656import org .junit .platform .reporting .legacy .xml .LegacyXmlReportGeneratingListener ;
5757
58+ import java .io .File ;
5859import java .io .IOException ;
5960import java .io .PrintWriter ;
6061import java .io .UncheckedIOException ;
@@ -82,7 +83,6 @@ public static void main(String... args) {
8283
8384 /* scan runtime arguments */
8485 String xmlOutput = DEFAULT_OUTPUT_FOLDER ;
85- String testIds = null ;
8686 boolean silent = false ;
8787
8888 LinkedList <String > arguments = new LinkedList <>(Arrays .asList (args ));
@@ -94,17 +94,13 @@ public static void main(String... args) {
9494 System .out .println ("----------------------------------------\n " );
9595 System .out .println ("Flags:" );
9696 System .out .println (stringPad ("--xml-output-dir" ) + "Selects report xml output directory (default: `" + DEFAULT_OUTPUT_FOLDER + "`)" );
97- System .out .println (stringPad ("--test-ids" ) + "Provides path to generated testIDs" );
9897 System .out .println (stringPad ("--silent" ) + "Only output xml without stdout summary" );
9998 System .out .println (stringPad ("--help" ) + "Displays this help screen" );
10099 System .exit (0 );
101100 break ;
102101 case "--xml-output-dir" :
103102 xmlOutput = arguments .poll ();
104103 break ;
105- case "--test-ids" :
106- testIds = arguments .poll ();
107- break ;
108104 case "--silent" :
109105 silent = true ;
110106 break ;
@@ -119,14 +115,8 @@ public static void main(String... args) {
119115 throw new RuntimeException ("xml-output-dir argument passed incorrectly to the launcher class." );
120116 }
121117
122- if (testIds == null ) {
123- System .out .println ("[junit-platform-native] WARNING: test-ids not provided to the NativeImageJUnitLauncher. " +
124- "This should only happen if you are running tests binary manually (instead of using 'gradle nativeTest' command)" );
125- testIds = getTestIDsFromDefaultLocations ();
126- }
127-
128118 Launcher launcher = LauncherFactory .create ();
129- TestPlan testPlan = getTestPlan (launcher , testIds );
119+ TestPlan testPlan = getTestPlan (launcher );
130120
131121 PrintWriter out = new PrintWriter (System .out );
132122 if (!silent ) {
@@ -151,28 +141,30 @@ public static void main(String... args) {
151141 System .exit (failedCount > 0 ? 1 : 0 );
152142 }
153143
154- private static TestPlan getTestPlan (Launcher launcher , String testIDs ) {
155- List <? extends DiscoverySelector > selectors = getSelectors (testIDs );
144+ private static TestPlan getTestPlan (Launcher launcher ) {
145+ List <? extends DiscoverySelector > selectors = getSelectors ();
156146 LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder .request ()
157147 .selectors (selectors )
158148 .build ();
159149
160150 return launcher .discover (request );
161151 }
162152
163- private static List <? extends DiscoverySelector > getSelectors (String testIDs ) {
153+ private static List <? extends DiscoverySelector > getSelectors () {
164154 try {
165- Path outputDir = Paths .get (testIDs );
166- String prefix = System .getProperty (UniqueIdTrackingListener .OUTPUT_FILE_PREFIX_PROPERTY_NAME ,
155+ String systemPropertyBasedLocation = System .getProperty (UniqueIdTrackingListener .OUTPUT_DIR_PROPERTY_NAME );
156+ Path uniqueIdDirectory = systemPropertyBasedLocation != null ? Path .of (systemPropertyBasedLocation ) : getTestIDsFromDefaultLocations ();
157+ String uniqueIdFilePrefix = System .getProperty (UniqueIdTrackingListener .OUTPUT_FILE_PREFIX_PROPERTY_NAME ,
167158 UniqueIdTrackingListener .DEFAULT_OUTPUT_FILE_PREFIX );
168- List <UniqueIdSelector > selectors = readAllFiles (outputDir , prefix )
159+
160+ List <UniqueIdSelector > selectors = readAllFiles (uniqueIdDirectory , uniqueIdFilePrefix )
169161 .map (DiscoverySelectors ::selectUniqueId )
170162 .collect (Collectors .toList ());
171163 if (!selectors .isEmpty ()) {
172164 System .out .printf (
173165 "[junit-platform-native] Running in 'test listener' mode using files matching pattern [%s*] "
174166 + "found in folder [%s] and its subfolders.%n" ,
175- prefix , outputDir .toAbsolutePath ());
167+ uniqueIdFilePrefix , uniqueIdDirectory .toAbsolutePath ());
176168 return selectors ;
177169 }
178170 } catch (Exception ex ) {
@@ -201,47 +193,53 @@ private static Stream<Path> findFiles(Path dir, String prefix) throws IOExceptio
201193 && path .getFileName ().toString ().startsWith (prefix )));
202194 }
203195
204- private static String getTestIDsFromDefaultLocations () {
205- System .out .println ("[junit-platform-native] WARNING: Trying to find test-ids on default locations." );
196+ private static Path getTestIDsFromDefaultLocations () {
197+ System .out .println ("[junit-platform-native] WARNING: Trying to find test-ids on default locations. " +
198+ "This should only happen if you are running tests executable manually." );
206199 Path defaultGradleTestIDsLocation = getGradleTestIdsDefaultLocation ();
207200 Path defaultMavenTestIDsLocation = getMavenTestIDsDefaultLocation ();
208201
209202 if (Files .exists (defaultGradleTestIDsLocation ) && Files .exists (defaultMavenTestIDsLocation )) {
210203 throw new RuntimeException ("[junit-platform-native] test-ids found in both " + defaultGradleTestIDsLocation + " and " + defaultMavenTestIDsLocation +
211- ". Please specify the test-ids location by passing the '--test-ids <path-to-test-ids>' argument to your tests executable." );
204+ ". Please specify the test-ids location by passing the '--test-ids <path-to-test-ids>' argument to your tests executable." );
212205 }
213206
214207 if (Files .exists (defaultGradleTestIDsLocation )) {
215208 System .out .println ("[junit-platform-native] WARNING: Using test-ids from default Gradle project location:" + defaultGradleTestIDsLocation );
216- return defaultGradleTestIDsLocation . toString () ;
209+ return defaultGradleTestIDsLocation ;
217210 }
218211
219212 if (Files .exists (defaultMavenTestIDsLocation )) {
220213 System .out .println ("[junit-platform-native] WARNING: Using test-ids from default Maven project location:" + defaultMavenTestIDsLocation );
221- return defaultMavenTestIDsLocation . toString () ;
214+ return defaultMavenTestIDsLocation ;
222215 }
223216
224217 throw new RuntimeException ("[junit-platform-native] test-ids not provided to the NativeImageJUnitLauncher and cannot be found on default locations. " +
225- "Searched in: " + defaultGradleTestIDsLocation + " and " + defaultMavenTestIDsLocation );
218+ "Searched in: " + defaultGradleTestIDsLocation + " and " + defaultMavenTestIDsLocation );
226219 }
227220
228221 private static Path getGradleTestIdsDefaultLocation () {
229- return Path .of (getBuildDirectory ("/ build/"
222+ return Path .of (getBuildDirectory (File . separator + " build" + File . separator ))
230223 .resolve ("test-results" )
231224 .resolve ("test" )
232225 .resolve ("testlist" )
233226 .toAbsolutePath ();
234227 }
235228
236229 private static Path getMavenTestIDsDefaultLocation () {
237- return Path .of (getBuildDirectory ("/ target/"
230+ return Path .of (getBuildDirectory (File . separator + " target" + File . separator ))
238231 .resolve ("test-ids" )
239232 .toAbsolutePath ();
240233 }
241234
242235 private static String getBuildDirectory (String buildDir ) {
243236 String executableLocation = Path .of ("." ).toAbsolutePath ().toString ();
244- return executableLocation .substring (0 , executableLocation .indexOf (buildDir ) + buildDir .length ());
237+ int index = executableLocation .indexOf (buildDir );
238+ if (index < 0 ) {
239+ return buildDir .substring (1 );
240+ }
241+
242+ return executableLocation .substring (0 , index + buildDir .length ());
245243 }
246244
247245}
0 commit comments