Clean up tests.

* Delete unused fixtures and empty TearDown/SetUp methods.
* Declare TearDown/SetUp override.
* Use std::make_unique in many places (fixing some leaks and replacing QScopedPointer).

1 files changed, 11 insertions, 23 deletions

diff --git a/src/test/beatgridtest.cpp b/src/test/beatgridtest.cpp
index 86a9104452..9ca5da5b9d 100644
--- a/src/test/beatgridtest.cpp
+++ b/src/test/beatgridtest.cpp
@@ -2,23 +2,11 @@
 #include <QtDebug>
 
 #include "track/beatgrid.h"
+#include "util/memory.h"
 
 namespace {
 
-class BeatGridTest : public testing::Test {
-  protected:
-
-    BeatGridTest() {
-    }
-
-    virtual void SetUp() {
-    }
-
-    virtual void TearDown() {
-    }
-};
-
-TEST_F(BeatGridTest, Scale) {
+TEST(BeatGridTest, Scale) {
     TrackPointer pTrack(Track::newTemporary());
 
     int sampleRate = 44100;
@@ -26,7 +14,7 @@ TEST_F(BeatGridTest, Scale) {
     pTrack->setBpm(bpm);
     pTrack->setSampleRate(sampleRate);
 
-    BeatGrid* pGrid = new BeatGrid(*pTrack, 0);
+    auto pGrid = std::make_unique<BeatGrid>(*pTrack, 0);
     pGrid->setBpm(bpm);
 
     EXPECT_DOUBLE_EQ(bpm, pGrid->getBpm());
@@ -43,7 +31,7 @@ TEST_F(BeatGridTest, Scale) {
     EXPECT_DOUBLE_EQ(bpm / 2, pGrid->getBpm());
 }
 
-TEST_F(BeatGridTest, TestNthBeatWhenOnBeat) {
+TEST(BeatGridTest, TestNthBeatWhenOnBeat) {
     TrackPointer pTrack(Track::newTemporary());
 
     int sampleRate = 44100;
@@ -53,7 +41,7 @@ TEST_F(BeatGridTest, TestNthBeatWhenOnBeat) {
     pTrack->setSampleRate(sampleRate);
     double beatLength = (60.0 * sampleRate / bpm) * kFrameSize;
 
-    BeatGrid* pGrid = new BeatGrid(*pTrack, 0);
+    auto pGrid = std::make_unique<BeatGrid>(*pTrack, 0);
     pGrid->setBpm(bpm);
     // Pretend we're on the 20th beat;
     double position = beatLength * 20;
@@ -79,7 +67,7 @@ TEST_F(BeatGridTest, TestNthBeatWhenOnBeat) {
     EXPECT_EQ(position, pGrid->findPrevBeat(position));
 }
 
-TEST_F(BeatGridTest, TestNthBeatWhenOnBeat_BeforeEpsilon) {
+TEST(BeatGridTest, TestNthBeatWhenOnBeat_BeforeEpsilon) {
     TrackPointer pTrack(Track::newTemporary());
 
     int sampleRate = 44100;
@@ -89,7 +77,7 @@ TEST_F(BeatGridTest, TestNthBeatWhenOnBeat_BeforeEpsilon) {
     pTrack->setSampleRate(sampleRate);
     double beatLength = (60.0 * sampleRate / bpm) * kFrameSize;
 
-    BeatGrid* pGrid = new BeatGrid(*pTrack, 0);
+    auto pGrid = std::make_unique<BeatGrid>(*pTrack, 0);
     pGrid->setBpm(bpm);
 
     // Pretend we're just before the 20th beat.
@@ -117,7 +105,7 @@ TEST_F(BeatGridTest, TestNthBeatWhenOnBeat_BeforeEpsilon) {
     EXPECT_EQ(kClosestBeat, pGrid->findPrevBeat(position));
 }
 
-TEST_F(BeatGridTest, TestNthBeatWhenOnBeat_AfterEpsilon) {
+TEST(BeatGridTest, TestNthBeatWhenOnBeat_AfterEpsilon) {
     TrackPointer pTrack(Track::newTemporary());
 
     int sampleRate = 44100;
@@ -127,7 +115,7 @@ TEST_F(BeatGridTest, TestNthBeatWhenOnBeat_AfterEpsilon) {
     pTrack->setSampleRate(sampleRate);
     double beatLength = (60.0 * sampleRate / bpm) * kFrameSize;
 
-    BeatGrid* pGrid = new BeatGrid(*pTrack, 0);
+    auto pGrid = std::make_unique<BeatGrid>(*pTrack, 0);
     pGrid->setBpm(bpm);
 
     // Pretend we're just before the 20th beat.
@@ -155,7 +143,7 @@ TEST_F(BeatGridTest, TestNthBeatWhenOnBeat_AfterEpsilon) {
     EXPECT_EQ(kClosestBeat, pGrid->findPrevBeat(position));
 }
 
-TEST_F(BeatGridTest, TestNthBeatWhenNotOnBeat) {
+TEST(BeatGridTest, TestNthBeatWhenNotOnBeat) {
     TrackPointer pTrack(Track::newTemporary());
     int sampleRate = 44100;
     double bpm = 60.0;
@@ -164,7 +152,7 @@ TEST_F(BeatGridTest, TestNthBeatWhenNotOnBeat) {
     pTrack->setSampleRate(sampleRate);
     double beatLength = (60.0 * sampleRate / bpm) * kFrameSize;
 
-    BeatGrid* pGrid = new BeatGrid(*pTrack, 0);
+    auto pGrid = std::make_unique<BeatGrid>(*pTrack, 0);
     pGrid->setBpm(bpm);
 
     // Pretend we're half way between the 20th and 21st beat