[BUG] Fixed some failing unit tests on Windows #968
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Taylor Gray <[email protected]>
Signed-off-by: Taylor Gray <[email protected]>
dlvenable
requested changes
Feb 1, 2022
| @@ -93,7 +93,7 @@ public void testBuild_withoutTimeReceived() { | |||
| final Instant timeReceived = result.getTimeReceived(); | |||
| assertThat(timeReceived, notNullValue()); | |||
| assertThat(timeReceived, is(greaterThan(before))); | |||
| assertThat(timeReceived, is(lessThan(Instant.now()))); | |||
| assertThat(timeReceived, is(lessThan(Instant.now().plusSeconds(1)))); | |||
There was a problem hiding this comment.
I'm guessing you are adding second incase the times are the same. You be able to use lessThanOrEqualTo instead.
| @@ -65,10 +67,12 @@ public void testGivenNullArgumentThenThrowException() { | |||
| public void testGivenLogstashConfigPathThenPipelineConfigCreated() { | |||
| final DataPrepperArgs args = new DataPrepperArgs(LOGSTASH_PIPELINE_FILE_PATH, DP_CONFIG_YAML_FILE_PATH); | |||
|
|
|||
| final String configFileEnding = String.format("src%stest%sresources%slogstash-filter.yaml", File.separator, File.separator, File.separator); | |||
There was a problem hiding this comment.
You could probably write this as:
Paths.get("src", "test, "resources", "logstash-filter.yaml");
| @@ -64,8 +64,8 @@ public void testWriteMetrics() throws TimeoutException { | |||
| Assert.assertTrue( | |||
| MetricsTestUtil.isBetween( | |||
| MetricsTestUtil.getMeasurementFromList(writeTimeMeasurements, Statistic.TOTAL_TIME).getValue(), | |||
| 0.5, | |||
| 0.6)); | |||
| 0.4, | |||
There was a problem hiding this comment.
Would 0.45 and 0.65 work here? Similar to what you did in testWriteAllMetrics?
There was a problem hiding this comment.
They should still work yes. I can tighten it to that.
Signed-off-by: Taylor Gray <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #968 +/- ##
=========================================
Coverage 91.36% 91.36%
Complexity 683 683
=========================================
Files 84 84
Lines 1993 1993
Branches 168 168
=========================================
Hits 1821 1821
Misses 132 132
Partials 40 40 Continue to review full report at Codecov.
|
dlvenable
approved these changes
Feb 1, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
There are a handful of unit tests that fail when running on Windows. This PR fixes some of them. The reasons for failing tests include:
USE_PLATFORM_LINE_BREAKSto not always default to Unix\n(Windows standard is\r\n/, while windows uses\Issues Resolved
[List any issues this PR will resolve]
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.