1 files changed, 16 insertions, 14 deletions
diff --git a/server/src/test/java/com/vaadin/data/ValueContextTest.java b/server/src/test/java/com/vaadin/data/ValueContextTest.java
index b96f7463cb..9dd0e90b69 100644
--- a/server/src/test/java/com/vaadin/data/ValueContextTest.java
+++ b/server/src/test/java/com/vaadin/data/ValueContextTest.java
@@ -1,14 +1,15 @@
 package com.vaadin.data;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.Locale;
 import java.util.Objects;
 
-import com.vaadin.ui.CheckBox;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI;
 
@@ -24,8 +25,8 @@ public class ValueContextTest extends UI {
         ValueContext fromComponent = new ValueContext(textField);
         Locale locale = fromComponent.getLocale().orElse(null);
         Objects.requireNonNull(locale);
-        Assert.assertEquals("Unexpected locale from component",
-                COMPONENT_LOCALE, locale);
+        assertEquals("Unexpected locale from component", COMPONENT_LOCALE,
+                locale);
     }
 
     @Test
@@ -33,8 +34,7 @@ public class ValueContextTest extends UI {
         ValueContext fromComponent = new ValueContext(textField);
         Locale locale = fromComponent.getLocale().orElse(null);
         Objects.requireNonNull(locale);
-        Assert.assertEquals("Unexpected locale from component", UI_LOCALE,
-                locale);
+        assertEquals("Unexpected locale from component", UI_LOCALE, locale);
     }
 
     @Test
@@ -43,30 +43,32 @@ public class ValueContextTest extends UI {
         ValueContext fromComponent = new ValueContext(textField);
         Locale locale = fromComponent.getLocale().orElse(null);
         Objects.requireNonNull(locale);
-        Assert.assertEquals("Unexpected locale from component",
-                Locale.getDefault(), locale);
+        assertEquals("Unexpected locale from component", Locale.getDefault(),
+                locale);
     }
 
     @Test
     public void testHasValue1() {
         setLocale(null);
         ValueContext fromComponent = new ValueContext(textField);
-        Assert.assertEquals(textField, fromComponent.getHasValue().get());
+        assertEquals(textField, fromComponent.getHasValue().get());
     }
 
     @Test
     public void testHasValue2() {
         setLocale(null);
-        ValueContext fromComponent = new ValueContext(new CheckBox(), textField);
-        Assert.assertEquals(textField, fromComponent.getHasValue().get());
+        ValueContext fromComponent = new ValueContext(new CheckBox(),
+                textField);
+        assertEquals(textField, fromComponent.getHasValue().get());
     }
 
     @Test
     public void testHasValue3() {
         setLocale(null);
-        ValueContext fromComponent = new ValueContext(new CheckBox(), textField, Locale.CANADA);
-        Assert.assertEquals(textField, fromComponent.getHasValue().get());
-        Assert.assertEquals(Locale.CANADA, fromComponent.getLocale().get());
+        ValueContext fromComponent = new ValueContext(new CheckBox(), textField,
+                Locale.CANADA);
+        assertEquals(textField, fromComponent.getHasValue().get());
+        assertEquals(Locale.CANADA, fromComponent.getLocale().get());
     }
 
     @Before