Merge pull request #5480 from owncloud/chunking-ng-cleanup

Chunking ng cleanup

diff --cc src/libsync/propagateuploadng.cpp
Simple merge

diff --cc test/syncenginetestutils.h
index c59495243320a8900f7642f4488f8e4ecc2692ff,a4a12884f034340eeb07e475edef33c44ec2cdd8..0c4bf6caeafd257711efd8b921d9e9c8ffd4e601
--- 1/test/syncenginetestutils.h
--- 2/test/syncenginetestutils.h
+++ b/test/syncenginetestutils.h
@@@ -586,13 -598,12 +598,13 @@@ public
          Q_ASSERT(sourceFolder->isDir);
          int count = 0;
          int size = 0;
-         char payload = '*';
+         char payload = '\0';
  
          do {
 -            if (!sourceFolder->children.contains(QString::number(count)))
 +            QString chunkName = QString::number(count).rightJustified(8, '0');
 +            if (!sourceFolder->children.contains(chunkName))
                  break;
 -            auto &x = sourceFolder->children[QString::number(count)];
 +            auto &x = sourceFolder->children[chunkName];
              Q_ASSERT(!x.isDir);
              Q_ASSERT(x.size > 0); // There should not be empty chunks
              size += x.size;