From bfbe84d1c67a743efbbdda06c64c4ae74c5fc221 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 23 Aug 2019 16:50:27 +0200 Subject: [PATCH] Apply fudge factor on both ends of the spectrum in StopWatchTests This is an attempt to solve a build issue on Microsoft Windows. See gh-23507 --- .../java/org/springframework/util/StopWatchTests.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/util/StopWatchTests.java b/spring-core/src/test/java/org/springframework/util/StopWatchTests.java index 1edffd05b4..93af29b495 100644 --- a/spring-core/src/test/java/org/springframework/util/StopWatchTests.java +++ b/spring-core/src/test/java/org/springframework/util/StopWatchTests.java @@ -80,15 +80,15 @@ class StopWatchTests { assertThat(stopWatch.isRunning()).isFalse(); assertThat(stopWatch.getLastTaskTimeNanos()) .as("last task time in nanoseconds for task #1") - .isGreaterThanOrEqualTo(millisToNanos(duration1)) + .isGreaterThanOrEqualTo(millisToNanos(duration1 - fudgeFactor)) .isLessThanOrEqualTo(millisToNanos(duration1 + fudgeFactor)); assertThat(stopWatch.getTotalTimeMillis()) .as("total time in milliseconds for task #1") - .isGreaterThanOrEqualTo(duration1) + .isGreaterThanOrEqualTo(duration1 - fudgeFactor) .isLessThanOrEqualTo(duration1 + fudgeFactor); assertThat(stopWatch.getTotalTimeSeconds()) .as("total time in seconds for task #1") - .isGreaterThanOrEqualTo(duration1 / 1000.0) + .isGreaterThanOrEqualTo((duration1 - fudgeFactor) / 1000.0) .isLessThanOrEqualTo((duration1 + fudgeFactor) / 1000.0); stopWatch.start(name2); @@ -103,11 +103,11 @@ class StopWatchTests { .isLessThanOrEqualTo(millisToNanos(duration2 + fudgeFactor)); assertThat(stopWatch.getTotalTimeMillis()) .as("total time in milliseconds for tasks #1 and #2") - .isGreaterThanOrEqualTo(duration1 + duration2) + .isGreaterThanOrEqualTo(duration1 + duration2 - fudgeFactor) .isLessThanOrEqualTo(duration1 + duration2 + fudgeFactor); assertThat(stopWatch.getTotalTimeSeconds()) .as("total time in seconds for task #2") - .isGreaterThanOrEqualTo((duration1 + duration2) / 1000.0) + .isGreaterThanOrEqualTo((duration1 + duration2 - fudgeFactor) / 1000.0) .isLessThanOrEqualTo((duration1 + duration2 + fudgeFactor) / 1000.0); assertThat(stopWatch.getTaskCount()).isEqualTo(2);