diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-02-27 15:49:14 +0100 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-02-29 17:48:41 +0100 |
| commit | 8a4e87dd0d126afd83650153f0ddb112abf7e4c8 (patch) | |
| tree | 0e7e236512f6cf06af8be98cbc72c86bcdefc986 /src/test | |
| parent | 6c8496f7f8285a7b3fe16d7b20edf41156ac3acb (diff) | |
preferences: Make HotcuePaletteSettings support other palette types, too
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/colorconfig_test.cpp | 10 | ||||
| -rw-r--r-- | src/test/controllerengine_test.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/test/colorconfig_test.cpp b/src/test/colorconfig_test.cpp index 81a5e36fdb..560c0f7b2e 100644 --- a/src/test/colorconfig_test.cpp +++ b/src/test/colorconfig_test.cpp @@ -1,6 +1,6 @@ #include <gtest/gtest.h> -#include "preferences/hotcuecolorpalettesettings.h" +#include "preferences/colorpalettesettings.h" #include "test/mixxxtest.h" #include "util/color/colorpalette.h" #include "util/color/rgbcolor.h" @@ -24,7 +24,7 @@ TEST_F(ColorConfigTest, GetDefaultColorWhenNoStoredColor) { } TEST_F(ColorConfigTest, SaveColorPalette) { - HotcueColorPaletteSettings colorPaletteSettings(config()); + ColorPaletteSettings colorPaletteSettings(config()); ColorPalette originalColorPalette(QList<mixxx::RgbColor>{ mixxx::RgbColor(0x66FF99), mixxx::RgbColor(0xFF9900), @@ -40,7 +40,7 @@ TEST_F(ColorConfigTest, SaveColorPalette) { } TEST_F(ColorConfigTest, ReplaceColorPalette) { - HotcueColorPaletteSettings colorPaletteSettings(config()); + ColorPaletteSettings colorPaletteSettings(config()); ColorPalette colorPalette1(QList<mixxx::RgbColor>{ mixxx::RgbColor(0x66FF99), mixxx::RgbColor(0xFF9900), @@ -62,8 +62,8 @@ TEST_F(ColorConfigTest, ReplaceColorPalette) { } TEST_F(ColorConfigTest, DefaultColorPalette) { - HotcueColorPaletteSettings colorPaletteSettings(config()); + ColorPaletteSettings colorPaletteSettings(config()); ColorPalette colorPaletteFromConfig = colorPaletteSettings.getHotcueColorPalette(); - ASSERT_EQ(ColorPalette::mixxxPalette, colorPaletteFromConfig); + ASSERT_EQ(ColorPalette::mixxxHotcuePalette, colorPaletteFromConfig); } diff --git a/src/test/controllerengine_test.cpp b/src/test/controllerengine_test.cpp index 18976c5f34..b788caac4b 100644 --- a/src/test/controllerengine_test.cpp +++ b/src/test/controllerengine_test.cpp @@ -620,7 +620,7 @@ TEST_F(ControllerEngineTest, connectionExecutesWithCorrectThisObject) { } TEST_F(ControllerEngineTest, colorProxyTestMixxxPalette) { - QList<mixxx::RgbColor> allColors = ColorPalette::mixxxPalette.m_colorList; + QList<mixxx::RgbColor> allColors = ColorPalette::mixxxHotcuePalette.m_colorList; for (int i = 0; i < allColors.length(); ++i) { mixxx::RgbColor color = allColors[i]; qDebug() << "Testing color " << mixxx::RgbColor::toQString(color); |