diff --git a/flutter-idea/src/io/flutter/survey/FlutterSurveyNotifications.java b/flutter-idea/src/io/flutter/survey/FlutterSurveyNotifications.java index 3f66dbe06..0f4a76353 100644 --- a/flutter-idea/src/io/flutter/survey/FlutterSurveyNotifications.java +++ b/flutter-idea/src/io/flutter/survey/FlutterSurveyNotifications.java @@ -24,7 +24,6 @@ import org.jetbrains.annotations.NotNull; import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; public class FlutterSurveyNotifications { diff --git a/flutter-idea/src/io/flutter/view/FlutterView.java b/flutter-idea/src/io/flutter/view/FlutterView.java index d5c48848a..992aa82f4 100644 --- a/flutter-idea/src/io/flutter/view/FlutterView.java +++ b/flutter-idea/src/io/flutter/view/FlutterView.java @@ -15,17 +15,14 @@ import com.intellij.openapi.progress.EmptyProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.ui.VerticalFlowLayout; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.openapi.wm.ex.ToolWindowManagerEx; import com.intellij.serviceContainer.NonInjectable; import com.intellij.ui.components.JBLabel; -import com.intellij.ui.components.labels.LinkLabel; import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentManager; -import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; import io.flutter.FlutterBundle; import io.flutter.FlutterUtils; diff --git a/flutter-idea/testSrc/unit/io/flutter/view/FlutterViewTest.java b/flutter-idea/testSrc/unit/io/flutter/view/FlutterViewTest.java index fdea1a8b7..0a30cc8d4 100644 --- a/flutter-idea/testSrc/unit/io/flutter/view/FlutterViewTest.java +++ b/flutter-idea/testSrc/unit/io/flutter/view/FlutterViewTest.java @@ -48,27 +48,28 @@ public class FlutterViewTest { ViewUtils viewUtilsSpy; @Before - public void setUp() { - MockitoAnnotations.openMocks(this); - - // Static mocking for ApplicationManager. - mockedStaticApplicationManager = Mockito.mockStatic(ApplicationManager.class); - mockedStaticApplicationManager.when(ApplicationManager::getApplication).thenReturn(mockApplication); - doAnswer(invocation -> { - Runnable runnable = invocation.getArgument(0); - if (runnable != null) { - runnable.run(); - } - return null; - }).when(mockApplication).invokeLater(any(Runnable.class)); - - // Mocking for ContentManager. - when(mockToolWindow.getContentManager()).thenReturn(mockContentManager); - when(mockContentManager.getFactory()).thenReturn(mockContentFactory); - - // Spy on the ViewUtils class. - final ViewUtils viewUtils = new ViewUtils(); - viewUtilsSpy = spy(viewUtils); + public void setUp() throws Exception { + try (var mocks = MockitoAnnotations.openMocks(this)) { + + // Static mocking for ApplicationManager. + mockedStaticApplicationManager = Mockito.mockStatic(ApplicationManager.class); + mockedStaticApplicationManager.when(ApplicationManager::getApplication).thenReturn(mockApplication); + doAnswer(invocation -> { + Runnable runnable = invocation.getArgument(0); + if (runnable != null) { + runnable.run(); + } + return null; + }).when(mockApplication).invokeLater(any(Runnable.class)); + + // Mocking for ContentManager. + when(mockToolWindow.getContentManager()).thenReturn(mockContentManager); + when(mockContentManager.getFactory()).thenReturn(mockContentFactory); + + // Spy on the ViewUtils class. + final ViewUtils viewUtils = new ViewUtils(); + viewUtilsSpy = spy(viewUtils); + } } @After