From c793f869e56b0636913b77f4645570c822cf916a Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 25 Jul 2016 18:25:13 +0300 Subject: [PATCH] More warnings in AbstractTest::CopyRecursively. Do copy files before all test run. --HG-- branch : develop --- src/test/ValentinaTest/abstracttest.cpp | 5 ++++- src/test/ValentinaTest/tst_tapecommandline.cpp | 4 ++-- src/test/ValentinaTest/tst_tapecommandline.h | 4 ++-- src/test/ValentinaTest/tst_valentinacommandline.cpp | 4 ++-- src/test/ValentinaTest/tst_valentinacommandline.h | 4 ++-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/test/ValentinaTest/abstracttest.cpp b/src/test/ValentinaTest/abstracttest.cpp index aca37f533..c671f4d9f 100644 --- a/src/test/ValentinaTest/abstracttest.cpp +++ b/src/test/ValentinaTest/abstracttest.cpp @@ -140,6 +140,7 @@ bool AbstractTest::CopyRecursively(const QString &srcFilePath, const QString &tg targetDir.cdUp(); if (not targetDir.mkdir(QFileInfo(tgtFilePath).fileName())) { + QWARN("Can't create subdir./n"); return false; } QDir sourceDir(srcFilePath); @@ -154,10 +155,12 @@ bool AbstractTest::CopyRecursively(const QString &srcFilePath, const QString &tg return false; } } - } else + } + else { if (not QFile::copy(srcFilePath, tgtFilePath)) { + QWARN("Can't copy file./n"); return false; } } diff --git a/src/test/ValentinaTest/tst_tapecommandline.cpp b/src/test/ValentinaTest/tst_tapecommandline.cpp index f4842fb39..1e9f7728c 100644 --- a/src/test/ValentinaTest/tst_tapecommandline.cpp +++ b/src/test/ValentinaTest/tst_tapecommandline.cpp @@ -40,7 +40,7 @@ TST_TapeCommandLine::TST_TapeCommandLine(QObject *parent) } //--------------------------------------------------------------------------------------------------------------------- -void TST_TapeCommandLine::init() +void TST_TapeCommandLine::initTestCase() { QDir tmpDir(tmpTestFolder); if (not tmpDir.removeRecursively()) @@ -141,7 +141,7 @@ void TST_TapeCommandLine::OpenMeasurements() } //--------------------------------------------------------------------------------------------------------------------- -void TST_TapeCommandLine::cleanup() +void TST_TapeCommandLine::cleanupTestCase() { QDir tmpDir(tmpTestFolder); if (not tmpDir.removeRecursively()) diff --git a/src/test/ValentinaTest/tst_tapecommandline.h b/src/test/ValentinaTest/tst_tapecommandline.h index 0206497e4..2cc434706 100644 --- a/src/test/ValentinaTest/tst_tapecommandline.h +++ b/src/test/ValentinaTest/tst_tapecommandline.h @@ -38,10 +38,10 @@ public: explicit TST_TapeCommandLine(QObject *parent = nullptr); private slots: - void init(); + void initTestCase(); void OpenMeasurements_data() const; void OpenMeasurements(); - void cleanup(); + void cleanupTestCase(); private: Q_DISABLE_COPY(TST_TapeCommandLine) diff --git a/src/test/ValentinaTest/tst_valentinacommandline.cpp b/src/test/ValentinaTest/tst_valentinacommandline.cpp index b1885dd11..2319118a7 100644 --- a/src/test/ValentinaTest/tst_valentinacommandline.cpp +++ b/src/test/ValentinaTest/tst_valentinacommandline.cpp @@ -41,7 +41,7 @@ TST_ValentinaCommandLine::TST_ValentinaCommandLine(QObject *parent) //--------------------------------------------------------------------------------------------------------------------- // cppcheck-suppress unusedFunction -void TST_ValentinaCommandLine::init() +void TST_ValentinaCommandLine::initTestCase() { {// Test files QDir tmpDir(tmpTestFolder); @@ -308,7 +308,7 @@ void TST_ValentinaCommandLine::TestOpenCollection() //--------------------------------------------------------------------------------------------------------------------- // cppcheck-suppress unusedFunction -void TST_ValentinaCommandLine::cleanup() +void TST_ValentinaCommandLine::cleanupTestCase() { { QDir tmpDir(tmpTestFolder); diff --git a/src/test/ValentinaTest/tst_valentinacommandline.h b/src/test/ValentinaTest/tst_valentinacommandline.h index 92c3db54a..53c0cb034 100644 --- a/src/test/ValentinaTest/tst_valentinacommandline.h +++ b/src/test/ValentinaTest/tst_valentinacommandline.h @@ -38,7 +38,7 @@ public: explicit TST_ValentinaCommandLine(QObject *parent = nullptr); private slots: - void init(); + void initTestCase(); void OpenPatterns_data() const; void OpenPatterns(); void ExportMode_data() const; @@ -47,7 +47,7 @@ private slots: void TestMode(); void TestOpenCollection_data() const; void TestOpenCollection(); - void cleanup(); + void cleanupTestCase(); private: Q_DISABLE_COPY(TST_ValentinaCommandLine)