diff --git a/tests/unit/unittest/lineprefixertest.cpp b/tests/unit/unittest/lineprefixertest.cpp index 16f2505b733..473f8fc2102 100644 --- a/tests/unit/unittest/lineprefixertest.cpp +++ b/tests/unit/unittest/lineprefixertest.cpp @@ -32,84 +32,106 @@ namespace { -QByteArray runPrefixer(QList inputChunks) -{ - QByteArray actualOutput; - ClangBackEnd::LinePrefixer prefixer("PREFIX "); - foreach (const QByteArray &chunk, inputChunks) - actualOutput += prefixer.prefix(chunk); - return actualOutput; -} +QByteArray runPrefixer(QList inputChunks); TEST(LinePrefixer, OneChunkEndsWithNewline) { - const QList inputChunks { "hello\n" }; - ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)), - Utf8String::fromUtf8("PREFIX hello\n")); + const QList inputChunks = {"hello\n"}; + + auto text = runPrefixer(inputChunks); + + ASSERT_THAT(text, "PREFIX hello\n"); } TEST(LinePrefixer, OneChunkEndsWithoutNewline) { - const QList inputChunks { "hello" }; - ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)), - Utf8String::fromUtf8("PREFIX hello")); + const QList inputChunks = {"hello"}; + + auto text = runPrefixer(inputChunks); + + ASSERT_THAT(text, "PREFIX hello"); } TEST(LinePrefixer, OneChunkStartsWithNewline) { - const QList inputChunks { "\nhello" }; - ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)), - Utf8String::fromUtf8("PREFIX \n" - "PREFIX hello")); + const QList inputChunks = {"\nhello"}; + + auto text = runPrefixer(inputChunks); + + ASSERT_THAT(text, "PREFIX \n" + "PREFIX hello"); } TEST(LinePrefixer, OneChunkStartsAndEndsWithNewline) { - const QList inputChunks { "\nhello\n" }; - ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)), - Utf8String::fromUtf8("PREFIX \n" - "PREFIX hello\n")); + const QList inputChunks = {"\nhello\n"}; + + auto text = runPrefixer(inputChunks); + + ASSERT_THAT(text, "PREFIX \n" + "PREFIX hello\n"); } TEST(LinePrefixer, OneChunkEndsWithExtraNewline) { - const QList inputChunks { "hello\n\n" }; - ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)), - Utf8String::fromUtf8("PREFIX hello\n" - "PREFIX \n")); + const QList inputChunks = {"hello\n\n"}; + + auto text = runPrefixer(inputChunks); + + ASSERT_THAT(text, "PREFIX hello\n" + "PREFIX \n"); } TEST(LinePrefixer, OneChunkEndsWithTwoExtraNewlines) { - const QList inputChunks { "hello\n\n\n" }; - ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)), - Utf8String::fromUtf8("PREFIX hello\n" - "PREFIX \n" - "PREFIX \n")); + const QList inputChunks = {"hello\n\n\n"}; + + auto text = runPrefixer(inputChunks); + + ASSERT_THAT(text, "PREFIX hello\n" + "PREFIX \n" + "PREFIX \n"); } TEST(LinePrefixer, ChunkWithoutNewlineAndChunkWithNewline) { - const QList inputChunks { "hello", "\n" }; - ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)), - Utf8String::fromUtf8("PREFIX hello\n")); + const QList inputChunks = {"hello", "\n"}; + + auto text = runPrefixer(inputChunks); + + ASSERT_THAT(text, "PREFIX hello\n"); } TEST(LinePrefixer, ChunkWithoutNewlineAndChunkWithTwoNewlines) { - const QList inputChunks { "hello", "\n\n" }; - ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)), - Utf8String::fromUtf8("PREFIX hello\n" - "PREFIX \n")); + const QList inputChunks = {"hello", "\n\n"}; + + auto text = runPrefixer(inputChunks); + + ASSERT_THAT(text, "PREFIX hello\n" + "PREFIX \n"); } TEST(LinePrefixer, ChunkWithTwoNewlinesAndChunkWithoutNewline) { - const QList inputChunks { "\n\n", "hello" }; - ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)), - Utf8String::fromUtf8("PREFIX \n" - "PREFIX \n" - "PREFIX hello")); + const QList inputChunks = {"\n\n", "hello"}; + + auto text = runPrefixer(inputChunks); + + ASSERT_THAT(text, "PREFIX \n" + "PREFIX \n" + "PREFIX hello"); +} + +QByteArray runPrefixer(QList inputChunks) +{ + QByteArray actualOutput; + ClangBackEnd::LinePrefixer prefixer("PREFIX "); + + for (const auto &chunk : inputChunks) + actualOutput += prefixer.prefix(chunk); + + return actualOutput; } } // anonymous namespace