Update Mockito, JUnit and use MockitoExtensions in itests (#9702)
* Updates Mockito to 3.7.0 * Updates JUnit to 5.7.0 * Use MockitoExtensions where possible Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
@@ -14,7 +14,6 @@ package org.openhab.binding.tr064.internal.phonebook;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
import static org.mockito.MockitoAnnotations.openMocks;
|
||||
import static org.openhab.binding.tr064.internal.Tr064BindingConstants.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
@@ -27,11 +26,14 @@ import java.util.Set;
|
||||
|
||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||
import org.eclipse.jdt.annotation.Nullable;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.MethodSource;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
import org.mockito.junit.jupiter.MockitoSettings;
|
||||
import org.mockito.quality.Strictness;
|
||||
import org.openhab.core.config.core.Configuration;
|
||||
import org.openhab.core.library.types.StringListType;
|
||||
import org.openhab.core.library.types.StringType;
|
||||
@@ -47,6 +49,8 @@ import org.openhab.core.util.UIDUtils;
|
||||
*
|
||||
* @author Christoph Weitkamp - Initial contribution
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
@MockitoSettings(strictness = Strictness.WARN)
|
||||
class PhonebookProfileTest {
|
||||
|
||||
private static final String INTERNAL_PHONE_NUMBER = "999";
|
||||
@@ -97,8 +101,6 @@ class PhonebookProfileTest {
|
||||
});
|
||||
}
|
||||
|
||||
private AutoCloseable mocksCloseable;
|
||||
|
||||
private @Mock ProfileCallback mockCallback;
|
||||
private @Mock ProfileContext mockContext;
|
||||
private @Mock PhonebookProvider mockPhonebookProvider;
|
||||
@@ -123,17 +125,10 @@ class PhonebookProfileTest {
|
||||
|
||||
@BeforeEach
|
||||
public void setup() {
|
||||
mocksCloseable = openMocks(this);
|
||||
|
||||
when(mockPhonebookProvider.getPhonebookByName(any(String.class))).thenReturn(Optional.of(phonebook));
|
||||
when(mockPhonebookProvider.getPhonebooks()).thenReturn(Set.of(phonebook));
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
public void afterEach() throws Exception {
|
||||
mocksCloseable.close();
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("parameters")
|
||||
public void testPhonebookProfileResolvesPhoneNumber(ParameterSet parameterSet) {
|
||||
|
||||
Reference in New Issue
Block a user