Update deprecated code to recommended strategy #6078
Conversation
This is a continuation of the effort to update deprecated code Removed AvailablePortMatcherTests because it is a test of a testing component that is no longer needed Focused on replacing the rule ExpectedException.none() with AssertJ's exception testing facilities Signed-off-by: Glenn Renfro <[email protected]> cleanup Signed-off-by: Glenn Renfro <[email protected]>
| @@ -51,6 +51,11 @@ | |||
| <artifactId>spring-boot-starter-test</artifactId> | |||
| <scope>test</scope> | |||
| </dependency> | |||
| <dependency> | |||
There was a problem hiding this comment.
Neither this, nor awaitility (above) is required as it piggybacks on spring-boot-starter-test.
There was a problem hiding this comment.
Ran a test so in this case awaitility is a required dependency.
| @@ -51,6 +51,11 @@ | |||
| <artifactId>spring-boot-starter-test</artifactId> | |||
| <scope>test</scope> | |||
| </dependency> | |||
| <dependency> | |||
There was a problem hiding this comment.
Neither this, nor awaitility (above) is required as it piggybacks on spring-boot-starter-test.
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import org.junit.Rule; | ||
|
|
||
| import org.junit.Test; |
There was a problem hiding this comment.
Since you are in here already, do you mind replacing Junit4 test w/ Junit5 test?
|
|
||
| @Rule | ||
| public ExpectedException exception = ExpectedException.none(); | ||
| public class AdditionalEnvironmentValidatorTests { | ||
|
|
||
| @Test | ||
| public void throw_exception_when_additional_environment_variables_contain_docker_variables() { |
There was a problem hiding this comment.
[UNRELATED] Oh my word, who named these tests. Is this python 🤣
| exception.expectMessage("cannot exist in your additional environment"); | ||
| AdditionalEnvironmentValidator.validate(variables); | ||
|
|
||
| assertThatIllegalStateException().isThrownBy(() ->AdditionalEnvironmentValidator.validate(variables)). |
There was a problem hiding this comment.
Nice improvement @cppwfs - thanks.
| @BeforeEach | ||
| void init() { | ||
| MockitoAnnotations.initMocks(this); | ||
| autoCloseable = MockitoAnnotations.openMocks(this); |
There was a problem hiding this comment.
[UNRELATED] This was already here I know. The usage of @Mock has turned out to be more hassle than its worth. Like in this case, its a single mock and we have this setup/teardown to deal w/.
Signed-off-by: Glenn Renfro <[email protected]>
This is a continuation of the effort to update deprecated code
Removed AvailablePortMatcherTests because it is a test of a testing component that is no longer needed
Focused on replacing the rule ExpectedException.none() with AssertJ's exception testing facilities