Repository: activemq-artemis Updated Branches: refs/heads/master acb8ff5a2 -> 9263bb435
NO-JIRA improve logging for test System prop cleanup Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3e5a2f49 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3e5a2f49 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3e5a2f49 Branch: refs/heads/master Commit: 3e5a2f4951876aae6262b43a731aea3ad832486d Parents: acb8ff5 Author: Justin Bertram <[email protected]> Authored: Thu Nov 15 13:03:40 2018 -0600 Committer: Clebert Suconic <[email protected]> Committed: Thu Nov 15 20:18:19 2018 -0500 ---------------------------------------------------------------------- .../utils/CleanupSystemPropertiesRule.java | 22 ++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3e5a2f49/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/CleanupSystemPropertiesRule.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/CleanupSystemPropertiesRule.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/CleanupSystemPropertiesRule.java index ced11d2..3dfddd1 100644 --- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/CleanupSystemPropertiesRule.java +++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/CleanupSystemPropertiesRule.java @@ -68,14 +68,24 @@ public class CleanupSystemPropertiesRule extends ExternalResource { System.out.println("======================================================================================================"); - for (Object key : newProperties) { - System.out.println("Cleaning up system property " + key); - System.clearProperty(key.toString()); + if (!newProperties.isEmpty()) { + System.out.println("Clearing system property..."); + + int i = 1; + for (Object key : newProperties) { + System.out.printf("\t%3d. %s = %s%n", i++, key, System.getProperty(key.toString())); + System.clearProperty(key.toString()); + } } - for (Map.Entry<Object, Object> entry : changed.entrySet()) { - System.out.println("Setting up old system property, key=" + entry.getKey() + ", value = " + entry.getValue()); - System.setProperty(entry.getKey().toString(), entry.getValue().toString()); + if (!changed.isEmpty()) { + System.out.println("Resetting system property..."); + + int i = 1; + for (Map.Entry<Object, Object> entry : changed.entrySet()) { + System.out.printf("\t%3d. %s = %s (was %s)%n", i++, entry.getKey(), entry.getValue(), System.getProperty(entry.getKey().toString())); + System.setProperty(entry.getKey().toString(), entry.getValue().toString()); + } } System.out.println("======================================================================================================");
