Skip to content

Switch to AssertJ (#2147)#2512

Closed
keszocze wants to merge 39 commits into
exercism:mainfrom
keszocze:switch-to-assertj-for-exceptions
Closed

Switch to AssertJ (#2147)#2512
keszocze wants to merge 39 commits into
exercism:mainfrom
keszocze:switch-to-assertj-for-exceptions

Conversation

@keszocze
Copy link
Copy Markdown
Contributor

@keszocze keszocze commented Oct 6, 2023

pull request

Use AssertJ in more exercises. Might be in partial conflict with #2511


Reviewer Resources:

Track Policies

Oliver Keszöcze and others added 30 commits September 21, 2023 12:01
# Conflicts:
#	exercises/practice/error-handling/src/test/java/ErrorHandlingTest.java
# Conflicts:
#	exercises/practice/error-handling/src/test/java/ErrorHandlingTest.java
…e/exercism_java into switch-to-assertj-for-exceptions
Co-authored-by: Sander Ploegsma <sanderploegsma@gmail.com>
Co-authored-by: Sander Ploegsma <sanderploegsma@gmail.com>
…e/exercism_java into switch-to-assertj-for-exceptions
@sanderploegsma
Copy link
Copy Markdown
Contributor

Thanks for opening this PR! Next to the conflicts with #2511 which was merged I also see that you're including a lot of commits that have been merged as part of other PRs in the last weeks, causing the diff to be way larger.

Looking at the latest commits I see you updated these four exercises, correct?

  1. Diffie Helman
  2. DnD Character
  3. Zipper
  4. Change

I believe that 2. and 4. have been resolved by #2511 and 1. is actually a deprecated exercise (which we don't update anymore). That just leaves 3.

Could you maybe open a new PR that just updates the Zipper exercise? I suggest making sure that the main branch of your fork is up-to-date with our main branch and creating a new branch from there. You can then either cherry-pick the commit(s) updating the Zipper exercise, or make the changes again manually and commit those. That's up to you.

@keszocze
Copy link
Copy Markdown
Contributor Author

keszocze commented Oct 6, 2023

Sure can do. I simple re-used the branch that I used for the previous PRs. I didn't expect the already merged commits to pop up again.

Just two questions:

  • Should I omit the Diffie Helman change?
  • How many exercises should I touch in a single PR?

@sanderploegsma
Copy link
Copy Markdown
Contributor

Sure can do. I simple re-used the branch that I used for the previous PRs. I didn't expect the already merged commits to pop up again.

Yeah we use 'squash and merge' on PRs so all commits get collapsed into one. That unfortunately means that you'd have to rebase existing branches to get the history correct. Easiest is to always start fresh!

Just two questions:

  • Should I omit the Diffie Helman change?

Yes. Deprecated exercises are not supposed to be touched after deprecation, so no update needed there.

  • How many exercises should I touch in a single PR?

There's no strict guidelines on that, but since every change to an exercise's Java code triggers new test runs of submitted solutions the answer is "not too many". I'd personally aim for no more than 10-20, to also keep the PRs relatively small and easy to review.

@keszocze keszocze deleted the switch-to-assertj-for-exceptions branch October 6, 2023 19:04
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