Move writeRandomFile to test utils

7 files changed, 45 insertions, 41 deletions

diff --git a/src/common/utility.cpp b/src/common/utility.cpp
index 42e03a03c..8404b92f1 100644
--- a/src/common/utility.cpp
+++ b/src/common/utility.cpp
@@ -52,32 +52,6 @@ namespace OCC {
 
 Q_LOGGING_CATEGORY(lcUtility, "sync.utility")
 
-bool Utility::writeRandomFile(const QString &fname, int size)
-{
-    auto rg = QRandomGenerator::global();
-
-    const int maxSize = 10 * 10 * 1024;
-    if (size == -1) {
-        size = static_cast<int>(rg->generate() % maxSize);
-    }
-
-    QString randString;
-    for (int i = 0; i < size; i++) {
-        int r = static_cast<int>(rg->generate() % 128);
-        randString.append(QChar(r));
-    }
-
-    QFile file(fname);
-    if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        QTextStream out(&file);
-        out << randString;
-        // optional, as QFile destructor will already do it:
-        file.close();
-        return true;
-    }
-    return false;
-}
-
 QString Utility::formatFingerprint(const QByteArray &fmhash, bool colonSeparated)
 {
     QByteArray hash;
diff --git a/src/common/utility.h b/src/common/utility.h
index bc0f07258..d39e960a3 100644
--- a/src/common/utility.h
+++ b/src/common/utility.h
@@ -54,7 +54,6 @@ OCSYNC_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcUtility)
     OCSYNC_EXPORT void usleep(int usec);
     OCSYNC_EXPORT QString formatFingerprint(const QByteArray &, bool colonSeparated = true);
     OCSYNC_EXPORT void setupFavLink(const QString &folder);
