Rearrange native unit tests after merge

packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/TextureBasedVideoPlayerTest.java

@@ -85,7 +85,7 @@ public void loadsAndPreparesProvidedMediaEnablesAudioFocusByDefault() {
   }
 
   @Test
-  public void onSurfaceProducerDestroyedAndRecreatedReleasesAndThenRecreatesAndResumesPlayer() {
+  public void onSurfaceProducerDestroyedAndAvailableReleasesAndThenRecreatesAndResumesPlayer() {
     VideoPlayer videoPlayer = createVideoPlayer();
 
     verify(mockProducer).setCallback(callbackCaptor.capture());
@@ -97,13 +97,13 @@ public void onSurfaceProducerDestroyedAndRecreatedReleasesAndThenRecreatesAndRes
     when(mockExoPlayer.getPlaybackParameters()).thenReturn(new PlaybackParameters(2.5f));
 
     TextureRegistry.SurfaceProducer.Callback producerLifecycle = callbackCaptor.getValue();
-    producerLifecycle.onSurfaceDestroyed();
+    simulateSurfaceDestruction(producerLifecycle);
 
     verify(mockExoPlayer).release();
 
     // Create a new mock exo player so that we get a new instance.
     mockExoPlayer = mock(ExoPlayer.class);
-    simulateSurfaceCreation(producerLifecycle);
+    producerLifecycle.onSurfaceAvailable();
 
     verify(mockExoPlayer).seekTo(10L);
     verify(mockExoPlayer).setRepeatMode(Player.REPEAT_MODE_ALL);
@@ -119,7 +119,7 @@ public void onSurfaceProducerDestroyedDoesNotStopOrPauseVideo() {
 
     verify(mockProducer).setCallback(callbackCaptor.capture());
     TextureRegistry.SurfaceProducer.Callback producerLifecycle = callbackCaptor.getValue();
-    producerLifecycle.onSurfaceDestroyed();
+    simulateSurfaceDestruction(producerLifecycle);
 
     verify(mockExoPlayer, never()).stop();
     verify(mockExoPlayer, never()).pause();
@@ -155,7 +155,7 @@ public void onInitializedCalledWhenVideoPlayerInitiallyCreated() {
   }
 
   @Test
-  public void onSurfaceCreatedDoesNotSendInitializeEventAgain() {
+  public void onSurfaceAvailableDoesNotSendInitializeEventAgain() {
     // The VideoPlayer contract assumes that the event "initialized" is sent exactly once
     // (duplicate events cause an error to be thrown at the shared Dart layer). This test verifies
     // that the onInitialized event is sent exactly once per player.
@@ -164,13 +164,13 @@ public void onSurfaceCreatedDoesNotSendInitializeEventAgain() {
     VideoPlayer videoPlayer = createVideoPlayer();
     when(mockExoPlayer.getVideoSize()).thenReturn(new VideoSize(300, 200));
 
-    // Capture the lifecycle events so we can simulate onSurfaceCreated/Destroyed.
+    // Capture the lifecycle events so we can simulate onSurfaceAvailableDestroyed.
     verify(mockProducer).setCallback(callbackCaptor.capture());
     TextureRegistry.SurfaceProducer.Callback producerLifecycle = callbackCaptor.getValue();
 
-    // Trigger destroyed/created.
-    producerLifecycle.onSurfaceDestroyed();
-    simulateSurfaceCreation(producerLifecycle);
+    // Trigger destroyed/available.
+    simulateSurfaceDestruction(producerLifecycle);
+    producerLifecycle.onSurfaceAvailable();
 
     // Initial listener, and the new one from the resume.
     verify(mockExoPlayer, times(2)).addListener(listenerCaptor.capture());
@@ -186,17 +186,17 @@ public void onSurfaceCreatedDoesNotSendInitializeEventAgain() {
   }
 
   @Test
-  public void onSurfaceCreatedWithoutDestroyDoesNotRecreate() {
+  public void onSurfaceAvailableWithoutDestroyDoesNotRecreate() {
     // Initially create the video player, which creates the initial surface.
     VideoPlayer videoPlayer = createVideoPlayer();
     verify(mockProducer).getSurface();
 
-    // Capture the lifecycle events so we can simulate onSurfaceCreated/Destroyed.
+    // Capture the lifecycle events so we can simulate onSurfaceAvailable/Destroyed.
     verify(mockProducer).setCallback(callbackCaptor.capture());
     TextureRegistry.SurfaceProducer.Callback producerLifecycle = callbackCaptor.getValue();
 
-    // Calling onSurfaceCreated does not do anything, since the surface was never destroyed.
-    simulateSurfaceCreation(producerLifecycle);
+    // Calling onSurfaceAvailable does not do anything, since the surface was never destroyed.
+    producerLifecycle.onSurfaceAvailable();
     verifyNoMoreInteractions(mockProducer);
 
     videoPlayer.dispose();
@@ -222,4 +222,12 @@ public void disposeReleasesExoPlayerBeforeTexture() {
   void simulateSurfaceCreation(TextureRegistry.SurfaceProducer.Callback producerLifecycle) {
     producerLifecycle.onSurfaceCreated();
   }
+
+  // TODO(bparrishMines): Replace with inline calls to onSurfaceCleanup once available on stable;
+  // see https://github.com/flutter/flutter/issues/16125. This separate method only exists to scope
+  // the suppression.
+  @SuppressWarnings({"deprecation", "removal"})
+  void simulateSurfaceDestruction(TextureRegistry.SurfaceProducer.Callback producerLifecycle) {
+    producerLifecycle.onSurfaceDestroyed();
+  }
 }

packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/VideoPlayerTest.java

@@ -161,60 +161,6 @@ public void seekAndGetPosition() {
     assertEquals(20L, videoPlayer.getPosition());
   }
 
-  @Test
-  public void onSurfaceProducerDestroyedAndAvailableReleasesAndThenRecreatesAndResumesPlayer() {
-    VideoPlayer videoPlayer = createVideoPlayer();
-
-    verify(mockProducer).setCallback(callbackCaptor.capture());
-    verify(mockExoPlayer, never()).release();
-
-    when(mockExoPlayer.getCurrentPosition()).thenReturn(10L);
-    when(mockExoPlayer.getRepeatMode()).thenReturn(Player.REPEAT_MODE_ALL);
-    when(mockExoPlayer.getVolume()).thenReturn(0.5f);
-    when(mockExoPlayer.getPlaybackParameters()).thenReturn(new PlaybackParameters(2.5f));
-
-    TextureRegistry.SurfaceProducer.Callback producerLifecycle = callbackCaptor.getValue();
-    simulateSurfaceDestruction(producerLifecycle);
-
-    verify(mockExoPlayer).release();
-
-    // Create a new mock exo player so that we get a new instance.
-    mockExoPlayer = mock(ExoPlayer.class);
-    producerLifecycle.onSurfaceAvailable();
-
-    verify(mockExoPlayer).seekTo(10L);
-    verify(mockExoPlayer).setRepeatMode(Player.REPEAT_MODE_ALL);
-    verify(mockExoPlayer).setVolume(0.5f);
-    verify(mockExoPlayer).setPlaybackParameters(new PlaybackParameters(2.5f));
-
-    videoPlayer.dispose();
-  }
-
-  @Test
-  public void onSurfaceProducerDestroyedDoesNotStopOrPauseVideo() {
-    VideoPlayer videoPlayer = createVideoPlayer();
-
-    verify(mockProducer).setCallback(callbackCaptor.capture());
-    TextureRegistry.SurfaceProducer.Callback producerLifecycle = callbackCaptor.getValue();
-    simulateSurfaceDestruction(producerLifecycle);
-
-    verify(mockExoPlayer, never()).stop();
-    verify(mockExoPlayer, never()).pause();
-    verify(mockExoPlayer, never()).setPlayWhenReady(anyBoolean());
-
-    videoPlayer.dispose();
-  }
-
-  @Test
-  public void onDisposeSurfaceProducerCallbackIsDisconnected() {
-    // Regression test for https://github.com/flutter/flutter/issues/156158.
-    VideoPlayer videoPlayer = createVideoPlayer();
-    verify(mockProducer).setCallback(any());
-
-    videoPlayer.dispose();
-    verify(mockProducer).setCallback(null);
-  }
-
   @Test
   public void onInitializedCalledWhenVideoPlayerInitiallyAvailable() {
     VideoPlayer videoPlayer = createVideoPlayer();
@@ -233,54 +179,6 @@ public void onInitializedCalledWhenVideoPlayerInitiallyAvailable() {
     videoPlayer.dispose();
   }
 
-  @Test
-  public void onSurfaceAvailableDoesNotSendInitializeEventAgain() {
-    // The VideoPlayer contract assumes that the event "initialized" is sent exactly once
-    // (duplicate events cause an error to be thrown at the shared Dart layer). This test verifies
-    // that the onInitialized event is sent exactly once per player.
-    //
-    // Regression test for https://github.com/flutter/flutter/issues/154602.
-    VideoPlayer videoPlayer = createVideoPlayer();
-    when(mockExoPlayer.getVideoSize()).thenReturn(new VideoSize(300, 200));
-
-    // Capture the lifecycle events so we can simulate onSurfaceAvailableDestroyed.
-    verify(mockProducer).setCallback(callbackCaptor.capture());
-    TextureRegistry.SurfaceProducer.Callback producerLifecycle = callbackCaptor.getValue();
-
-    // Trigger destroyed/available.
-    simulateSurfaceDestruction(producerLifecycle);
-    producerLifecycle.onSurfaceAvailable();
-
-    // Initial listener, and the new one from the resume.
-    verify(mockExoPlayer, times(2)).addListener(listenerCaptor.capture());
-    Player.Listener listener = listenerCaptor.getValue();
-
-    // Now trigger that same event, which would happen in the case of a background/resume.
-    listener.onPlaybackStateChanged(Player.STATE_READY);
-
-    // Was not called because it was a result of a background/resume.
-    verify(mockEvents, never()).onInitialized(anyInt(), anyInt(), anyLong(), anyInt());
-
-    videoPlayer.dispose();
-  }
-
-  @Test
-  public void onSurfaceAvailableWithoutDestroyDoesNotRecreate() {
-    // Initially create the video player, which creates the initial surface.
-    VideoPlayer videoPlayer = createVideoPlayer();
-    verify(mockProducer).getSurface();
-
-    // Capture the lifecycle events so we can simulate onSurfaceAvailable/Destroyed.
-    verify(mockProducer).setCallback(callbackCaptor.capture());
-    TextureRegistry.SurfaceProducer.Callback producerLifecycle = callbackCaptor.getValue();
-
-    // Calling onSurfaceAvailable does not do anything, since the surface was never destroyed.
-    producerLifecycle.onSurfaceAvailable();
-    verifyNoMoreInteractions(mockProducer);
-
-    videoPlayer.dispose();
-  }
-
   @Test
   public void disposeReleasesExoPlayer() {
     VideoPlayer videoPlayer = createVideoPlayer();
@@ -289,12 +187,4 @@ public void disposeReleasesExoPlayer() {
 
     verify(mockExoPlayer).release();
   }
-
-  // TODO(bparrishMines): Replace with inline calls to onSurfaceCleanup once available on stable;
-  // see https://github.com/flutter/flutter/issues/16125. This separate method only exists to scope
-  // the suppression.
-  @SuppressWarnings({"deprecation", "removal"})
-  void simulateSurfaceDestruction(TextureRegistry.SurfaceProducer.Callback producerLifecycle) {
-    producerLifecycle.onSurfaceDestroyed();
-  }
 }