From 9373817b38ae92f5aa185059ddd235a57cc39670 Mon Sep 17 00:00:00 2001 From: Oskari Timperi Date: Tue, 10 Dec 2013 18:55:58 +0200 Subject: more tests for Angle and Length models --- tests/tst_AngleModel.qml | 16 ++++++++++++++++ tests/tst_LengthModel.qml | 15 +++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/tests/tst_AngleModel.qml b/tests/tst_AngleModel.qml index 9074906..b947d8c 100644 --- a/tests/tst_AngleModel.qml +++ b/tests/tst_AngleModel.qml @@ -37,4 +37,20 @@ TestCase { var result = model.from(data.from, data.value); compare(result, data.res); } + + function test_combined_data() { + return [ + { from: 'degree', fromval: 5, to: 'gon', toval: (5*Math.PI/180)*200/Math.PI }, + { from: 'gon', fromval: 8, to: 'arcminute', toval: (8*Math.PI/200.0)*10800/Math.PI }, + { from: 'gon', fromval: 8, to: 'arcsecond', toval: (8*Math.PI/200.0)*648000/Math.PI }, + { from: 'arcsecond', fromval: 8, to: 'arcminute', toval: 8.0/60.0 }, + { from: 'arcminute', fromval: 1.0, to: 'arcsecond', toval: 60.0 }, + ]; + } + + function test_combined(data) { + var result = model.from(data.from, data.fromval); + result = model.to(data.to, result); + compare(result, data.toval); + } } diff --git a/tests/tst_LengthModel.qml b/tests/tst_LengthModel.qml index 9f44e9e..51ec705 100644 --- a/tests/tst_LengthModel.qml +++ b/tests/tst_LengthModel.qml @@ -49,4 +49,19 @@ TestCase { var result = model.from(data.from, data.value); compare(result, data.res); } + + function test_combined_data() { + return [ + { from: 'kilometer', fromval: 5, to: 'decimeter', toval: 5*1000*10 }, + { from: 'kilometer', fromval: 1, to: 'foot', toval: 3280.839895 }, + { from: 'kilometer', fromval: 1, to: 'yard', toval: 1093.613298 }, + { from: 'mile', fromval: 1, to: 'yard', toval: 1760 } + ]; + } + + function test_combined(data) { + var result = model.from(data.from, data.fromval); + result = model.to(data.to, result); + compare(result, data.toval); + } } -- cgit v1.2.3