#2414 convert junit statements to assertj

This conversion is not complete, but the remaining statements are hard
to catch with regular expressions automatically.