Dirk Hohndel 3fef6ec31d Simple test case for merging dives ... We do some merging in a couple of the other tests as well, but the idea is to have specific test cases that exercise our merge logic. This one starts simple. Merge a dive with some valid info with a second one that has less data filled. And then try it in both possible orders. It shows a few potential problems. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>		2017-02-21 18:22:56 -08:00
..
images	Add a more complex sample dive	2015-06-11 10:31:11 -07:00
Demo_SmartTrak.slg	SmartTrak import - Add example divelog file	2015-11-12 07:39:21 -08:00
Dive_2013-02-02-1614.xml
Example.log
mergedVyperOstc.xml	Add test for merging multiple cylinders	2017-02-09 22:22:12 -08:00
ostc.xml	Add test for merging multiple cylinders	2017-02-09 22:22:12 -08:00
ostc_00087_04-05-2014_043m_032min.dive
ostc_00173_17-08-2013_027m_043min.dive
Poseidon_MkVILog.csv
Poseidon_MkVILog.txt
sac-test.xml
SampleDivesV2.ssrf	Add a more complex sample dive	2015-06-11 10:31:11 -07:00
tank_pressure.xml
Test.csv
test0.xml	Fix Qt date interfaces for times before 1970	2016-04-29 09:07:41 -07:00
test0b.xml
test1.xml
test2.xml
test3.xml
test4.xml
test5.xml
test6.xml
test7.xml
test8.xml
test9.xml
test9a.xml
test10.xml
test11.xml
test12.xml
test13.xml
test14.xml
test15.xml
test16.xml
test17.xml
test18.xml
test19.xml
test20.xml
test21.xml
test22.xml
test23.xml
test24.xml
test25.xml
test26.xml
test27.xml
test28.xml
test29.xml
test30.xml
test31.xml
test32.xml	Add test dive to show erroneous pp graphs	2014-03-15 15:01:08 -07:00
test33.xml
test34.xml
test35.xml
test36.xml
test38.xml
test40-42.xml	TestParse: adjust reference output	2017-02-05 16:12:10 -08:00
test40.xml
test41.csv
test42.xml
test43.xml
test44.xml	Test for basic image handling	2017-02-21 13:14:56 -08:00
test47+48.xml	Simple test case for merging dives	2017-02-21 18:22:56 -08:00
test47.xml	Add missing XML files for TestRenumber	2015-10-06 14:40:33 +01:00
test47b.xml	Add missing XML files for TestRenumber	2015-10-06 14:40:33 +01:00
test47c.xml	Add missing XML files for TestRenumber	2015-10-06 14:40:33 +01:00
test48.xml	Simple test case for merging dives	2017-02-21 18:22:56 -08:00
test50.xml
TestAPDLogViewer.csv
TestComma.csv
TestDiveDivelogsDE.DLD	Add two more versions of this dive from divelogs.de	2013-02-25 22:07:05 -08:00
TestDiveDivelogsDE.udcf
TestDiveDivelogsDE.xml	Adjust expected output for TestParse	2015-10-04 13:53:29 +01:00
TestDiveDivingLog5.08.udcf
TestDiveDivingLog5.08.uddf
TestDiveDivingLog5.08allimperial.xml
TestDiveDivingLog5.08allmetric.xml
TestDiveDivingLog5.08allmetric.zip
TestDiveDM3.SDE
TestDiveDM4.db
TestDiveDM4.xml	TestParse: adjust reference output	2017-02-05 16:12:10 -08:00
TestDiveJDiveLog.jlb
TestDiveSeabearH3_0002SBDT.CSV	Test dives for Seabear new format	2015-07-28 08:46:51 -07:00
TestDiveSeabearH3_0003SBDT.CSV	Test dives for Seabear new format	2015-07-28 08:46:51 -07:00
TestDiveSeabearH3_0004SBDT.CSV	Test dives for Seabear new format	2015-07-28 08:46:51 -07:00
TestDiveSeabearH3_0005SBDT.CSV	Test dives for Seabear new format	2015-07-28 08:46:51 -07:00
TestDiveSeabearHUDC.csv
TestDiveSeabearHUDC.xml	Test dive for Seabear HUDC import comparison	2015-07-27 06:35:10 -07:00
TestDiveSeabearNewFormat.xml	Test case: fix Seabear test data to proper dive length	2015-10-01 07:56:21 -04:00
TestDiveSeabearT1_0001SBDT.CSV	Test dives for Seabear new format	2015-07-28 08:46:51 -07:00
TestDiveSeabearT1_0002SBDT.CSV	Test dives for Seabear new format	2015-07-28 08:46:51 -07:00
TestDiveSeabearT1_0003SBDT.CSV	Test dives for Seabear new format	2015-07-28 08:46:51 -07:00
TestDiveSeabearT1_0004SBDT.CSV	Test dives for Seabear new format	2015-07-28 08:46:51 -07:00
TestDiveSeabearT1_0005SBDT.CSV	Test dives for Seabear new format	2015-07-28 08:46:51 -07:00
TestDivingLog4.1.1.sql	Divinglog test dive	2015-07-13 15:21:30 -07:00
TestSensusSingle.csv
TestXP5_de.csv
TwoTimesTwo.ssrf	Add test for dive site duplication bug	2015-08-30 10:32:38 -07:00
vyper.xml	Add test for merging multiple cylinders	2017-02-09 22:22:12 -08:00