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 2022/07/12 21:03:45 UTC
[jspwiki] 12/25: Allow TestEngine to disable properties' cleaning through jspwiki.test.disable-clean-props property
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 18bb41c561778f4f6eebd2094ad06f6228daa078
Author: Juan Pablo Santos RodrÃguez <ju...@gmail.com>
AuthorDate: Tue Jul 12 22:51:54 2022 +0200
Allow TestEngine to disable properties' cleaning through jspwiki.test.disable-clean-props property
---
jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 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 43a225ff2..f215a5ead 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
@@ -451,10 +451,13 @@ public class TestEngine extends WikiEngine {
*/
private static Properties cleanTestProps( final Properties props ) {
final long millis = System.currentTimeMillis();
- props.put( AuthenticationManager.PROP_LOGIN_THROTTLING, "false" );
- props.setProperty( "jspwiki.fileSystemProvider.pageDir", cleanNewDirFrom( props.getProperty( "jspwiki.fileSystemProvider.pageDir" ), millis ) );
- props.setProperty( "jspwiki.basicAttachmentProvider.storageDir", cleanNewDirFrom( props.getProperty( "jspwiki.basicAttachmentProvider.storageDir" ), millis ) );
- props.setProperty( "jspwiki.workDir", cleanNewDirFrom( props.getProperty( "jspwiki.workDir" ), millis ) );
+ if( !"true".equalsIgnoreCase( props.getProperty( "jspwiki.test.disable-clean-props" ) ) ) {
+ props.put( AuthenticationManager.PROP_LOGIN_THROTTLING, "false" );
+ props.setProperty( "jspwiki.fileSystemProvider.pageDir", cleanNewDirFrom( props.getProperty( "jspwiki.fileSystemProvider.pageDir" ), millis ) );
+ props.setProperty( "jspwiki.basicAttachmentProvider.storageDir", cleanNewDirFrom( props.getProperty( "jspwiki.basicAttachmentProvider.storageDir" ), millis ) );
+ props.setProperty( "jspwiki.workDir", cleanNewDirFrom( props.getProperty( "jspwiki.workDir" ), millis ) );
+ }
+
return props;
}