Add more tests to test OverviewButtonTray.

ash/rotator/screen_rotation_animator_unittest.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/rotator/screen_rotation_animator.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/public/cpp/config.h"
 #include "ash/rotator/screen_rotation_animator_observer.h"
 #include "ash/rotator/test/screen_rotation_animator_test_api.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
+#include "ash/system/overview/overview_button_tray.h"
+#include "ash/system/status_area_widget.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
+#include "ash/test/status_area_widget_test_helper.h"
+#include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "base/callback_forward.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 
 namespace ash {
 
 namespace {
 
 display::Display::Rotation GetDisplayRotation(int64_t display_id) {
   return Shell::Get()
       ->display_manager()
       ->GetDisplayInfo(display_id)
       .GetActiveRotation();
 }
 
 void SetDisplayRotation(int64_t display_id,
                         display::Display::Rotation rotation) {
   Shell::Get()->display_manager()->SetDisplayRotation(
       display_id, rotation,
       display::Display::RotationSource::ROTATION_SOURCE_USER);
 }
 
+OverviewButtonTray* GetTray() {
+  return StatusAreaWidgetTestHelper::GetStatusAreaWidget()
+      ->overview_button_tray();
+}
+
 class AnimationObserver : public ScreenRotationAnimatorObserver {
  public:
   AnimationObserver() {}
 
   bool notified() const { return notified_; }
 
   void OnScreenRotationAnimationFinished(
       ScreenRotationAnimator* animator) override {
     notified_ = true;
   }
@@ skipping 330 matching lines @@
 
   animator()->Rotate(display::Display::ROTATE_270,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   EXPECT_TRUE(test_api()->HasActiveAnimations());
 
   test_api()->CompleteAnimations();
   EXPECT_FALSE(test_api()->HasActiveAnimations());
   EXPECT_EQ(display::Display::ROTATE_270, GetDisplayRotation(display_id()));
 }
 
+// Test that slow screen rotation animation will not interrupt hide animation.
+// The OverviewButton should be hidden.
+TEST_F(ScreenRotationAnimatorSlowAnimationTest,
+       OverviewButtonTrayHideAnimationAlwaysCompletes) {
+  // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
+  if (Shell::GetAshConfig() == Config::MASH) {
+    ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
+                display_id());
+    return;
+  }
+
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+      true);
+
+  // Long duration for hide animation, to allow it to be interrupted.
+  std::unique_ptr<ui::ScopedAnimationDurationScaleMode> hide_duration(

[oshima, 2017/05/06 21:02:20]

can't you just create on a stack?

same for the rest.

[wutao, 2017/05/31 17:29:55]

Done.

+      new ui::ScopedAnimationDurationScaleMode(
+          ui::ScopedAnimationDurationScaleMode::SLOW_DURATION));
+  GetTray()->SetVisible(false);
+
+  // ScreenRotationAnimator copies the current layers, and deletes them upon
+  // completion. Allow its animation to complete first.
+  std::unique_ptr<ui::ScopedAnimationDurationScaleMode> rotate_duration(
+      new ui::ScopedAnimationDurationScaleMode(
+          ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
+  SetDisplayRotation(display_id(), display::Display::ROTATE_0);
+  animator()->Rotate(display::Display::ROTATE_90,
+                     display::Display::RotationSource::ROTATION_SOURCE_USER);
+
+  EXPECT_FALSE(GetTray()->visible());
+}
+
 // Test enable smooth screen rotation code path.
 TEST_F(ScreenRotationAnimatorSmoothAnimationTest,
        RotatesToDifferentRotationWithCopyCallback) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
   if (Shell::GetAshConfig() == Config::MASH) {
     ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
 
@@ skipping 131 matching lines @@
           base::Unretained(this), "640x480"));
   SetDisplayRotation(display_manager()->GetDisplayAt(1).id(),
                      display::Display::ROTATE_0);
   animator()->Rotate(display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   WaitForCopyCallback();
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
   EXPECT_EQ(secondary_display_id, display_manager()->GetDisplayAt(0).id());
 }
 
+// Test that smooth screen rotation animation will not interrupt hide animation.
+// The OverviewButton should be hidden.
+TEST_F(ScreenRotationAnimatorSmoothAnimationTest,
+       OverviewButtonTrayHideAnimationAlwaysCompletes) {
+  // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
+  if (Shell::GetAshConfig() == Config::MASH) {
+    ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
+                display_id());
+    return;
+  }
+
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+      true);
+
+  // Long duration for hide animation, to allow it to be interrupted.
+  std::unique_ptr<ui::ScopedAnimationDurationScaleMode> hide_duration(
+      new ui::ScopedAnimationDurationScaleMode(
+          ui::ScopedAnimationDurationScaleMode::SLOW_DURATION));
+  GetTray()->SetVisible(false);
+
+  // Allow ScreenRotationAnimator animation to complete first.
+  std::unique_ptr<ui::ScopedAnimationDurationScaleMode> rotate_duration(
+      new ui::ScopedAnimationDurationScaleMode(
+          ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
+  SetScreenRotationAnimator(
+      display_manager()->GetDisplayAt(0).id(), run_loop_->QuitWhenIdleClosure(),
+      base::Bind(
+          &ScreenRotationAnimatorSmoothAnimationTest::QuitWaitForCopyCallback,
+          base::Unretained(this)));
+  SetDisplayRotation(display_id(), display::Display::ROTATE_0);
+  animator()->Rotate(display::Display::ROTATE_90,
+                     display::Display::RotationSource::ROTATION_SOURCE_USER);
+  WaitForCopyCallback();
+
+  GetTray()->layer()->GetAnimator()->StopAnimating();
+  EXPECT_FALSE(GetTray()->visible());
+}
+
 }  // namespace ash