From 26fedd7e61cac1145b92e3e32c6016c30b8f5d23 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Jan 2018 16:58:20 +0900
Subject: [PATCH] Update in line with upstream changes

(cherry picked from commit 2b6d991)
---
 .../Objects/Drawable/DrawableBananaShower.cs      |  7 ++++---
 .../Tests/TestCaseBananaShower.cs                 | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBananaShower.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBananaShower.cs
index 0bbf12bfcc..b38880a8c3 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBananaShower.cs
@@ -13,13 +13,14 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
     {
         private readonly Container bananaContainer;
 
-        public DrawableBananaShower(BananaShower s) : base(s)
+        public DrawableBananaShower(BananaShower s)
+            : base(s)
         {
             RelativeSizeAxes = Axes.Both;
             Height = (float)HitObject.Duration;
             X = 0;
 
-           Child = bananaContainer = new Container
+            Child = bananaContainer = new Container
             {
                 RelativeSizeAxes = Axes.Both,
                 RelativeChildOffset = new Vector2(0, (float)HitObject.StartTime),
@@ -27,7 +28,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
             };
 
             foreach (var b in s.NestedHitObjects.Cast<BananaShower.Banana>())
-                    AddNested(new DrawableFruit(b));
+                AddNested(new DrawableFruit(b));
         }
 
         protected override void AddNested(DrawableHitObject<CatchHitObject> h)
diff --git a/osu.Game.Rulesets.Catch/Tests/TestCaseBananaShower.cs b/osu.Game.Rulesets.Catch/Tests/TestCaseBananaShower.cs
index 4499905560..aae36beb57 100644
--- a/osu.Game.Rulesets.Catch/Tests/TestCaseBananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Tests/TestCaseBananaShower.cs
@@ -1,9 +1,13 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
+using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.Objects.Drawable;
+using osu.Game.Rulesets.Catch.UI;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
@@ -11,8 +15,17 @@ namespace osu.Game.Rulesets.Catch.Tests
     [Ignore("getting CI working")]
     public class TestCaseBananaShower : Game.Tests.Visual.TestCasePlayer
     {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(BananaShower),
+            typeof(DrawableBananaShower),
+
+            typeof(CatchRuleset),
+            typeof(CatchRulesetContainer),
+        };
+
         public TestCaseBananaShower()
-            : base(typeof(CatchRuleset))
+            : base(new CatchRuleset())
         {
         }