Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Make mock_network_ a std::unique_ptr and create it in SetUp() instead of SetUpTestCase().

This commit is contained in:
Mattias Andersson 2014-05-30 21:56:33 +02:00
parent 0be0498e94
commit 9a06e7822c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/musicbrainzclient_test.cpp
View File

@ -15,6 +15,8 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>. along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <memory>
#include "core/logging.h" #include "core/logging.h"
#include "musicbrainz/musicbrainzclient.h" #include "musicbrainz/musicbrainzclient.h"
@ -36,12 +38,11 @@ Q_DECLARE_METATYPE(ResultList);
class MusicBrainzClientTest : public ::testing::Test { class MusicBrainzClientTest : public ::testing::Test {
protected: protected:
static void SetUpTestCase() { void SetUp() {
mock_network_ = new MockNetworkAccessManager; mock_network_.reset(new MockNetworkAccessManager);
qRegisterMetaType<ResultList>("MusicBrainzClient::ResultList"); qRegisterMetaType<ResultList>("MusicBrainzClient::ResultList");
} }
static void TearDownTestCase() { delete mock_network_; }
// Reads the data from a file into a QByteArray and returns it. // Reads the data from a file into a QByteArray and returns it.
QByteArray ReadDataFromFile(const QString& filename) { QByteArray ReadDataFromFile(const QString& filename) {
@ -51,10 +52,9 @@ class MusicBrainzClientTest : public ::testing::Test {
return data; return data;
} }
static MockNetworkAccessManager* mock_network_; std::unique_ptr<MockNetworkAccessManager> mock_network_;
}; };
MockNetworkAccessManager* MusicBrainzClientTest::mock_network_;
// Test if a discid that do not exist in the musicbrainz database // Test if a discid that do not exist in the musicbrainz database
// generates an empty result. // generates an empty result.
@ -65,7 +65,7 @@ TEST_F(MusicBrainzClientTest, DiscIdNotFound) {
"http://musicbrainz.org/development/mmd</text></error>"; "http://musicbrainz.org/development/mmd</text></error>";
// Create a MusicBrainzClient instance with mock_network_. // Create a MusicBrainzClient instance with mock_network_.
MusicBrainzClient musicbrainz_client(nullptr, mock_network_); MusicBrainzClient musicbrainz_client(nullptr, mock_network_.get());
// Hook the data as the response to a query of a given type. // Hook the data as the response to a query of a given type.
QMap<QString, QString> params; QMap<QString, QString> params;
@ -112,7 +112,7 @@ TEST_F(MusicBrainzClientTest, ParseDiscID) {
const int expected_number_of_tracks = 6; const int expected_number_of_tracks = 6;
// Create a MusicBrainzClient instance with mock_network_. // Create a MusicBrainzClient instance with mock_network_.
MusicBrainzClient musicbrainz_client(nullptr, mock_network_); MusicBrainzClient musicbrainz_client(nullptr, mock_network_.get());
// Hook the data as the response to a query of a given type. // Hook the data as the response to a query of a given type.
QMap<QString, QString> params; QMap<QString, QString> params;
@ -175,7 +175,7 @@ TEST_F(MusicBrainzClientTest, ParseTrack) {
const QString expected_album = "An Evening at the Operetta"; const QString expected_album = "An Evening at the Operetta";
// Create a MusicBrainzClient instance with mock_network_. // Create a MusicBrainzClient instance with mock_network_.
MusicBrainzClient musicbrainz_client(nullptr, mock_network_); MusicBrainzClient musicbrainz_client(nullptr, mock_network_.get());
// Hook the data as the response to a query of a given type. // Hook the data as the response to a query of a given type.
QMap<QString, QString> params; QMap<QString, QString> params;
@ -218,7 +218,7 @@ TEST_F(MusicBrainzClientTest, ParseTrackWithMultipleReleases) {
const int expected_number_of_releases = 7; const int expected_number_of_releases = 7;
// Create a MusicBrainzClient instance with mock_network_. // Create a MusicBrainzClient instance with mock_network_.
MusicBrainzClient musicbrainz_client(nullptr, mock_network_); MusicBrainzClient musicbrainz_client(nullptr, mock_network_.get());
// Hook the data as the response to a query of a given type. // Hook the data as the response to a query of a given type.
QMap<QString, QString> params; QMap<QString, QString> params;