Migrate from assertThat(foo).named("foo") to assertWithMessage("foo").that(foo). Change-Id: Ie7ec4cee6ffffabe9fb42b888098ff563ab239da