feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtSupport: Fix output formatter test

Browse Source 
Broke with 8655603c2e.

Change-Id: I87a366065e5764ecd62d2a2799f408af4341f20b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2023-02-03 12:22:38 +01:00
parent 2d8d27c9ba
commit 383c2205d0
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qtsupport/qtoutputformatter.cpp
View File

@@ -16,6 +16,7 @@
#include <utils/fileinprojectfinder.h> #include <utils/fileinprojectfinder.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/outputformatter.h> #include <utils/outputformatter.h>
#include <utils/stylehelper.h>
#include <utils/theme/theme.h> #include <utils/theme/theme.h>
#include <QPlainTextEdit> #include <QPlainTextEdit>
@@ -412,6 +413,16 @@ static QTextCharFormat blueFormat()
return result; return result;
} }
static QTextCharFormat tweakedBlueFormat()
{
// foreground gets tweaked when passing doAppendMessage()
QTextCharFormat tweakedBlue = blueFormat();
QColor foreground = tweakedBlue.foreground().color();
foreground = StyleHelper::ensureReadableOn(tweakedBlue.background().color(), foreground);
tweakedBlue.setForeground(foreground);
return tweakedBlue;
}
static QTextCharFormat greenFormat() static QTextCharFormat greenFormat()
{ {
QTextCharFormat result; QTextCharFormat result;
@@ -440,12 +451,12 @@ void QtSupportPlugin::testQtOutputFormatter_appendMessage_data()
<< "blue da ba dee" << "blue da ba dee"
<< "blue da ba dee" << "blue da ba dee"
<< blueFormat() << blueFormat()
<< blueFormat(); << tweakedBlueFormat();
QTest::newRow("ANSI color change") QTest::newRow("ANSI color change")
<< "\x1b[38;2;0;0;127mHello" << "\x1b[38;2;0;0;127mHello"
<< "Hello" << "Hello"
<< QTextCharFormat() << QTextCharFormat()
<< blueFormat(); << tweakedBlueFormat();
} }
void QtSupportPlugin::testQtOutputFormatter_appendMessage() void QtSupportPlugin::testQtOutputFormatter_appendMessage()
@@ -500,7 +511,7 @@ void QtSupportPlugin::testQtOutputFormatter_appendMixedAssertAndAnsi()
OutputFormatter::linkFormat(QTextCharFormat(), "file://test.cpp:123")); OutputFormatter::linkFormat(QTextCharFormat(), "file://test.cpp:123"));
edit.moveCursor(QTextCursor::End); edit.moveCursor(QTextCursor::End);
QCOMPARE(edit.currentCharFormat(), blueFormat()); QCOMPARE(edit.currentCharFormat(), tweakedBlueFormat());
} }
} // namespace QtSupport } // namespace QtSupport