Dirk Hohndel 9f5a944107 Cloud storage: first test case for a very simple merge ... - We add a dive while offline. - On a different computer (here simulated by a different local cache) we add a different file. - Now we go back to the previous local cache (the one where we added a different dive in the first step) and take that online (i.e., connect to cloud storage). Now both of the new dives should have been added to our data file. This is a rather trivial test with no conflict and a straight forward merge. We need to add a lot more test cases to make sure this works as expected and doesn't leave the user with a corrupt state. Ideally whatever happens, the user should never see an error... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>		2015-08-25 10:44:15 -07:00
..
testgitstorage.cpp	Cloud storage: first test case for a very simple merge	2015-08-25 10:44:15 -07:00
testgitstorage.h	Cloud storage: first test case for a very simple merge	2015-08-25 10:44:15 -07:00
testgpscoords.cpp	Add support for more GPS coordinate formats.	2015-02-23 05:37:34 -08:00
testgpscoords.h	Add support for more GPS coordinate formats.	2015-02-23 05:37:34 -08:00
testparse.cpp	Seabear import: fix detection of empty lines	2015-07-28 09:32:53 -07:00
testparse.h	Test case: Seabear new format	2015-07-28 08:47:05 -07:00
testplan.cpp	Fix typo in test and some numbers	2015-07-06 08:56:48 -07:00
testplan.h	Add simple test for the dive planner	2015-07-05 09:42:38 -07:00
testprofile.cpp	Moved code around to make possible to compile the C part alone.	2014-04-17 08:46:29 -07:00
testprofile.h	Moved code around to make possible to compile the C part alone.	2014-04-17 08:46:29 -07:00
testunitconversion.cpp	Moved code around to make possible to compile the C part alone.	2014-04-17 08:46:29 -07:00
testunitconversion.h