From 4c0f07c16f650bc0e89030337b80a98e12297f83 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Tue, 1 Jul 2014 00:19:48 +0200 Subject: [PATCH] test: Put test data into TestSuite specific folders --- .../code.cpp} | 2 +- .../header.h} | 0 .../Settings/player.h | 0 .../Settings/sample.cpp | 0 .../{src => FileSystemTestSuite}/Sound.hpp | 0 .../{src => FileSystemTestSuite}/main.cpp | 0 .../{src => FileSystemTestSuite}/tictactoe.h | 0 .../settings.xml} | 0 .../text.txt} | 0 bin/test/data/log/test_log.txt | 12 +++---- src/lib/utility/text/TextAccess.cpp | 10 ++++-- src/test/CxxParserTestSuite.h | 4 +-- src/test/FileSystemTestSuite.h | 31 ++++++++++--------- src/test/ProjectSettingsTestSuite.h | 6 ++-- src/test/TextAccessTestSuite.h | 8 ++--- 15 files changed, 41 insertions(+), 32 deletions(-) rename bin/test/data/{test_code.cpp => CxxParserTestSuite/code.cpp} (94%) rename bin/test/data/{test_header.h => CxxParserTestSuite/header.h} (100%) rename bin/test/data/{src => FileSystemTestSuite}/Settings/player.h (100%) rename bin/test/data/{src => FileSystemTestSuite}/Settings/sample.cpp (100%) rename bin/test/data/{src => FileSystemTestSuite}/Sound.hpp (100%) rename bin/test/data/{src => FileSystemTestSuite}/main.cpp (100%) rename bin/test/data/{src => FileSystemTestSuite}/tictactoe.h (100%) rename bin/test/data/{test_ProjectSettings.xml => ProjectSettingsTestSuite/settings.xml} (100%) rename bin/test/data/{test_text.txt => TextAccessTestSuite/text.txt} (100%) diff --git a/bin/test/data/test_code.cpp b/bin/test/data/CxxParserTestSuite/code.cpp similarity index 94% rename from bin/test/data/test_code.cpp rename to bin/test/data/CxxParserTestSuite/code.cpp index 65cefe91..f19faa31 100644 --- a/bin/test/data/test_code.cpp +++ b/bin/test/data/CxxParserTestSuite/code.cpp @@ -1,4 +1,4 @@ -#include "test_header.h" +#include "header.h" char* name; H g; diff --git a/bin/test/data/test_header.h b/bin/test/data/CxxParserTestSuite/header.h similarity index 100% rename from bin/test/data/test_header.h rename to bin/test/data/CxxParserTestSuite/header.h diff --git a/bin/test/data/src/Settings/player.h b/bin/test/data/FileSystemTestSuite/Settings/player.h similarity index 100% rename from bin/test/data/src/Settings/player.h rename to bin/test/data/FileSystemTestSuite/Settings/player.h diff --git a/bin/test/data/src/Settings/sample.cpp b/bin/test/data/FileSystemTestSuite/Settings/sample.cpp similarity index 100% rename from bin/test/data/src/Settings/sample.cpp rename to bin/test/data/FileSystemTestSuite/Settings/sample.cpp diff --git a/bin/test/data/src/Sound.hpp b/bin/test/data/FileSystemTestSuite/Sound.hpp similarity index 100% rename from bin/test/data/src/Sound.hpp rename to bin/test/data/FileSystemTestSuite/Sound.hpp diff --git a/bin/test/data/src/main.cpp b/bin/test/data/FileSystemTestSuite/main.cpp similarity index 100% rename from bin/test/data/src/main.cpp rename to bin/test/data/FileSystemTestSuite/main.cpp diff --git a/bin/test/data/src/tictactoe.h b/bin/test/data/FileSystemTestSuite/tictactoe.h similarity index 100% rename from bin/test/data/src/tictactoe.h rename to bin/test/data/FileSystemTestSuite/tictactoe.h diff --git a/bin/test/data/test_ProjectSettings.xml b/bin/test/data/ProjectSettingsTestSuite/settings.xml similarity index 100% rename from bin/test/data/test_ProjectSettings.xml rename to bin/test/data/ProjectSettingsTestSuite/settings.xml diff --git a/bin/test/data/test_text.txt b/bin/test/data/TextAccessTestSuite/text.txt similarity index 100% rename from bin/test/data/test_text.txt rename to bin/test/data/TextAccessTestSuite/text.txt diff --git a/bin/test/data/log/test_log.txt b/bin/test/data/log/test_log.txt index 08e554e3..257d6d46 100644 --- a/bin/test/data/log/test_log.txt +++ b/bin/test/data/log/test_log.txt @@ -1,6 +1,6 @@ -Graph.cpp Graph::removeEdge() ERROR: Can't remove member edge, without removing the child node. -TextAccess.cpp TextAccess::checkIndexIntervalInRange() WARNING: Index 'firstLine' has to be lower or equal index 'lastLine', is 2 > 1 -TextAccess.cpp TextAccess::checkIndexInRange() WARNING: Tried to access index 9. Maximum index is 7 -TextAccess.cpp TextAccess::checkIndexInRange() WARNING: Tried to access index 9. Maximum index is 7 -TextAccess.cpp TextAccess::getLine() WARNING: Line numbers start with one, is 0 -TextAccess.cpp TextAccess::getLines() WARNING: Line numbers start with one, is 0 +Graph.cpp removeEdge() ERROR: Can't remove member edge, without removing the child node. +TextAccess.cpp checkIndexIntervalInRange() WARNING: Index 'firstLine' has to be lower or equal index 'lastLine', is 2 > 1 +TextAccess.cpp checkIndexInRange() WARNING: Tried to access index 9. Maximum index is 7 +TextAccess.cpp checkIndexInRange() WARNING: Tried to access index 9. Maximum index is 7 +TextAccess.cpp getLine() WARNING: Line numbers start with one, is 0 +TextAccess.cpp getLines() WARNING: Line numbers start with one, is 0 diff --git a/src/lib/utility/text/TextAccess.cpp b/src/lib/utility/text/TextAccess.cpp index 9a07cb4d..d661a276 100644 --- a/src/lib/utility/text/TextAccess.cpp +++ b/src/lib/utility/text/TextAccess.cpp @@ -40,7 +40,7 @@ std::string TextAccess::getFilePath() const std::string TextAccess::getLine(const unsigned int lineNumber) const { - if(lineNumber < 1) + if (lineNumber < 1) { std::stringstream message; message << "Line numbers start with one, is " << lineNumber; @@ -96,7 +96,7 @@ std::string TextAccess::getText() const { std::string result = ""; - for(unsigned int i = 0; i < m_lines.size(); i++) + for (unsigned int i = 0; i < m_lines.size(); i++) { result += m_lines[i]; } @@ -111,6 +111,12 @@ std::vector TextAccess::readFile(const std::string& filePath) std::ifstream srcFile; srcFile.open(filePath); + if (srcFile.fail()) + { + LOG_ERROR("Could not open file " + filePath); + return result; + } + while (!srcFile.eof()) { std::string line; diff --git a/src/test/CxxParserTestSuite.h b/src/test/CxxParserTestSuite.h index 14b59aaa..56cf66eb 100644 --- a/src/test/CxxParserTestSuite.h +++ b/src/test/CxxParserTestSuite.h @@ -481,8 +481,8 @@ public: CxxParser parser(client); std::vector filePaths; - filePaths.push_back("data/test_header.h"); - filePaths.push_back("data/test_code.cpp"); + filePaths.push_back("data/CxxParserTestSuite/header.h"); + filePaths.push_back("data/CxxParserTestSuite/code.cpp"); parser.parseFiles(filePaths); TS_ASSERT_EQUALS(client->typedefs.size(), 1); diff --git a/src/test/FileSystemTestSuite.h b/src/test/FileSystemTestSuite.h index 125d9c68..06a2b427 100644 --- a/src/test/FileSystemTestSuite.h +++ b/src/test/FileSystemTestSuite.h @@ -14,11 +14,12 @@ public: std::vector extensions; extensions.push_back(".cpp"); - std::vector cppFiles = FileSystem::getSourceFilesFromDirectory("data/src",extensions); + std::vector cppFiles = + FileSystem::getSourceFilesFromDirectory("data/FileSystemTestSuite", extensions); - TS_ASSERT_EQUALS(cppFiles.size(), 2) - TS_ASSERT(isInVector(cppFiles, "data/src/main.cpp")) - TS_ASSERT(isInVector(cppFiles, "data/src/Settings/sample.cpp")) + TS_ASSERT_EQUALS(cppFiles.size(), 2); + TS_ASSERT(isInVector(cppFiles, "data/FileSystemTestSuite/main.cpp")); + TS_ASSERT(isInVector(cppFiles, "data/FileSystemTestSuite/Settings/sample.cpp")); } void test_find_h_files() @@ -26,11 +27,12 @@ public: std::vector extensions; extensions.push_back(".h"); - std::vector headerFiles = FileSystem::getSourceFilesFromDirectory("data/src",extensions); + std::vector headerFiles = + FileSystem::getSourceFilesFromDirectory("data/FileSystemTestSuite", extensions); - TS_ASSERT_EQUALS(headerFiles.size(), 2) - TS_ASSERT(isInVector(headerFiles, "data/src/tictactoe.h")) - TS_ASSERT(isInVector(headerFiles, "data/src/Settings/player.h")) + TS_ASSERT_EQUALS(headerFiles.size(), 2); + TS_ASSERT(isInVector(headerFiles, "data/FileSystemTestSuite/tictactoe.h")); + TS_ASSERT(isInVector(headerFiles, "data/FileSystemTestSuite/Settings/player.h")); } void test_find_all_source_files() @@ -40,21 +42,22 @@ public: extensions.push_back(".hpp"); extensions.push_back(".cpp"); - std::vector sourceFiles = FileSystem::getSourceFilesFromDirectory("data/src",extensions); + std::vector sourceFiles = + FileSystem::getSourceFilesFromDirectory("data/FileSystemTestSuite", extensions); - TS_ASSERT_EQUALS(sourceFiles.size(), 5) + TS_ASSERT_EQUALS(sourceFiles.size(), 5); } void test_filesystem_finds_existing_files() { - TS_ASSERT(FileSystem::exists("data/src")) - TS_ASSERT(FileSystem::exists("data/src/tictactoe.h")); + TS_ASSERT(FileSystem::exists("data/FileSystemTestSuite")); + TS_ASSERT(FileSystem::exists("data/FileSystemTestSuite/tictactoe.h")); } void test_filesystem_does_not_find_non_existing_files() { - TS_ASSERT(!FileSystem::exists("data/foo")); - TS_ASSERT(!FileSystem::exists("data/src/blabla.h")); + TS_ASSERT(!FileSystem::exists("data/FileSystemTestSuite/foo")); + TS_ASSERT(!FileSystem::exists("data/FileSystemTestSuite/blabla.h")); } private: diff --git a/src/test/ProjectSettingsTestSuite.h b/src/test/ProjectSettingsTestSuite.h index 740042cb..b6d9299a 100644 --- a/src/test/ProjectSettingsTestSuite.h +++ b/src/test/ProjectSettingsTestSuite.h @@ -6,13 +6,13 @@ class ProjectSettingsTestSuite : public CxxTest::TestSuite { public: void test_loading_projectSettings_from_file() - { - TS_ASSERT(ProjectSettings::getInstance()->load("data/test_ProjectSettings.xml")); + { + TS_ASSERT(ProjectSettings::getInstance()->load("data/ProjectSettingsTestSuite/settings.xml")); } void test_load_sourcepath_from_file() { - ProjectSettings::getInstance()->load("data/test_ProjectSettings.xml"); + ProjectSettings::getInstance()->load("data/ProjectSettingsTestSuite/settings.xml"); TS_ASSERT_EQUALS(ProjectSettings::getInstance()->getSourcePath(), "data"); } }; diff --git a/src/test/TextAccessTestSuite.h b/src/test/TextAccessTestSuite.h index 3e42e96b..1205f424 100644 --- a/src/test/TextAccessTestSuite.h +++ b/src/test/TextAccessTestSuite.h @@ -90,7 +90,7 @@ public: void test_textAccessFile_constructor() { - std::string filePath = "data/test_text.txt"; + std::string filePath = "data/TextAccessTestSuite/text.txt"; std::shared_ptr textAccess = TextAccess::createFromFile(filePath); @@ -99,7 +99,7 @@ public: void test_textAccessFile_lines_count() { - std::string filePath = "data/test_text.txt"; + std::string filePath = "data/TextAccessTestSuite/text.txt"; unsigned int lineCount = 7; std::shared_ptr textAccess = TextAccess::createFromFile(filePath); @@ -109,7 +109,7 @@ public: void test_textAccessFile_lines_content() { - std::string filePath = "data/test_text.txt"; + std::string filePath = "data/TextAccessTestSuite/text.txt"; std::shared_ptr textAccess = TextAccess::createFromFile(filePath); std::vector lines = textAccess->getLines(1, 4); @@ -123,7 +123,7 @@ public: void test_textAccessFile_get_filePath() { - std::string filePath = "data/test_text.txt"; + std::string filePath = "data/TextAccessTestSuite/text.txt"; std::shared_ptr textAccess = TextAccess::createFromFile(filePath); TS_ASSERT_EQUALS(textAccess->getFilePath(), filePath);