basic tests working

dlidstrom · dlidstrom · commit 2d14e462ad60 · 2020-08-15T02:20:28.000+02:00
- also made line number output 1-based
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ duplo
 build
 .vscode
 out.txt
+out.xml
 files.lst
 CMakeFiles
 CMakeCache.txt
diff --git a/src/Duplo.cpp b/src/Duplo.cpp
@@ -426,7 +426,7 @@ void Duplo::Run(const Options& options) {
             << std::endl;
     } else {
         outfile
-            << "Configuration: "
+            << "Configuration:"
             << std::endl
             << "  Number of files: "
             << files
@@ -444,7 +444,7 @@ void Duplo::Run(const Options& options) {
             << options.GetIgnoreSameFilename()
             << std::endl
             << std::endl
-            << "Results: "
+            << "Results:"
             << std::endl
             << "  Lines of code: "
             << locsTotal
diff --git a/src/FileTypeBase.cpp b/src/FileTypeBase.cpp
@@ -35,7 +35,7 @@ bool FileTypeBase::IsSourceLine(const std::string& line) const {
 std::vector<SourceLine> FileTypeBase::GetCleanedSourceLines(const std::vector<std::string>& lines) const {
     auto lineFilter = CreateLineFilter();
     std::vector<SourceLine> filteredLines;
-    for (std::vector<std::string>::size_type i = 0; i < lines.size(); i++) {
+    for (auto i = 0; i < lines.size(); i++) {
         auto filteredLine = GetCleanLine(lineFilter->ProcessSourceLine(lines[i]));
         if (IsSourceLine(filteredLine)) {
             filteredLines.emplace_back(filteredLine, i);
diff --git a/src/SourceLine.cpp b/src/SourceLine.cpp
@@ -1,8 +1,8 @@
 #include "SourceLine.h"
 #include "HashUtil.h"
 #include "SourceFile.h"
-
-#include <algorithm>
+
+#include <algorithm>
 
 SourceLine::SourceLine(const std::string& line, int lineNumber) {
     m_line = line;
@@ -11,16 +11,16 @@ SourceLine::SourceLine(const std::string& line, int lineNumber) {
     std::string cleanLine;
 
     // Remove all white space and noise (tabs etc)
-    std::copy_if(
-        std::begin(line),
-        std::end(line),
-        std::back_inserter(cleanLine),
+    std::copy_if(
+        std::begin(line),
+        std::end(line),
+        std::back_inserter(cleanLine),
         [](char c) { return c > ' '; });
     m_hash = HashUtil::Hash(cleanLine.c_str(), cleanLine.size());
 }
 
 int SourceLine::GetLineNumber() const {
-    return m_lineNumber;
+    return m_lineNumber + 1;
 }
 
 bool SourceLine::operator==(const SourceLine& other) const {
@@ -30,7 +30,7 @@ bool SourceLine::operator==(const SourceLine& other) const {
 const std::string& SourceLine::GetLine() const {
     return m_line;
 }
-
+
 unsigned long SourceLine::GetHash() const {
     return m_hash;
 }
diff --git a/tests/Simple/test-xml.bats b/tests/Simple/test-xml.bats
@@ -0,0 +1,29 @@
+setup() {
+    run ./build/duplo -xml tests/Simple/LineNumbers.lst out.xml
+}
+
+@test "LineNumbers.c" {
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "Loading and hashing files ... 2 done." ]
+    [ "${lines[1]}" = "tests/Simple/LineNumbers.c found: 1 block(s)" ]
+}
+
+@test "LineNumbers.c out.xml" {
+    run cat out.xml
+    printf 'Lines:\n'
+    printf 'lines %s\n' "${lines[@]}" >&2
+    [ "${lines[0]}" = "<?xml version=\"1.0\"?>" ]
+    [ "${lines[1]}" = "<duplo>" ]
+    [ "${lines[2]}" = "    <set LineCount=\"5\">" ]
+    [ "${lines[3]}" = "        <block SourceFile=\"tests/Simple/LineNumbers.c\" StartLineNumber=\"7\"/>" ]
+    [ "${lines[4]}" = "        <block SourceFile=\"tests/Simple/LineNumbers.c\" StartLineNumber=\"1\"/>" ]
+    [ "${lines[5]}" = "        <lines xml:space=\"preserve\">" ]
+    [ "${lines[6]}" = "            <line Text=\"AAAAA\"/>" ]
+    [ "${lines[7]}" = "            <line Text=\"BBBBB\"/>" ]
+    [ "${lines[8]}" = "            <line Text=\"CCCCC\"/>" ]
+    [ "${lines[9]}" = "            <line Text=\"DDDDD\"/>" ]
+    [ "${lines[10]}" = "            <line Text=\"EEEEE\"/>" ]
+    [ "${lines[11]}" = "        </lines>" ]
+    [ "${lines[12]}" = "    </set>" ]
+    [ "${lines[13]}" = "</duplo>" ]
+}
diff --git a/tests/Simple/tests.bats b/tests/Simple/tests.bats
@@ -1,9 +1,33 @@
+setup() {
+    run ./build/duplo tests/Simple/LineNumbers.lst out.txt
+}
+
 @test "LineNumbers.c" {
-    run ./build/duplo tests/Simple/LineNumbers.lst out.txt && cat out.txt
-    printf 'lines %s\n' "${lines[@]}" >&2
-    echo "status = $status"
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "Loading and hashing files ... 2 done." ]
     [ "${lines[1]}" = "tests/Simple/LineNumbers.c found: 1 block(s)" ]
-    [ "${lines[1]}" = "tests/Simple/LineNumbers.c(6)" ]
+}
+
+@test "LineNumbers.c out.txt" {
+    run cat out.txt
+    printf 'Lines:\n'
+    printf 'lines %s\n' "${lines[@]}" >&2
+    printf 'output %s\n' "${output[@]}" >&2
+    [ "${lines[0]}" = "tests/Simple/LineNumbers.c(7)" ]
+    [ "${lines[1]}" = "tests/Simple/LineNumbers.c(1)" ]
+    [ "${lines[2]}" = "AAAAA" ]
+    [ "${lines[3]}" = "BBBBB" ]
+    [ "${lines[4]}" = "CCCCC" ]
+    [ "${lines[5]}" = "DDDDD" ]
+    [ "${lines[6]}" = "EEEEE" ]
+    [ "${lines[7]}" = "Configuration:" ]
+    [ "${lines[8]}" = "  Number of files: 1" ]
+    [ "${lines[9]}" = "  Minimal block size: 4" ]
+    [ "${lines[10]}" = "  Minimal characters in line: 3" ]
+    [ "${lines[11]}" = "  Ignore preprocessor directives: 0" ]
+    [ "${lines[12]}" = "  Ignore same filenames: 0" ]
+    [ "${lines[13]}" = "Results:" ]
+    [ "${lines[14]}" = "  Lines of code: 11" ]
+    [ "${lines[15]}" = "  Duplicate lines of code: 5" ]
+    [ "${lines[16]}" = "  Total 1 duplicate block(s) found." ]
 }
