migrating to AssertJ