dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename organise to organize

Browse Source 
Prefer US spelling
This commit is contained in:
Jonas Kvinge
2020-08-04 21:18:14 +02:00
parent badc623a3c
commit 459404e3f0
43 changed files with 812 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/CMakeLists.txt
View File

@@ -163,7 +163,7 @@ add_test_file(src/tagreader_test.cpp false)
add_test_file(src/collectionbackend_test.cpp false)
add_test_file(src/collectionmodel_test.cpp true)
add_test_file(src/songplaylistitem_test.cpp false)
add_test_file(src/organiseformat_test.cpp false)
add_test_file(src/organizeformat_test.cpp false)
add_test_file(src/playlist_test.cpp true)
add_custom_target(run_strawberry_tests COMMAND ${CMAKE_CTEST_COMMAND} -V DEPENDS strawberry_tests)

26
tests/src/organiseformat_test.cpp → tests/src/organizeformat_test.cpp
View File

@@ -22,21 +22,21 @@
#include <gtest/gtest.h>
#include "test_utils.h"
#include "organise/organiseformat.h"
#include "organize/organizeformat.h"
#include "core/timeconstants.h"
#include "core/song.h"
#include "core/logging.h"
#include <QUrl>
class OrganiseFormatTest : public ::testing::Test {
class OrganizeFormatTest : public ::testing::Test {
protected:
OrganiseFormat format_;
OrganizeFormat format_;
Song song_;
};
TEST_F(OrganiseFormatTest, BasicReplace) {
TEST_F(OrganizeFormatTest, BasicReplace) {
song_.set_title("title");
song_.set_album("album");
@@ -64,7 +64,7 @@ TEST_F(OrganiseFormatTest, BasicReplace) {
}
TEST_F(OrganiseFormatTest, Extension) {
TEST_F(OrganizeFormatTest, Extension) {
song_.set_url(QUrl("file:///some/path/filename.flac"));
@@ -74,7 +74,7 @@ TEST_F(OrganiseFormatTest, Extension) {
}
TEST_F(OrganiseFormatTest, ArtistInitial) {
TEST_F(OrganizeFormatTest, ArtistInitial) {
song_.set_artist("bob");
@@ -84,7 +84,7 @@ TEST_F(OrganiseFormatTest, ArtistInitial) {
}
TEST_F(OrganiseFormatTest, AlbumArtistInitial) {
TEST_F(OrganizeFormatTest, AlbumArtistInitial) {
song_.set_albumartist("bob");
@@ -94,14 +94,14 @@ TEST_F(OrganiseFormatTest, AlbumArtistInitial) {
}
TEST_F(OrganiseFormatTest, InvalidTag) {
TEST_F(OrganizeFormatTest, InvalidTag) {
format_.set_format("%invalid");
EXPECT_FALSE(format_.IsValid());
}
TEST_F(OrganiseFormatTest, Blocks) {
TEST_F(OrganizeFormatTest, Blocks) {
format_.set_format("Before{Inside%year}After");
ASSERT_TRUE(format_.IsValid());
@@ -117,7 +117,7 @@ TEST_F(OrganiseFormatTest, Blocks) {
}
TEST_F(OrganiseFormatTest, ReplaceSpaces) {
TEST_F(OrganizeFormatTest, ReplaceSpaces) {
song_.set_title("The Song Title");
format_.set_format("The Format String %title");
@@ -129,7 +129,7 @@ TEST_F(OrganiseFormatTest, ReplaceSpaces) {
}
TEST_F(OrganiseFormatTest, ReplaceNonAscii) {
TEST_F(OrganizeFormatTest, ReplaceNonAscii) {
song_.set_artist(QString::fromUtf8("Röyksopp"));
format_.set_format("%artist");
@@ -145,7 +145,7 @@ TEST_F(OrganiseFormatTest, ReplaceNonAscii) {
}
TEST_F(OrganiseFormatTest, TrackNumberPadding) {
TEST_F(OrganizeFormatTest, TrackNumberPadding) {
format_.set_format("%track");
@@ -164,7 +164,7 @@ TEST_F(OrganiseFormatTest, TrackNumberPadding) {
}
#if 0
TEST_F(OrganiseFormatTest, ReplaceSlashes) {
TEST_F(OrganizeFormatTest, ReplaceSlashes) {
format_.set_format("%title");
song_.set_title("foo/bar\\baz");