diff options
| -rw-r--r-- | git-access.c | 2 | ||||
| -rw-r--r-- | tests/testgitstorage.cpp | 53 | ||||
| -rw-r--r-- | tests/testgitstorage.h | 1 |
3 files changed, 55 insertions, 1 deletions
diff --git a/git-access.c b/git-access.c index 36309fa42..9c5b703a2 100644 --- a/git-access.c +++ b/git-access.c @@ -45,7 +45,7 @@ git_branch_create(out, repo, branch_name, target, force) #endif -static char *get_local_dir(const char *remote, const char *branch) +char *get_local_dir(const char *remote, const char *branch) { SHA_CTX ctx; unsigned char hash[20]; diff --git a/tests/testgitstorage.cpp b/tests/testgitstorage.cpp index 08dbcaaa0..5bc7924af 100644 --- a/tests/testgitstorage.cpp +++ b/tests/testgitstorage.cpp @@ -96,4 +96,57 @@ void TestGitStorage::testGitStorageCloud() clear_dive_file_data(); } +// this is a local helper function in git-access.c +extern "C" char *get_local_dir(const char *remote, const char *branch); + +void TestGitStorage::testGitStorageCloudOfflineSync() +{ + // make a change to local cache repo (pretending that we did some offline changes) + // and then open the remote one again and check that things were propagated correctly + QString cloudTestRepo("https://cloud.subsurface-divelog.org/git/ssrftest@hohndel.org[ssrftest@hohndel.org]"); + QString localCacheDir(get_local_dir("https://cloud.subsurface-divelog.org/git/ssrftest@hohndel.org", "ssrftest@hohndel.org")); + QString localCacheRepo = localCacheDir + "[ssrftest@hohndel.org]"; + // read the local repo from the previous test and add dive 10 + QCOMPARE(parse_file(qPrintable(localCacheRepo)), 0); + QCOMPARE(parse_file(SUBSURFACE_SOURCE "/dives/test10.xml"), 0); + // calling process_dive() sorts the table, but calling it with + // is_imported == true causes it to try to update the window title... let's not do that + process_dives(false, false); + // now save only to the local cache but not to the remote server + QCOMPARE(save_dives(qPrintable(localCacheRepo)), 0); + QCOMPARE(save_dives("./SampleDivesV3plus10local.ssrf"), 0); + clear_dive_file_data(); + // open the cloud storage and compare + QCOMPARE(parse_file(qPrintable(cloudTestRepo)), 0); + QCOMPARE(save_dives("./SampleDivesV3plus10viacloud.ssrf"), 0); + QFile org("./SampleDivesV3plus10local.ssrf"); + org.open(QFile::ReadOnly); + QFile out("./SampleDivesV3plus10viacloud.ssrf"); + out.open(QFile::ReadOnly); + QTextStream orgS(&org); + QTextStream outS(&out); + QString readin = orgS.readAll(); + QString written = outS.readAll(); + QCOMPARE(readin, written); + // write back out to cloud storage, move away the local cache, open again and compare + QCOMPARE(save_dives(qPrintable(cloudTestRepo)), 0); + clear_dive_file_data(); + QDir localCacheDirectory(localCacheDir); + QDir localCacheDirectorySave(localCacheDir + "save"); + QCOMPARE(localCacheDirectorySave.removeRecursively(), true); + QCOMPARE(localCacheDirectory.rename(localCacheDir, localCacheDir + "save"), true); + QCOMPARE(parse_file(qPrintable(cloudTestRepo)), 0); + QCOMPARE(save_dives("./SampleDivesV3plus10fromcloud.ssrf"), 0); + org.close(); + org.open(QFile::ReadOnly); + QFile out2("./SampleDivesV3plus10fromcloud.ssrf"); + out2.open(QFile::ReadOnly); + QTextStream orgS2(&org); + QTextStream outS2(&out2); + readin = orgS2.readAll(); + written = outS2.readAll(); + QCOMPARE(readin, written); + clear_dive_file_data(); +} + QTEST_MAIN(TestGitStorage) diff --git a/tests/testgitstorage.h b/tests/testgitstorage.h index a701363e9..43c33c228 100644 --- a/tests/testgitstorage.h +++ b/tests/testgitstorage.h @@ -9,6 +9,7 @@ class TestGitStorage : public QObject private slots: void testGitStorageLocal(); void testGitStorageCloud(); + void testGitStorageCloudOfflineSync(); }; #endif // TESTGITSTORAGE_H |