From 17526ded58703064dedebdf53669e12f0ab4f43e Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Date: Thu, 23 Apr 2020 23:32:42 +0200
Subject: cleanup: move clearing of device nodes to clear_dive_file_data()

It makes no sense to keep the device nodes if all the other data
is cleared. Let's do this automatically and not explicitly.
This ensures that the function is also called on mobile.
Currently it was only called on desktop.

Weirdly, the parser-tests were expecting that the device nodes
were not reset by clear_dive_file_data() and therefore divecomputers
were accumulating in the test results. Thus, the additional
computers had to be removed from the expected test results.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
---
 dives/DL7.xml                      | 5 -----
 dives/TestDiveDM5.xml              | 1 -
 dives/TestDiveDivelogsDE.xml       | 2 --
 dives/TestDiveSeabearHUDC.xml      | 2 --
 dives/TestDiveSeabearNewFormat.xml | 2 --
 dives/mergedVyperOstc.xml          | 2 --
 6 files changed, 14 deletions(-)

(limited to 'dives')

diff --git a/dives/DL7.xml b/dives/DL7.xml
index 0687afa07..869da0022 100644
--- a/dives/DL7.xml
+++ b/dives/DL7.xml
@@ -1,10 +1,5 @@
 <divelog program='subsurface' version='3'>
 <settings>
-<divecomputerid model='Subsurface Divelog' deviceid='01234567' serial='3' nickname='Heinrichs Weikamp OSTC 3'/>
-<divecomputerid model='Vyper Air' deviceid='013749e4' serial='20400612'/>
-<divecomputerid model='Suunto Vyper Air' deviceid='11223344' serial='99999999'/>
-<divecomputerid model='Heinrichs Weikamp OSTC Sport' deviceid='abcdef00' serial='10000' firmware='10.31'/>
-<divecomputerid model='Vyper Air' deviceid='ffffffff' serial='20400612'/>
 </settings>
 <divesites>
 </divesites>
diff --git a/dives/TestDiveDM5.xml b/dives/TestDiveDM5.xml
index a18f97578..cee358bf2 100644
--- a/dives/TestDiveDM5.xml
+++ b/dives/TestDiveDM5.xml
@@ -1,7 +1,6 @@
 <divelog program='subsurface' version='3'>
 <settings>
 <divecomputerid model='Vyper Air' deviceid='013749e4' serial='20400612'/>
-<divecomputerid model='Vyper Air' deviceid='ffffffff' serial='20400612'/>
 </settings>
 <divesites>
 </divesites>
diff --git a/dives/TestDiveDivelogsDE.xml b/dives/TestDiveDivelogsDE.xml
index fe56f858f..3baac8869 100644
--- a/dives/TestDiveDivelogsDE.xml
+++ b/dives/TestDiveDivelogsDE.xml
@@ -1,7 +1,5 @@
 <divelog program='subsurface' version='3'>
 <settings>
-<divecomputerid model='Vyper Air' deviceid='013749e4' serial='20400612'/>
-<divecomputerid model='Vyper Air' deviceid='ffffffff' serial='20400612'/>
 </settings>
 <divesites>
 <site uuid='64785a00' name='USA, Hoodsport, WA / Sund Rock' gps='47.400269 -123.142632'>
diff --git a/dives/TestDiveSeabearHUDC.xml b/dives/TestDiveSeabearHUDC.xml
index 6c76492e7..0fde14fce 100644
--- a/dives/TestDiveSeabearHUDC.xml
+++ b/dives/TestDiveSeabearHUDC.xml
@@ -1,7 +1,5 @@
 <divelog program='subsurface' version='3'>
 <settings>
-<divecomputerid model='Vyper Air' deviceid='013749e4' serial='20400612'/>
-<divecomputerid model='Vyper Air' deviceid='ffffffff' serial='20400612'/>
 </settings>
 <divesites>
 </divesites>
diff --git a/dives/TestDiveSeabearNewFormat.xml b/dives/TestDiveSeabearNewFormat.xml
index 6c8dd3b66..1647e609d 100644
--- a/dives/TestDiveSeabearNewFormat.xml
+++ b/dives/TestDiveSeabearNewFormat.xml
@@ -1,7 +1,5 @@
 <divelog program='subsurface' version='3'>
 <settings>
-<divecomputerid model='Vyper Air' deviceid='013749e4' serial='20400612'/>
-<divecomputerid model='Vyper Air' deviceid='ffffffff' serial='20400612'/>
 </settings>
 <divesites>
 </divesites>
diff --git a/dives/mergedVyperOstc.xml b/dives/mergedVyperOstc.xml
index d35141a6e..c820fbed7 100644
--- a/dives/mergedVyperOstc.xml
+++ b/dives/mergedVyperOstc.xml
@@ -1,9 +1,7 @@
 <divelog program='subsurface' version='3'>
 <settings>
-<divecomputerid model='Vyper Air' deviceid='013749e4' serial='20400612'/>
 <divecomputerid model='Suunto Vyper Air' deviceid='11223344' serial='99999999'/>
 <divecomputerid model='Heinrichs Weikamp OSTC Sport' deviceid='abcdef00' serial='10000' firmware='10.31'/>
-<divecomputerid model='Vyper Air' deviceid='ffffffff' serial='20400612'/>
 </settings>
 <divesites>
 </divesites>
-- 
cgit v1.2.3-70-g09d2