Add assert to ensure we used _remotePath as base

src/libsync/abstractnetworkjob.cpp

@@ -185,11 +185,15 @@ void AbstractNetworkJob::adoptRequest(QNetworkReply *reply)
 
 QUrl AbstractNetworkJob::makeAccountUrl(const QString &relativePath) const
 {
+    // ensure we always used the remote folder
+    OC_ASSERT(relativePath.startsWith(QLatin1Char('/')));
     return Utility::concatUrlPath(_account->url(), relativePath);
 }
 
 QUrl AbstractNetworkJob::makeDavUrl(const QString &relativePath) const
 {
+    // ensure we always used the remote folder
+    OC_ASSERT(relativePath.startsWith(QLatin1Char('/')));
     return Utility::concatUrlPath(_account->davUrl(), relativePath);
 }
 

test/syncenginetestutils.cpp

@@ -263,6 +263,15 @@ QString FileInfo::path() const
     return (parentPath.isEmpty() ? QString() : (parentPath + QLatin1Char('/'))) + name;
 }
 
+QString FileInfo::absolutePath() const
+{
+    if (parentPath.endsWith(QLatin1Char('/'))) {
+        return parentPath + name;
+    } else {
+        return parentPath + QLatin1Char('/') + name;
+    }
+}
+
 void FileInfo::fixupParentPathRecursively()
 {
     auto p = path();
@@ -293,7 +302,7 @@ FakePropfindReply::FakePropfindReply(FileInfo &remoteRootFileInfo, QNetworkAcces
         QMetaObject::invokeMethod(this, "respond404", Qt::QueuedConnection);
         return;
     }
-    QString prefix = request.url().path().left(request.url().path().size() - fileName.size());
+    const QString prefix = request.url().path().left(request.url().path().size() - fileName.size());
 
     // Don't care about the request and just return a full propfind
     const QString davUri { QStringLiteral("DAV:") };
@@ -307,8 +316,8 @@ FakePropfindReply::FakePropfindReply(FileInfo &remoteRootFileInfo, QNetworkAcces
     xml.writeStartElement(davUri, QStringLiteral("multistatus"));
     auto writeFileResponse = [&](const FileInfo &fileInfo) {
         xml.writeStartElement(davUri, QStringLiteral("response"));
-
-        xml.writeTextElement(davUri, QStringLiteral("href"), prefix + QString::fromUtf8(QUrl::toPercentEncoding(fileInfo.path(), "/")));
+        const auto href = OCC::Utility::concatUrlPath(prefix, QString::fromUtf8(QUrl::toPercentEncoding(fileInfo.absolutePath(), "/"))).path();
+        xml.writeTextElement(davUri, QStringLiteral("href"), href);
         xml.writeStartElement(davUri, QStringLiteral("propstat"));
         xml.writeStartElement(davUri, QStringLiteral("prop"));
 
@@ -504,9 +513,11 @@ FakeGetReply::FakeGetReply(FileInfo &remoteRootFileInfo, QNetworkAccessManager::
     QString fileName = getFilePathFromUrl(request.url());
     Q_ASSERT(!fileName.isEmpty());
     fileInfo = remoteRootFileInfo.find(fileName);
-    if (!fileInfo)
-        qWarning() << "Could not find file" << fileName << "on the remote";
-    QMetaObject::invokeMethod(this, "respond", Qt::QueuedConnection);
+    if (!fileInfo) {
+        qDebug() << "meh;";
+    }
+    Q_ASSERT_X(fileInfo, Q_FUNC_INFO, "Could not find file on the remote");
+    QMetaObject::invokeMethod(this, &FakeGetReply::respond, Qt::QueuedConnection);
 }
 
 void FakeGetReply::respond()
@@ -760,7 +771,7 @@ FakeErrorReply::FakeErrorReply(QNetworkAccessManager::Operation op, const QNetwo
     open(QIODevice::ReadOnly);
     setAttribute(QNetworkRequest::HttpStatusCodeAttribute, httpErrorCode);
     setError(InternalServerError, QStringLiteral("Internal Server Fake Error"));
-    QMetaObject::invokeMethod(this, "respond", Qt::QueuedConnection);
+    QMetaObject::invokeMethod(this, &FakeErrorReply::respond, Qt::QueuedConnection);
 }
 
 void FakeErrorReply::respond()

test/syncenginetestutils.h

@@ -142,6 +142,7 @@ class FileInfo : public FileModifier
     }
 
     QString path() const;
+    QString absolutePath() const;
 
     void fixupParentPathRecursively();
 

test/testjobqueue.cpp

@@ -20,7 +20,7 @@ class TestJob : public AbstractNetworkJob
     // AbstractNetworkJob interface
 public:
     TestJob(AccountPtr account)
-        : AbstractNetworkJob(account, QStringLiteral("A/a1"))
+        : AbstractNetworkJob(account, QStringLiteral("/A/a1"))
     {
     }