From b736711a7b80aef6e4f728059b722983ab3a7246 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sun, 18 Nov 2018 18:23:35 -0600 Subject: [PATCH] Renamed sample_compatible to be more descriptive of what it is (an incompatible preset group that forces a reversion to - default - --- src/test/GUI/test_preset_chooser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/GUI/test_preset_chooser.cpp b/src/test/GUI/test_preset_chooser.cpp index 946d14d13..769d946ba 100644 --- a/src/test/GUI/test_preset_chooser.cpp +++ b/src/test/GUI/test_preset_chooser.cpp @@ -41,7 +41,7 @@ std::array sample() { return preset_list; } -std::array sample_compatible() { +std::array default_compatible_reversion() { std::array preset_list; preset_list[get_preset(preset_t::Print)].push_back(Preset(testfile_dir + "test_preset_chooser"s, "print-profile.ini", preset_t::Print)); preset_list[get_preset(preset_t::Print)].push_back(Preset(true, "- default -", preset_t::Print)); @@ -89,7 +89,7 @@ SCENARIO( "PresetChooser changed printer") { GIVEN( "A PresetChooser with printer-profile selected." ) { Settings test_settings; test_settings.default_presets.at(get_preset(preset_t::Printer)).push_back(wxString("printer-profile")); - auto preset_list {sample_compatible()}; + auto preset_list {default_compatible_reversion()}; PresetChooser cut(wxTheApp->GetTopWindow(), fake_print, &test_settings, preset_list); cut.load(); @@ -264,7 +264,7 @@ SCENARIO( "PresetChooser Preset loading" ) { GIVEN( "A PresetChooser object and a Settings indicating that print-profile is the default option." ) { Settings test_settings; test_settings.default_presets.at(get_preset(preset_t::Printer)).push_back(wxString("printer-profile")); - auto preset_list {sample_compatible()}; + auto preset_list {default_compatible_reversion()}; PresetChooser cut(wxTheApp->GetTopWindow(), fake_print, &test_settings, preset_list); WHEN( "load is called with non-default presets and default presets and the material is listed with an incompatible printer" ) { cut.load();