You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2020/01/09 22:17:24 UTC
[jspwiki] 14/32: take into account executions on Windows boxes can
have both / and \
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit d7dd21dbc5a85bedda99c22d3b4382a11de419ff
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Jan 5 01:20:44 2020 +0100
take into account executions on Windows boxes can have both / and \
---
jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
index e2c3849..f012adb 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
@@ -423,13 +423,15 @@ public class TestEngine extends WikiEngine
private static String cleanNewDirFrom( final String pageDir, final long millis ) {
final String testEngineCreationOrigin = getTestEngineCreationOrigin();
if( StringUtils.isBlank( pageDir ) ) {
- return "target/" + millis + "-" + testEngineCreationOrigin;
+ return "target" + File.separator + millis + "-" + testEngineCreationOrigin;
}
- if( pageDir.lastIndexOf( '/' ) == -1 ) {
- return "target/" + millis + "-" + testEngineCreationOrigin + "-" + pageDir;
+ // take into account executions on Windows boxes can have both / and \
+ final int lastDirPosition = Math.max( pageDir.lastIndexOf( '/' ), pageDir.lastIndexOf( File.separator ) );
+ if( lastDirPosition == -1 ) {
+ return "target" + File.separator + millis + "-" + testEngineCreationOrigin + "-" + pageDir;
}
- final String stripNumbers = pageDir.substring( pageDir.lastIndexOf( '/' ) );
- return pageDir.substring( 0, pageDir.lastIndexOf( '/' ) + 1 )
+ final String stripNumbers = pageDir.substring( lastDirPosition );
+ return pageDir.substring( 0, lastDirPosition + 1 )
+ millis
+ "-" + testEngineCreationOrigin
+ stripNumbers.replaceAll( "\\d", StringUtils.EMPTY ); // place all related tests' folders one next to the others