test: Fixed tests and removed test_log.txt

* Deleted PlainFileLogger
* Fixed clang warnings
This commit is contained in:
Eberhard Graether
2018-01-09 15:53:18 +01:00
parent 63590fc92d
commit c479493e02
13 changed files with 20 additions and 633 deletions
-2
View File
@@ -375,8 +375,6 @@ add_files(
utility/logging/LogManagerImplementation.cpp
utility/logging/LogManagerImplementation.h
utility/logging/LogMessage.h
utility/logging/PlainFileLogger.cpp
utility/logging/PlainFileLogger.h
utility/math/Color.h
utility/math/MatrixBase.h
+1 -1
View File
@@ -17,7 +17,7 @@ void DialogView::hideUnknownProgressDialog()
{
}
void DialogView::showProgressDialog(const std::string& title, const std::string& message, int progress)
void DialogView::showProgressDialog(const std::string& title, const std::string& message, size_t progress)
{
}
+1 -1
View File
@@ -19,7 +19,7 @@ public:
virtual void showUnknownProgressDialog(const std::string& title, const std::string& message);
virtual void hideUnknownProgressDialog();
virtual void showProgressDialog(const std::string& title, const std::string& message, int progress);
virtual void showProgressDialog(const std::string& title, const std::string& message, size_t progress);
virtual void hideProgressDialog();
virtual void startIndexingDialog(
@@ -1,47 +0,0 @@
#include "utility/logging/PlainFileLogger.h"
#include <fstream>
#include <sstream>
PlainFileLogger::PlainFileLogger(std::string filePath)
: Logger("PlainFileLogger")
, m_filePath(filePath)
{
std::ofstream fileStream;
fileStream.open(m_filePath, std::ios::trunc);
fileStream.close();
}
PlainFileLogger::~PlainFileLogger()
{
}
void PlainFileLogger::logString(std::string str)
{
std::ofstream fileStream;
fileStream.open(m_filePath, std::ios::app);
fileStream << str;
fileStream.close();
}
void PlainFileLogger::logInfo(const LogMessage& message)
{
logMessage("INFO", message);
}
void PlainFileLogger::logWarning(const LogMessage& message)
{
logMessage("WARNING", message);
}
void PlainFileLogger::logError(const LogMessage& message)
{
logMessage("ERROR", message);
}
void PlainFileLogger::logMessage(const std::string& type, const LogMessage& message)
{
std::stringstream ss;
ss << message.getFileName() << " " << type << ": " << message.message << std::endl;
logString(ss.str());
}
-27
View File
@@ -1,27 +0,0 @@
#ifndef PLAIN_FILE_LOGGER_H
#define PLAIN_FILE_LOGGER_H
#include <string>
#include "utility/logging/Logger.h"
#include "utility/logging/LogMessage.h"
class PlainFileLogger: public Logger
{
public:
PlainFileLogger(std::string filePath);
virtual ~PlainFileLogger();
void logString(std::string str);
private:
virtual void logInfo(const LogMessage& message);
virtual void logWarning(const LogMessage& message);
virtual void logError(const LogMessage& message);
void logMessage(const std::string& type, const LogMessage& message);
std::string m_filePath;
};
#endif // PLAIN_FILE_LOGGER_H