Use static import of Assert in tests (#10126)

Also removes dependency on junit.framework.TestCase .

1 files changed, 23 insertions, 20 deletions

diff --git a/server/src/test/java/com/vaadin/ui/UIInitRefreshTest.java b/server/src/test/java/com/vaadin/ui/UIInitRefreshTest.java
index 65bbc59a5b..a1b8394c7b 100644
--- a/server/src/test/java/com/vaadin/ui/UIInitRefreshTest.java
+++ b/server/src/test/java/com/vaadin/ui/UIInitRefreshTest.java
@@ -15,11 +15,14 @@
  */
 package com.vaadin.ui;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Locale;
 
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -47,36 +50,36 @@ public class UIInitRefreshTest {
 
             initCalled = true;
 
-            Assert.assertEquals("foo", getPage().getUriFragment());
-            Assert.assertEquals(100, getPage().getBrowserWindowWidth());
-            Assert.assertEquals(100, getPage().getBrowserWindowHeight());
+            assertEquals("foo", getPage().getUriFragment());
+            assertEquals(100, getPage().getBrowserWindowWidth());
+            assertEquals(100, getPage().getBrowserWindowHeight());
 
-            Assert.assertFalse(fragmentChangeCalled);
-            Assert.assertFalse(browserWindowResizeCalled);
+            assertFalse(fragmentChangeCalled);
+            assertFalse(browserWindowResizeCalled);
         }
 
         @Override
         protected void refresh(VaadinRequest request) {
             refreshCalled = true;
 
-            Assert.assertEquals("bar", getPage().getUriFragment());
-            Assert.assertEquals(200, getPage().getBrowserWindowWidth());
-            Assert.assertEquals(200, getPage().getBrowserWindowHeight());
+            assertEquals("bar", getPage().getUriFragment());
+            assertEquals(200, getPage().getBrowserWindowWidth());
+            assertEquals(200, getPage().getBrowserWindowHeight());
 
-            Assert.assertFalse(fragmentChangeCalled);
-            Assert.assertFalse(browserWindowResizeCalled);
+            assertFalse(fragmentChangeCalled);
+            assertFalse(browserWindowResizeCalled);
         }
 
         @Override
         public void browserWindowResized(BrowserWindowResizeEvent event) {
-            Assert.assertEquals(200, event.getWidth());
-            Assert.assertEquals(200, event.getHeight());
+            assertEquals(200, event.getWidth());
+            assertEquals(200, event.getHeight());
             browserWindowResizeCalled = true;
         }
 
         @Override
         public void uriFragmentChanged(UriFragmentChangedEvent event) {
-            Assert.assertEquals("bar", event.getUriFragment());
+            assertEquals("bar", event.getUriFragment());
             fragmentChangeCalled = true;
         }
     }
@@ -117,14 +120,14 @@ public class UIInitRefreshTest {
         ui.setSession(session);
         ui.doInit(initRequest, 0, "");
 
-        Assert.assertTrue(initCalled);
-        Assert.assertFalse(fragmentChangeCalled);
-        Assert.assertFalse(browserWindowResizeCalled);
+        assertTrue(initCalled);
+        assertFalse(fragmentChangeCalled);
+        assertFalse(browserWindowResizeCalled);
 
         ui.doRefresh(reinitRequest);
 
-        Assert.assertTrue(refreshCalled);
-        Assert.assertTrue(fragmentChangeCalled);
-        Assert.assertTrue(browserWindowResizeCalled);
+        assertTrue(refreshCalled);
+        assertTrue(fragmentChangeCalled);
+        assertTrue(browserWindowResizeCalled);
     }
 }