tests: update qml test cases

use new qml registration

Signed-off-by: Jan Iversen <jani@apache.org>

1 files changed, 39 insertions, 48 deletions

diff --git a/tests/tst_qPrefGeneral.qml b/tests/tst_qPrefGeneral.qml
index 5c1669056..c78ada6e9 100644
--- a/tests/tst_qPrefGeneral.qml
+++ b/tests/tst_qPrefGeneral.qml
@@ -1,70 +1,61 @@
 // SPDX-License-Identifier: GPL-2.0
 import QtQuick 2.6
 import QtTest 1.2
-import org.subsurfacedivelog.mobile 1.0
 
 TestCase {
 	name: "qPrefGeneral"
 
-	SsrfGeneralPrefs {
-		id: tst
-	}
-
-	SsrfPrefs {
-		id: prefs
-	}
-
 	function test_variables() {
-		var x1 = tst.auto_recalculate_thumbnails
-		tst.auto_recalculate_thumbnails = true
-		compare(tst.auto_recalculate_thumbnails, true)
+		var x1 = PrefGeneral.auto_recalculate_thumbnails
+		PrefGeneral.auto_recalculate_thumbnails = true
+		compare(PrefGeneral.auto_recalculate_thumbnails, true)
 
-		var x2 = tst.default_cylinder
-		tst.default_cylinder = "my string"
-		compare(tst.default_cylinder, "my string")
+		var x2 = PrefGeneral.default_cylinder
+		PrefGeneral.default_cylinder = "my string"
+		compare(PrefGeneral.default_cylinder, "my string")
 
-		var x3 = tst.default_filename
-		tst.default_filename = "my string"
-		compare(tst.default_filename, "my string")
+		var x3 = PrefGeneral.default_filename
+		PrefGeneral.default_filename = "my string"
+		compare(PrefGeneral.default_filename, "my string")
 
-//TBD		var x4 = tst.default_file_behavior
-//TBD		tst.default_file_behavior = ??
-//TBD		compare(tst.default_file_behavior, ??)
+//TBD		var x4 = PrefGeneral.default_file_behavior
+//TBD		PrefGeneral.default_file_behavior = ??
+//TBD		compare(PrefGeneral.default_file_behavior, ??)
 
-		var x5 = tst.defaultsetpoint
-		tst.defaultsetpoint = 17
-		compare(tst.defaultsetpoint, 17)
+		var x5 = PrefGeneral.defaultsetpoint
+		PrefGeneral.defaultsetpoint = 17
+		compare(PrefGeneral.defaultsetpoint, 17)
 
-		var x6 = tst.extract_video_thumbnails
-		tst.extract_video_thumbnails = true
-		compare(tst.extract_video_thumbnails, true)
+		var x6 = PrefGeneral.extract_video_thumbnails
+		PrefGeneral.extract_video_thumbnails = true
+		compare(PrefGeneral.extract_video_thumbnails, true)
 
-		var x7 = tst.extract_video_thumbnails_position
-		tst.extract_video_thumbnails_position = 17
-		compare(tst.extract_video_thumbnails_position, 17)
+		var x7 = PrefGeneral.extract_video_thumbnails_position
+		PrefGeneral.extract_video_thumbnails_position = 17
+		compare(PrefGeneral.extract_video_thumbnails_position, 17)
 
-		var x8 = tst.ffmpeg_executable
-		tst.ffmpeg_executable = "my string"
-		compare(tst.ffmpeg_executable, "my string")
+		var x8 = PrefGeneral.ffmpeg_executable
+		PrefGeneral.ffmpeg_executable = "my string"
+		compare(PrefGeneral.ffmpeg_executable, "my string")
 
-		var x9 = tst.o2consumption
-		tst.o2consumption = 17
-		compare(tst.o2consumption, 17)
+		var x9 = PrefGeneral.o2consumption
+		PrefGeneral.o2consumption = 17
+		compare(PrefGeneral.o2consumption, 17)
 
-		var x10 = tst.pscr_ratio
-		tst.pscr_ratio = 17
-		compare(tst.pscr_ratio, 17)
+		var x10 = PrefGeneral.pscr_ratio
+		PrefGeneral.pscr_ratio = 17
+		compare(PrefGeneral.pscr_ratio, 17)
 
-		var x11 = tst.use_default_file
-		tst.use_default_file = true
-		compare(tst.use_default_file, true)
+		var x11 = PrefGeneral.use_default_file
+		PrefGeneral.use_default_file = true
+		compare(PrefGeneral.use_default_file, true)
 
-		var x12 = tst.diveshareExport_uid
-		tst.diveshareExport_uid = "myUid"
-		compare(tst.diveshareExport_uid, "myUid")
+		var x12 = PrefGeneral.diveshareExport_uid
+		PrefGeneral.diveshareExport_uid = "myUid"
+		compare(PrefGeneral.diveshareExport_uid, "myUid")
 
-		var x13 = tst.diveshareExport_private
-		tst.diveshareExport_private = true
-		compare(tst.diveshareExport_private, true)
+		var x13 = PrefGeneral.diveshareExport_private
+		PrefGeneral.diveshareExport_private = true
+		compare(PrefGeneral.diveshareExport_private, true)
 	}
 }