1 files changed, 14 insertions, 13 deletions
diff --git a/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java b/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java
index 5796f01cc5..d96793bf8e 100644
--- a/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java
+++ b/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java
@@ -17,6 +17,8 @@ package com.vaadin.ui;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
@@ -27,7 +29,6 @@ import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.jsoup.nodes.Element;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -190,10 +191,10 @@ public class AbstractSingleSelectTest {
     public void getValue() {
         listing.setSelectedItem(PERSON_B);
 
-        Assert.assertEquals(PERSON_B, listing.getValue());
+        assertEquals(PERSON_B, listing.getValue());
 
         listing.setValue(null);
-        Assert.assertNull(listing.getValue());
+        assertNull(listing.getValue());
         verifyValueChanges();
     }
 
@@ -205,22 +206,22 @@ public class AbstractSingleSelectTest {
         Mockito.when(select.getSelectedItem()).thenReturn(selected);
         Mockito.doCallRealMethod().when(select).getValue();
 
-        Assert.assertSame(selected.get(), select.getValue());
+        assertSame(selected.get(), select.getValue());
 
         selected = Optional.empty();
         Mockito.when(select.getSelectedItem()).thenReturn(selected);
-        Assert.assertNull(select.getValue());
+        assertNull(select.getValue());
     }
 
     @Test
     public void setValue() {
         listing.setValue(PERSON_C);
 
-        Assert.assertEquals(PERSON_C, listing.getSelectedItem().get());
+        assertEquals(PERSON_C, listing.getSelectedItem().get());
 
         listing.setValue(null);
 
-        Assert.assertFalse(listing.getSelectedItem().isPresent());
+        assertFalse(listing.getSelectedItem().isPresent());
         verifyValueChanges();
     }
 
@@ -281,18 +282,18 @@ public class AbstractSingleSelectTest {
 
         AtomicReference<ValueChangeEvent<?>> event = new AtomicReference<>();
         Registration actualRegistration = select.addValueChangeListener(evt -> {
-            Assert.assertNull(event.get());
+            assertNull(event.get());
             event.set(evt);
         });
-        Assert.assertSame(registration, actualRegistration);
+        assertSame(registration, actualRegistration);
 
         selectionListener.get().selectionChange(
                 new SingleSelectionEvent<>(select, value, true));
 
-        Assert.assertEquals(select, event.get().getComponent());
-        Assert.assertEquals(value, event.get().getOldValue());
-        Assert.assertEquals(value, event.get().getValue());
-        Assert.assertTrue(event.get().isUserOriginated());
+        assertEquals(select, event.get().getComponent());
+        assertEquals(value, event.get().getOldValue());
+        assertEquals(value, event.get().getValue());
+        assertTrue(event.get().isUserOriginated());
     }
 
     private void verifyValueChanges() {