-    OCSYNC_EXPORT bool writeRandomFile(const QString &fname, int size = -1);
     OCSYNC_EXPORT QString octetsToString(qint64 octets);
     OCSYNC_EXPORT QByteArray userAgentString();
     /**
diff --git a/test/testchecksumvalidator.cpp b/test/testchecksumvalidator.cpp
index ae8fe131e..72e7e9dff 100644
--- a/test/testchecksumvalidator.cpp
+++ b/test/testchecksumvalidator.cpp
@@ -10,10 +10,11 @@
 #include <QString>
 
 #include "common/checksums.h"
-#include "networkjobs.h"
 #include "common/utility.h"
 #include "filesystem.h"
+#include "networkjobs.h"
 #include "propagatorjobs.h"
+#include "testutils/testutils.h"
 
 using namespace OCC;
 using namespace OCC::Utility;
@@ -68,13 +69,13 @@ using namespace OCC::Utility;
 
     void initTestCase() {
         _testfile = _root.path()+"/csFile";
-        Utility::writeRandomFile( _testfile);
+        TestUtils::writeRandomFile(_testfile);
     }
 
     void testMd5Calc()
     {
         QString file( _root.path() + "/file_a.bin");
-        QVERIFY(writeRandomFile(file));
+        QVERIFY(TestUtils::writeRandomFile(file));
         QFileInfo fi(file);
         QVERIFY(fi.exists());
 
@@ -94,7 +95,7 @@ using namespace OCC::Utility;
     void testSha1Calc()
     {
         QString file( _root.path() + "/file_b.bin");
-        writeRandomFile(file);
+        TestUtils::writeRandomFile(file);
         QFileInfo fi(file);
         QVERIFY(fi.exists());
 
diff --git a/test/testfolderwatcher.cpp b/test/testfolderwatcher.cpp
index b913cf064..889b5b2af 100644
--- a/test/testfolderwatcher.cpp
+++ b/test/testfolderwatcher.cpp
@@ -7,13 +7,14 @@
 
 #include <QtTest>
 
-#include "folderwatcher.h"
 #include "common/utility.h"
+#include "folderwatcher.h"
+#include "testutils/testutils.h"
 
 void touch(const QString &file)
 {
 #ifdef Q_OS_WIN
-    OCC::Utility::writeRandomFile(file);
+    OCC::TestUtils::writeRandomFile(file);
 #else
     QString cmd;
     cmd = QString("touch %1").arg(file);
@@ -113,10 +114,10 @@ public:
         rootDir.mkpath("a1/b2/c1");
         rootDir.mkpath("a1/b3/c3");
         rootDir.mkpath("a2/b3/c3");
-        Utility::writeRandomFile( _rootPath+"/a1/random.bin");
-        Utility::writeRandomFile( _rootPath+"/a1/b2/todelete.bin");
-        Utility::writeRandomFile( _rootPath+"/a2/renamefile");
-        Utility::writeRandomFile( _rootPath+"/a1/movefile");
+        TestUtils::writeRandomFile(_rootPath + "/a1/random.bin");
+        TestUtils::writeRandomFile(_rootPath + "/a1/b2/todelete.bin");
+        TestUtils::writeRandomFile(_rootPath + "/a2/renamefile");
+        TestUtils::writeRandomFile(_rootPath + "/a1/movefile");
 
         _watcher.reset(new FolderWatcher);
         _watcher->init(_rootPath);
diff --git a/test/testinotifywatcher.cpp b/test/testinotifywatcher.cpp
index 2d8cf937d..ee858c98c 100644
--- a/test/testinotifywatcher.cpp
+++ b/test/testinotifywatcher.cpp
@@ -7,7 +7,8 @@
 #include <QtTest>
 
 #include "folderwatcher_linux.h"
-#include "common/utility.h"
+#include "testutils/testutils.h"
+
 
 using namespace OCC;
 
@@ -44,9 +45,9 @@ private slots:
         QVERIFY( dirs.indexOf(_root + "/a1/b1/c1")>-1);
         QVERIFY( dirs.indexOf(_root + "/a1/b1/c2")>-1);
 
-        QVERIFY(Utility::writeRandomFile(_root+"/a1/rand1.dat"));
-        QVERIFY(Utility::writeRandomFile(_root+"/a1/b1/rand2.dat"));
-        QVERIFY(Utility::writeRandomFile(_root+"/a1/b1/c1/rand3.dat"));
+        QVERIFY(TestUtils::writeRandomFile(_root + "/a1/rand1.dat"));
+        QVERIFY(TestUtils::writeRandomFile(_root + "/a1/b1/rand2.dat"));
+        QVERIFY(TestUtils::writeRandomFile(_root + "/a1/b1/c1/rand3.dat"));
 
         QVERIFY( dirs.indexOf(_root + "/a1/b2")>-1);
         QVERIFY( dirs.indexOf(_root + "/a1/b2/c1")>-1);
diff --git a/test/testutils/testutils.cpp b/test/testutils/testutils.cpp
index 0d2c5d43d..816f96f89 100644
--- a/test/testutils/testutils.cpp
+++ b/test/testutils/testutils.cpp
@@ -4,6 +4,7 @@
 #include "gui/accountmanager.h"
 
 #include <QCoreApplication>
+#include <QRandomGenerator>
 
 namespace {
 class HttpCredentialsTest : public OCC::HttpCredentials
@@ -55,5 +56,31 @@ namespace TestUtils {
         return man;
     }
 
+
+    bool writeRandomFile(const QString &fname, int size)
+    {
+        auto rg = QRandomGenerator::global();
+
+        const int maxSize = 10 * 10 * 1024;
+        if (size == -1) {
+            size = static_cast<int>(rg->generate() % maxSize);
+        }
+
+        QString randString;
+        for (int i = 0; i < size; i++) {
+            int r = static_cast<int>(rg->generate() % 128);
+            randString.append(QChar(r));
+        }
+
+        QFile file(fname);
+        if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+            QTextStream out(&file);
+            out << randString;
+            // optional, as QFile destructor will already do it:
+            file.close();
+            return true;
+        }
+        return false;
+    }
 }
 }
diff --git a/test/testutils/testutils.h b/test/testutils/testutils.h
index c9e8c64e5..a7a2ae2ee 100644
--- a/test/testutils/testutils.h
+++ b/test/testutils/testutils.h
@@ -10,5 +10,6 @@ namespace TestUtils {
     FolderMan *folderMan();
     FolderDefinition createDummyFolderDefinition(const QString &path);
     AccountPtr createDummyAccount();
+    bool writeRandomFile(const QString &fname, int size = -1);
 }
 }