From e08c1a39e715f6c1720f197b8804544e925e08d7 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Tue, 19 Jul 2016 17:53:00 +0200
Subject: [PATCH] UnitTests: Clean up line prefixer test

In TDD development is a standard advised that you setup you values in the
block, run what you want to test in the second and assert in third. We
should try to stick it because it makes reading the test easier.

It is advised too put the setup code after the test if possible.

I used const QList<QByteArray> inputChunks = {"hello\n"} instead of
const QList<QByteArray> inputChunks {"hello\n"} because it is always using
the initializer_list constructor.

Change-Id: I1573566efc1327a2d8681e9ae7bd0ad6ee182789
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 tests/unit/unittest/lineprefixertest.cpp | 108 ++++++++++++++---------
 1 file changed, 65 insertions(+), 43 deletions(-)

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<QByteArray> inputChunks)
-{
-    QByteArray actualOutput;
-    ClangBackEnd::LinePrefixer prefixer("PREFIX ");
-    foreach (const QByteArray &chunk, inputChunks)
-        actualOutput += prefixer.prefix(chunk);
-    return actualOutput;
-}
+QByteArray runPrefixer(QList<QByteArray> inputChunks);
 
 TEST(LinePrefixer, OneChunkEndsWithNewline)
 {
-    const QList<QByteArray> inputChunks { "hello\n" };
-    ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)),
-                Utf8String::fromUtf8("PREFIX hello\n"));
+    const QList<QByteArray> inputChunks = {"hello\n"};
+
+    auto text = runPrefixer(inputChunks);
+
+    ASSERT_THAT(text, "PREFIX hello\n");
 }
 
 TEST(LinePrefixer, OneChunkEndsWithoutNewline)
 {
-    const QList<QByteArray> inputChunks { "hello" };
-    ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)),
-                Utf8String::fromUtf8("PREFIX hello"));
+    const QList<QByteArray> inputChunks = {"hello"};
+
+    auto text = runPrefixer(inputChunks);
+
+    ASSERT_THAT(text, "PREFIX hello");
 }
 
 TEST(LinePrefixer, OneChunkStartsWithNewline)
 {
-    const QList<QByteArray> inputChunks { "\nhello" };
-    ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)),
-                Utf8String::fromUtf8("PREFIX \n"
-                                     "PREFIX hello"));
+    const QList<QByteArray> inputChunks = {"\nhello"};
+
+    auto text = runPrefixer(inputChunks);
+
+    ASSERT_THAT(text, "PREFIX \n"
+                      "PREFIX hello");
 }
 
 TEST(LinePrefixer, OneChunkStartsAndEndsWithNewline)
 {
-    const QList<QByteArray> inputChunks { "\nhello\n" };
-    ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)),
-                Utf8String::fromUtf8("PREFIX \n"
-                                     "PREFIX hello\n"));
+    const QList<QByteArray> inputChunks = {"\nhello\n"};
+
+    auto text = runPrefixer(inputChunks);
+
+    ASSERT_THAT(text, "PREFIX \n"
+                      "PREFIX hello\n");
 }
 
 TEST(LinePrefixer, OneChunkEndsWithExtraNewline)
 {
-    const QList<QByteArray> inputChunks { "hello\n\n" };
-    ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)),
-                Utf8String::fromUtf8("PREFIX hello\n"
-                                     "PREFIX \n"));
+    const QList<QByteArray> inputChunks = {"hello\n\n"};
+
+    auto text = runPrefixer(inputChunks);
+
+    ASSERT_THAT(text, "PREFIX hello\n"
+                      "PREFIX \n");
 }
 
 TEST(LinePrefixer, OneChunkEndsWithTwoExtraNewlines)
 {
-    const QList<QByteArray> inputChunks { "hello\n\n\n" };
-    ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)),
-                Utf8String::fromUtf8("PREFIX hello\n"
-                                     "PREFIX \n"
-                                     "PREFIX \n"));
+    const QList<QByteArray> inputChunks = {"hello\n\n\n"};
+
+    auto text = runPrefixer(inputChunks);
+
+    ASSERT_THAT(text, "PREFIX hello\n"
+                      "PREFIX \n"
+                      "PREFIX \n");
 }
 
 TEST(LinePrefixer, ChunkWithoutNewlineAndChunkWithNewline)
 {
-    const QList<QByteArray> inputChunks { "hello", "\n" };
-    ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)),
-                Utf8String::fromUtf8("PREFIX hello\n"));
+    const QList<QByteArray> inputChunks = {"hello", "\n"};
+
+    auto text = runPrefixer(inputChunks);
+
+    ASSERT_THAT(text, "PREFIX hello\n");
 }
 
 TEST(LinePrefixer, ChunkWithoutNewlineAndChunkWithTwoNewlines)
 {
-    const QList<QByteArray> inputChunks { "hello", "\n\n" };
-    ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)),
-                Utf8String::fromUtf8("PREFIX hello\n"
-                                     "PREFIX \n"));
+    const QList<QByteArray> inputChunks = {"hello", "\n\n"};
+
+    auto text = runPrefixer(inputChunks);
+
+    ASSERT_THAT(text, "PREFIX hello\n"
+                      "PREFIX \n");
 }
 
 TEST(LinePrefixer, ChunkWithTwoNewlinesAndChunkWithoutNewline)
 {
-    const QList<QByteArray> inputChunks { "\n\n", "hello" };
-    ASSERT_THAT(Utf8String::fromByteArray(runPrefixer(inputChunks)),
-                Utf8String::fromUtf8("PREFIX \n"
-                                     "PREFIX \n"
-                                     "PREFIX hello"));
+    const QList<QByteArray> inputChunks = {"\n\n", "hello"};
+
+    auto text = runPrefixer(inputChunks);
+
+    ASSERT_THAT(text, "PREFIX \n"
+                      "PREFIX \n"
+                      "PREFIX hello");
+}
+
+QByteArray runPrefixer(QList<QByteArray> inputChunks)
+{
+    QByteArray actualOutput;
+    ClangBackEnd::LinePrefixer prefixer("PREFIX ");
+
+    for (const auto &chunk : inputChunks)
+        actualOutput += prefixer.prefix(chunk);
+
+    return actualOutput;
 }
 
 } // anonymous namespace