Reduce code duplication

2 files changed, 3 insertions, 6 deletions

diff --git a/test/testutils/syncenginetestutils.cpp b/test/testutils/syncenginetestutils.cpp
index 778516888..04d1f28cb 100644
--- a/test/testutils/syncenginetestutils.cpp
+++ b/test/testutils/syncenginetestutils.cpp
@@ -941,12 +941,8 @@ FakeFolder::FakeFolder(const FileInfo &fileTemplate, OCC::Vfs::Mode vfsMode)
     toDisk(rootDir, fileTemplate);
 
     _fakeAm = new FakeAM(fileTemplate);
-    _account = OCC::Account::create();
-    _account->setUrl(QUrl(QStringLiteral("http://admin:admin@localhost/owncloud")));
+    _account = OCC::TestUtils::createDummyAccount();
     _account->setCredentials(new FakeCredentials { _fakeAm });
-    _account->setDavDisplayName(QStringLiteral("fakename"));
-    _account->setServerInfo(QStringLiteral("10.0.0"), QStringLiteral("FakeServer"));
-    _account->setCapabilities(OCC::TestUtils::testCapabilities());
 
     _journalDb.reset(new OCC::SyncJournalDb(localPath() + QStringLiteral(".sync_test.db")));
     // TODO: davUrl
diff --git a/test/testutils/testutils.cpp b/test/testutils/testutils.cpp
index 93b5a72e7..5a2493f59 100644
--- a/test/testutils/testutils.cpp
+++ b/test/testutils/testutils.cpp
@@ -31,8 +31,9 @@ namespace TestUtils {
         HttpCredentialsTest *cred = new HttpCredentialsTest("testuser", "secret");
         acc->setCredentials(cred);
         acc->setUrl(QUrl(QStringLiteral("http://localhost/owncloud")));
-        acc->setDavDisplayName(QStringLiteral("fakename") + acc->uuid().toString());
+        acc->setDavDisplayName(QStringLiteral("fakename") + acc->uuid().toString(QUuid::WithoutBraces));
         acc->setServerInfo(QStringLiteral("10.0.0"), QStringLiteral("FakeServer"));
+        acc->setCapabilities(OCC::TestUtils::testCapabilities());
         OCC::AccountManager::instance()->addAccount(acc);
         return acc;
     }