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.

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

Migrate tests to junit 5 #352

Merged

Conversation

icougil
Copy link
Contributor

@icougil icougil commented Oct 21, 2019

No description provided.

Included compile & runtime classpath for running integration tests with dependencies
Included dependency for enable working old annotations from Junit4 (Rule, ExpectedException and ExternalResource)
Included Mockito extensions + JUnit extensions for working with JUnit5
Refactored few tests that do not need to create some stubs (Mockito throws some UnnecessaryStubbingException)
Replaced some duplicated stubs with chainable calls (ex: VotingServiceTest)
@icougil icougil mentioned this pull request Oct 21, 2019
@Brutus5000
Copy link
Member

The broken pipeline seems to be caused by Travis CI changes. For some reason the JDK11 compiler is used while it was JDK8 a few days ago 😦

@icougil
Copy link
Contributor Author

icougil commented Oct 22, 2019

About the build, it seems Oracle JDK 9 is discontinued in Travis CI.
Probably you should define the JDK version required to compile the artifacts and see it the build works (+ also think about not using the proprietary Oracle JDK version and try to move to OpenJDK 😉 )

@Brutus5000
Copy link
Member

Brutus5000 commented Oct 23, 2019

If you add dist: trusty as a top line to the .travis.yml we should be back to a working state. I know it's a dirty hack, but right now I have no time to migrate to OpenJDK11 (which would be my preferred step for now).
If you want to give me a hand, that would be highly appreciated 😄

# Conflicts:
#	src/inttest/java/com/faforever/api/data/BanTest.java
#	src/inttest/java/com/faforever/api/data/DomainBlacklistTest.java
#	src/inttest/java/com/faforever/api/data/Ladder1v1MapTest.java
#	src/inttest/java/com/faforever/api/data/MapVersionElideTest.java
#	src/inttest/java/com/faforever/api/data/TeamkillTest.java
#	src/inttest/java/com/faforever/api/data/UserNoteTest.java
@Brutus5000 Brutus5000 merged commit ccdb4b4 into FAForever:develop Nov 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants