napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcalamares: repair test

Browse Source 
The calamaresstyle tool reformatted a bunch of R-strings,
leading to test failures. Mark them with INDENT-OFF so
astyle doesn't break them again.
This commit is contained in:
Adriaan de Groot 2023-09-03 23:14:02 +02:00
parent 30f65a0b62
commit 4b3278058b
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/libcalamares/utils/Tests.cpp
View File

@ -603,26 +603,27 @@ LibCalamaresTests::testStringTruncation()
Logger::setupLogLevel( Logger::LOGDEBUG ); Logger::setupLogLevel( Logger::LOGDEBUG );
using namespace Calamares::String; using namespace Calamares::String;
// *INDENT-OFF*
const QString longString( R"(--- const QString longString( R"(---
--- src/libcalamares/utils/String.h --- src/libcalamares/utils/String.h
+++ src/libcalamares/utils/String.h +++ src/libcalamares/utils/String.h
@@ -62,15 +62,22 @@ DLLEXPORT QString removeDiacritics( const QString& string ); @@ -62,15 +62,22 @@ DLLEXPORT QString removeDiacritics( const QString& string );
*/ */
DLLEXPORT QString obscure( const QString& string ); DLLEXPORT QString obscure( const QString& string );
+/** @brief Parameter for counting lines at beginning and end of string +/** @brief Parameter for counting lines at beginning and end of string
+ * + *
+ * This is used by truncateMultiLine() to indicate how many lines from + * This is used by truncateMultiLine() to indicate how many lines from
+ * the beginning and how many from the end should be kept. + * the beginning and how many from the end should be kept.
+ */ + */
struct LinesStartEnd struct LinesStartEnd
{ {
- int atStart; - int atStart;
- int atEnd; - int atEnd;
+ int atStart = 0; + int atStart = 0;
+ int atEnd = 0; + int atEnd = 0;
)" ); )" );
// *INDENT-ON*
const int sufficientLength = 812; const int sufficientLength = 812;
// There's 18 lines in all // There's 18 lines in all
@ -685,9 +686,13 @@ LibCalamaresTests::testStringTruncationShorter()
using namespace Calamares::String; using namespace Calamares::String;
// *INDENT-OFF*
const QString longString( R"(Some strange string artifacts appeared, leading to `{1?}` being const QString longString( R"(Some strange string artifacts appeared, leading to `{1?}` being
displayed in various user-facing messages. These have been removed displayed in various user-facing messages. These have been removed
and the translations updated.)" ); and the translations updated.)" );
// *INDENT-ON*
const char NEWLINE = '\n'; const char NEWLINE = '\n';
const int insufficientLength = 42; const int insufficientLength = 42;