Remove deprecated AssertJ calls

This fixes some AssertJ deprecations that came along w/ the
update to AssertJ `3.73`.
This commit is contained in:
Chris Bono
2025-03-16 21:40:21 -05:00
parent 9971908e54
commit fbfcfaaf74

View File

@@ -228,8 +228,8 @@ class PulsarFunctionAdministrationTests {
void firstProcessedFunctionFails() throws PulsarAdminException {
var ex = new PulsarAdminException("BOOM");
when(function1.functionExists(pulsarAdmin)).thenThrow(ex);
var thrown = catchThrowableOfType(() -> functionAdmin.createOrUpdateUserDefinedFunctions(),
PulsarFunctionException.class);
var thrown = catchThrowableOfType(PulsarFunctionException.class,
() -> functionAdmin.createOrUpdateUserDefinedFunctions());
assertThat(thrown.getFailures()).containsExactly(entry(function1, ex));
verify(function1, never()).create(pulsarAdmin);
verify(function1, never()).update(pulsarAdmin);
@@ -241,8 +241,8 @@ class PulsarFunctionAdministrationTests {
void middleProcessedFunctionFails() throws PulsarAdminException {
var ex = new PulsarAdminException("BOOM");
when(sink1.functionExists(pulsarAdmin)).thenThrow(ex);
var thrown = catchThrowableOfType(() -> functionAdmin.createOrUpdateUserDefinedFunctions(),
PulsarFunctionException.class);
var thrown = catchThrowableOfType(PulsarFunctionException.class,
() -> functionAdmin.createOrUpdateUserDefinedFunctions());
assertThat(thrown.getFailures()).containsExactly(entry(sink1, ex));
verify(function1).create(pulsarAdmin);
verify(sink1, never()).create(pulsarAdmin);
@@ -255,8 +255,8 @@ class PulsarFunctionAdministrationTests {
void lastProcessedFunctionFails() throws PulsarAdminException {
var ex = new PulsarAdminException("BOOM");
when(source1.functionExists(pulsarAdmin)).thenThrow(ex);
var thrown = catchThrowableOfType(() -> functionAdmin.createOrUpdateUserDefinedFunctions(),
PulsarFunctionException.class);
var thrown = catchThrowableOfType(PulsarFunctionException.class,
() -> functionAdmin.createOrUpdateUserDefinedFunctions());
assertThat(thrown.getFailures()).containsExactly(entry(source1, ex));
verify(function1).create(pulsarAdmin);
verify(sink1).create(pulsarAdmin);
@@ -282,8 +282,8 @@ class PulsarFunctionAdministrationTests {
void firstProcessedFunctionFails() throws PulsarAdminException {
var ex = new PulsarAdminException("BOOM");
when(function1.functionExists(pulsarAdmin)).thenThrow(ex);
var thrown = catchThrowableOfType(() -> functionAdmin.createOrUpdateUserDefinedFunctions(),
PulsarFunctionException.class);
var thrown = catchThrowableOfType(PulsarFunctionException.class,
() -> functionAdmin.createOrUpdateUserDefinedFunctions());
assertThat(thrown.getFailures()).containsExactly(entry(function1, ex));
verify(function1, never()).create(pulsarAdmin);
verify(function1, never()).update(pulsarAdmin);
@@ -296,8 +296,8 @@ class PulsarFunctionAdministrationTests {
void middleProcessedFunctionFails() throws PulsarAdminException {
var ex = new PulsarAdminException("BOOM");
when(sink1.functionExists(pulsarAdmin)).thenThrow(ex);
var thrown = catchThrowableOfType(() -> functionAdmin.createOrUpdateUserDefinedFunctions(),
PulsarFunctionException.class);
var thrown = catchThrowableOfType(PulsarFunctionException.class,
() -> functionAdmin.createOrUpdateUserDefinedFunctions());
assertThat(thrown.getFailures()).containsExactly(entry(sink1, ex));
verify(function1).create(pulsarAdmin);
verify(sink1, never()).create(pulsarAdmin);
@@ -310,8 +310,8 @@ class PulsarFunctionAdministrationTests {
void lastProcessedFunctionFails() throws PulsarAdminException {
var ex = new PulsarAdminException("BOOM");
when(source1.functionExists(pulsarAdmin)).thenThrow(ex);
var thrown = catchThrowableOfType(() -> functionAdmin.createOrUpdateUserDefinedFunctions(),
PulsarFunctionException.class);
var thrown = catchThrowableOfType(PulsarFunctionException.class,
() -> functionAdmin.createOrUpdateUserDefinedFunctions());
assertThat(thrown.getFailures()).containsExactly(entry(source1, ex));
verify(function1).create(pulsarAdmin);
verify(sink1).create(pulsarAdmin);
@@ -328,8 +328,8 @@ class PulsarFunctionAdministrationTests {
when(function1.functionExists(pulsarAdmin)).thenThrow(ex1);
when(sink1.functionExists(pulsarAdmin)).thenThrow(ex2);
when(source1.functionExists(pulsarAdmin)).thenThrow(ex3);
var thrown = catchThrowableOfType(() -> functionAdmin.createOrUpdateUserDefinedFunctions(),
PulsarFunctionException.class);
var thrown = catchThrowableOfType(PulsarFunctionException.class,
() -> functionAdmin.createOrUpdateUserDefinedFunctions());
assertThat(thrown.getFailures()).containsExactly(entry(function1, ex1), entry(sink1, ex2),
entry(source1, ex3));
verify(function1, never()).create(pulsarAdmin);
@@ -474,8 +474,8 @@ class PulsarFunctionAdministrationTests {
void firstProcessedFunctionFails() {
var ex = new PulsarException("BOOM");
doThrow(ex).when(source1).stop(pulsarAdmin);
var thrown = catchThrowableOfType(() -> functionAdmin.enforceStopPolicyOnUserDefinedFunctions(),
PulsarFunctionException.class);
var thrown = catchThrowableOfType(PulsarFunctionException.class,
() -> functionAdmin.enforceStopPolicyOnUserDefinedFunctions());
assertThat(thrown.getFailures()).containsExactly(entry(source1, ex));
verify(sink1).stop(pulsarAdmin);
verify(function1).stop(pulsarAdmin);
@@ -485,8 +485,8 @@ class PulsarFunctionAdministrationTests {
void middleProcessedFunctionFails() {
var ex = new PulsarException("BOOM");
doThrow(ex).when(sink1).stop(pulsarAdmin);
var thrown = catchThrowableOfType(() -> functionAdmin.enforceStopPolicyOnUserDefinedFunctions(),
PulsarFunctionException.class);
var thrown = catchThrowableOfType(PulsarFunctionException.class,
() -> functionAdmin.enforceStopPolicyOnUserDefinedFunctions());
assertThat(thrown.getFailures()).containsExactly(entry(sink1, ex));
verify(source1).stop(pulsarAdmin);
verify(function1).stop(pulsarAdmin);
@@ -496,8 +496,8 @@ class PulsarFunctionAdministrationTests {
void lastProcessedFunctionFails() {
var ex = new PulsarException("BOOM");
doThrow(ex).when(function1).stop(pulsarAdmin);
var thrown = catchThrowableOfType(() -> functionAdmin.enforceStopPolicyOnUserDefinedFunctions(),
PulsarFunctionException.class);
var thrown = catchThrowableOfType(PulsarFunctionException.class,
() -> functionAdmin.enforceStopPolicyOnUserDefinedFunctions());
assertThat(thrown.getFailures()).containsExactly(entry(function1, ex));
verify(source1).stop(pulsarAdmin);
verify(sink1).stop(pulsarAdmin);
@@ -511,8 +511,8 @@ class PulsarFunctionAdministrationTests {
doThrow(ex1).when(source1).stop(pulsarAdmin);
doThrow(ex2).when(sink1).stop(pulsarAdmin);
doThrow(ex3).when(function1).stop(pulsarAdmin);
var thrown = catchThrowableOfType(() -> functionAdmin.enforceStopPolicyOnUserDefinedFunctions(),
PulsarFunctionException.class);
var thrown = catchThrowableOfType(PulsarFunctionException.class,
() -> functionAdmin.enforceStopPolicyOnUserDefinedFunctions());
assertThat(thrown.getFailures()).containsExactly(entry(source1, ex1), entry(sink1, ex2),
entry(function1, ex3));
}