From bb8efcc12fbed4ad026cecd4bc450274279afabb Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 8 Jul 2017 18:17:47 +0900 Subject: [PATCH] Fix CI issues (pass #2) --- .../Tests/TestCaseBeatmapDetails.cs | 2 +- .../Tests/TestCaseContextMenu.cs | 4 ++-- .../Tests/TestCaseDialogOverlay.cs | 4 ++-- osu.Desktop.VisualTests/Tests/TestCaseGraph.cs | 4 ++-- .../Tests/TestCaseHitObjects.cs | 4 ++-- .../Tests/TestCaseLeaderboard.cs | 2 +- .../Tests/TestCaseMenuOverlays.cs | 15 ++++++++------- .../Tests/TestCaseMusicController.cs | 4 +--- .../Tests/TestCaseNotificationManager.cs | 2 +- .../Tests/TestCasePlaySongSelect.cs | 10 +++++----- osu.Desktop.VisualTests/Tests/TestCasePlayer.cs | 8 ++------ .../Tests/TestCaseReplaySettingsOverlay.cs | 6 +++--- .../Tests/TestCaseScrollingHitObjects.cs | 13 +++++++------ osu.Desktop.VisualTests/Tests/TestCaseSettings.cs | 2 +- .../Tests/TestCaseSongProgress.cs | 6 +++--- .../Tests/TestCaseTaikoPlayfield.cs | 4 ++-- 16 files changed, 43 insertions(+), 47 deletions(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs b/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs index 903a26e7ea..9335938265 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs @@ -13,7 +13,7 @@ namespace osu.Desktop.VisualTests.Tests { public override string Description => "BeatmapDetails tab of BeatmapDetailArea"; - private BeatmapDetails details; + private readonly BeatmapDetails details; public TestCaseBeatmapDetails() { diff --git a/osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs b/osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs index aeb59e9cf3..6c0da885ac 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs @@ -21,10 +21,10 @@ namespace osu.Desktop.VisualTests.Tests private const int start_time = 0; private const int duration = 1000; - private MyContextMenuContainer container; - public TestCaseContextMenu() { + MyContextMenuContainer container; + Add(container = new MyContextMenuContainer { Size = new Vector2(200), diff --git a/osu.Desktop.VisualTests/Tests/TestCaseDialogOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCaseDialogOverlay.cs index cfdb31e88d..6924817827 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseDialogOverlay.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseDialogOverlay.cs @@ -12,10 +12,10 @@ namespace osu.Desktop.VisualTests.Tests { public override string Description => @"Display dialogs"; - private DialogOverlay overlay; - public TestCaseDialogOverlay() { + DialogOverlay overlay; + Add(overlay = new DialogOverlay()); AddStep("dialog #1", () => overlay.Push(new PopupDialog diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGraph.cs b/osu.Desktop.VisualTests/Tests/TestCaseGraph.cs index 0a5be88ef2..d969decaa5 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseGraph.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseGraph.cs @@ -13,10 +13,10 @@ namespace osu.Desktop.VisualTests.Tests { public override string Description => "graph"; - private BarGraph graph; - public TestCaseGraph() { + BarGraph graph; + Children = new[] { graph = new BarGraph diff --git a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs index 888c5cd67e..33841cae90 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs @@ -77,8 +77,8 @@ namespace osu.Desktop.VisualTests.Tests private HitObjectType mode = HitObjectType.Slider; private readonly BindableNumber playbackSpeed = new BindableDouble(0.5) { MinValue = 0, MaxValue = 1 }; - private Container playfieldContainer; - private Container approachContainer; + private readonly Container playfieldContainer; + private readonly Container approachContainer; private void loadHitobjects(HitObjectType mode) { diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs index c800cb63aa..12d01ecc79 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs @@ -16,7 +16,7 @@ namespace osu.Desktop.VisualTests.Tests { public override string Description => @"From song select"; - private Leaderboard leaderboard; + private readonly Leaderboard leaderboard; private void newScores() { diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMenuOverlays.cs b/osu.Desktop.VisualTests/Tests/TestCaseMenuOverlays.cs index 7c8e90aaf8..0187c0e629 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseMenuOverlays.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseMenuOverlays.cs @@ -12,13 +12,12 @@ namespace osu.Desktop.VisualTests.Tests { public override string Description => @"Tests pause and fail overlays"; - private PauseContainer.PauseOverlay pauseOverlay; - private FailOverlay failOverlay; - private int retryCount; - public TestCaseMenuOverlays() { - retryCount = 0; + FailOverlay failOverlay; + PauseContainer.PauseOverlay pauseOverlay; + + var retryCount = 0; Add(pauseOverlay = new PauseContainer.PauseOverlay { @@ -32,14 +31,16 @@ namespace osu.Desktop.VisualTests.Tests OnQuit = () => Logger.Log(@"Quit"), }); - AddStep(@"Pause", delegate { + AddStep(@"Pause", delegate + { if (failOverlay.State == Visibility.Visible) { failOverlay.Hide(); } pauseOverlay.Show(); }); - AddStep("Fail", delegate { + AddStep("Fail", delegate + { if (pauseOverlay.State == Visibility.Visible) { pauseOverlay.Hide(); diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs b/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs index fe02e655e7..cbb2775234 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs @@ -13,13 +13,11 @@ namespace osu.Desktop.VisualTests.Tests { public override string Description => @"Tests music controller ui."; - private MusicController mc; - public TestCaseMusicController() { Clock = new FramedClock(); - mc = new MusicController + var mc = new MusicController { Origin = Anchor.Centre, Anchor = Anchor.Centre diff --git a/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs b/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs index 6a50076b08..4ba50c8220 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs @@ -16,7 +16,7 @@ namespace osu.Desktop.VisualTests.Tests { public override string Description => @"I handle notifications"; - private NotificationManager manager; + private readonly NotificationManager manager; public TestCaseNotificationManager() { diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs b/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs index a30d719a29..83a1436357 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs @@ -13,19 +13,19 @@ namespace osu.Desktop.VisualTests.Tests { internal class TestCasePlaySongSelect : TestCase { - private BeatmapDatabase db; - private TestStorage storage; - private PlaySongSelect songSelect; + private readonly BeatmapDatabase db; public override string Description => @"with fake data"; - private RulesetDatabase rulesets; + private readonly RulesetDatabase rulesets; public TestCasePlaySongSelect() { + PlaySongSelect songSelect; + if (db == null) { - storage = new TestStorage(@"TestCasePlaySongSelect"); + var storage = new TestStorage(@"TestCasePlaySongSelect"); var backingDatabase = storage.GetDatabase(@"client"); diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs index f79451882b..954d24fcc1 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs @@ -20,24 +20,20 @@ namespace osu.Desktop.VisualTests.Tests internal class TestCasePlayer : TestCase { protected Player Player; - private BeatmapDatabase db; private RulesetDatabase rulesets; public override string Description => @"Showing everything to play the game."; [BackgroundDependencyLoader] - private void load(BeatmapDatabase db, RulesetDatabase rulesets) + private void load(RulesetDatabase rulesets) { this.rulesets = rulesets; - this.db = db; } protected override void LoadComplete() { base.LoadComplete(); - WorkingBeatmap beatmap = null; - var objects = new List(); int time = 1500; @@ -70,7 +66,7 @@ namespace osu.Desktop.VisualTests.Tests } }; - beatmap = new TestWorkingBeatmap(b); + WorkingBeatmap beatmap = new TestWorkingBeatmap(b); Add(new Box { diff --git a/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs index 923879b0f7..00a9774067 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs @@ -13,11 +13,11 @@ namespace osu.Desktop.VisualTests.Tests { public override string Description => @"Settings visible in replay/auto"; - private ExampleContainer container; - public TestCaseReplaySettingsOverlay() { - Add(new ReplaySettingsOverlay() + ExampleContainer container; + + Add(new ReplaySettingsOverlay { Anchor = Anchor.TopRight, Origin = Anchor.TopRight, diff --git a/osu.Desktop.VisualTests/Tests/TestCaseScrollingHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseScrollingHitObjects.cs index 3206b6fb88..9f439fe193 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseScrollingHitObjects.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseScrollingHitObjects.cs @@ -21,15 +21,16 @@ namespace osu.Desktop.VisualTests.Tests { public override string Description => "SpeedAdjustmentContainer/DrawableTimingSection"; - private SpeedAdjustmentCollection adjustmentCollection; - - private BindableDouble timeRangeBindable; - private OsuSpriteText timeRangeText; - private OsuSpriteText bottomLabel; - private SpriteText topTime, bottomTime; + private readonly BindableDouble timeRangeBindable; + private readonly OsuSpriteText bottomLabel; + private readonly SpriteText topTime; + private readonly SpriteText bottomTime; public TestCaseScrollingHitObjects() { + OsuSpriteText timeRangeText; + SpeedAdjustmentCollection adjustmentCollection; + timeRangeBindable = new BindableDouble(2000) { MinValue = 200, diff --git a/osu.Desktop.VisualTests/Tests/TestCaseSettings.cs b/osu.Desktop.VisualTests/Tests/TestCaseSettings.cs index 2b2511c79b..3d21f0e3b1 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseSettings.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseSettings.cs @@ -10,7 +10,7 @@ namespace osu.Desktop.VisualTests.Tests { public override string Description => @"Tests the settings overlay"; - private SettingsOverlay settings; + private readonly SettingsOverlay settings; public TestCaseSettings() { diff --git a/osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs b/osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs index 610fe947dc..3368224be1 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs @@ -15,10 +15,10 @@ namespace osu.Desktop.VisualTests.Tests { public override string Description => @"With fake data"; - private SongProgress progress; - private SongProgressGraph graph; + private readonly SongProgress progress; + private readonly SongProgressGraph graph; - private StopwatchClock clock; + private readonly StopwatchClock clock; public TestCaseSongProgress() { diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs b/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs index 8543f727dd..00929c06c2 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs @@ -26,8 +26,8 @@ namespace osu.Desktop.VisualTests.Tests protected override double TimePerAction => default_duration * 2; private readonly Random rng = new Random(1337); - private TaikoPlayfield playfield; - private Container playfieldContainer; + private readonly TaikoPlayfield playfield; + private readonly Container playfieldContainer; public TestCaseTaikoPlayfield() {