Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some minor code improvements #965

Merged
merged 11 commits into from Oct 2, 2022
Merged

Some minor code improvements #965

merged 11 commits into from Oct 2, 2022

Conversation

hankem
Copy link
Member

@hankem hankem commented Sep 26, 2022 •
edited by codecholeric

Contributes some random code improvements for minor "issues" detected by the IDE:

  • make some fields final
  • make some inner classes static
  • simplify code: remove redundant interface definition/cast/;, !anyMatch -> noneMatch
  • remove useless throws declarations
  • update Mockito and use mockito-junit-jupiter's MockitoExtension
  • replace deprecated com.google.common.io.Files API
  • replace assertThat(x).containsOnlyElementsOf with .hasSameElementsAs
  • replace deprecated JUnit 4 ExpectedException

@hankem hankem force-pushed the code-simplifications branch 2 times, most recently from d26acc4 to 77162b1 Compare September 27, 2022 07:11
hankem
hankem commented Sep 27, 2022
View reviewed changes
build.gradle
@@ -60,7 +60,8 @@ ext {
junitPlatformEngine : [group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.8.2'],
hamcrest : [group: 'org.hamcrest', name: 'hamcrest-core', version: '1.3'],
junit_dataprovider : [group: 'com.tngtech.java', name: 'junit-dataprovider', version: '1.11.0'],
mockito : [group: 'org.mockito', name: 'mockito-core', version: '4.4.0'],
mockito : [group: 'org.mockito', name: 'mockito-core', version: '4.6.1'],
mockito_junit5 : [group: 'org.mockito', name: 'mockito-junit-jupiter', version: '4.6.1'],
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: A version ≥4.7.0 broke the build with

Execution failed for task ':archunit:compileJdk9testJava'.
java.time.DateTimeException: Invalid value for MonthOfYear (valid values 1 - 12): 0

(which sounds like a JDK bug)

hankem
hankem commented Sep 27, 2022
View reviewed changes
.../junit5/engine/src/test/java/com/tngtech/archunit/junit/internal/ArchUnitTestEngineTest.java
@@ -116,6 +118,7 @@
import static org.mockito.Mockito.when;

@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.WARN)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As we only have one single usage of MockitoExtension, I wonder whether we shouldn't just call MockitoAnnotations.initMocks(testInstance); directly (and drop the mockito-junit-jupiter dependency again).

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, yeah, sounds fair 🤔 Seems overkill to have an extra dependency for that and also not really saving anything in this case 😬

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On second thought, initMocks(..) is meanwhile deprecated, you should now call openMocks(..) and hold the returned AutoCloseable to close it in the tear down method 🤪
Once we migrate the other code from JUnit 4 to JUnit 5 we'll also need this in more places, so let's just keep the dependency for now...

hankem and others added 10 commits October 1, 2022 17:44
@hankem @codecholeric
make some fields final
28ea074 
Signed-off-by: Manfred Hanke <Manfred.Hanke@tngtech.com>
@hankem @codecholeric
make some inner classes static
414938f 
Signed-off-by: Manfred Hanke <Manfred.Hanke@tngtech.com>
@codecholeric
simplify code: remove redundant interface definition
52fca1d 
Signed-off-by: Peter Gafert <peter.gafert@tngtech.com>
@codecholeric
simplify code: remove redundant cast
240a439 
Signed-off-by: Peter Gafert <peter.gafert@tngtech.com>
@codecholeric
simplify code: remove redundant ';'
16cf073 
Signed-off-by: Peter Gafert <peter.gafert@tngtech.com>
@hankem @codecholeric
simplify code: replace !anyMatch -> noneMatch
7b84d0d 
Signed-off-by: Manfred Hanke <Manfred.Hanke@tngtech.com>
@hankem @codecholeric
remove useless throws declarations
f431ab8 
Signed-off-by: Manfred Hanke <Manfred.Hanke@tngtech.com>
@hankem @codecholeric
update Mockito and use mockito-junit-jupiter's MockitoExtension
775ef2a 
Note that mockito >= 4.7.0 breaks the build with JDK 8 and 9
due to https://bugs.openjdk.org/browse/JDK-8184940.

Signed-off-by: Manfred Hanke <Manfred.Hanke@tngtech.com>
@codecholeric
replace Guava Files.{write/append} by java.nio.Files.write(..)
506030b 
The Guava methods are meanwhile deprecated and the standard Java API is almost as convenient anyway.

Signed-off-by: Peter Gafert <peter.gafert@tngtech.com>
@hankem @codecholeric
replace assertThat(x).containsOnlyElementsOf with .hasSameElementsAs
4b0aa34 
The former assertion has been deprecated because its name is confusing,
users were expecting it to behave like `.isSubsetOf`.

Signed-off-by: Manfred Hanke <Manfred.Hanke@tngtech.com>
@codecholeric
Copy link
Collaborator

Thanks a lot 🤩

@codecholeric
replace JUnit 4 ExpectedException by AssertJ assertThatThrownBy
86255a7 
`ExpectedException` is meanwhile deprecated, so we should not use it anymore. This also paves part of the way of upgrading to JUnit 5 in the future.

Signed-off-by: Peter Gafert <peter.gafert@tngtech.com>
@codecholeric codecholeric merged commit 6878f49 into main Oct 2, 2022
@codecholeric codecholeric deleted the code-simplifications branch October 2, 2022 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codecholeric codecholeric codecholeric approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@hankem @codecholeric