diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-08-25 14:22:16 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-08-28 12:46:07 +0000 |
commit | fd3ea87861b281a54c1888a0a044517cf86f9692 (patch) | |
tree | 41b79f1944943165f5fa3632e9850cf5d24f6645 /tests/auto | |
parent | 7b9390bd139c8e6314bcf3167f3d0538b9f7708b (diff) | |
download | qtlocation-fd3ea87861b281a54c1888a0a044517cf86f9692.tar.gz |
Update Error enums for GeoCode & Route model types
1.) Remove not required/duplicated enums
2.) Add docs for new enum values
3.) Sorted the enums by alphabet (except for NoErrror)
4.) Other minor spelling corrections
5.) Update and expand tests
Change-Id: I83bf9e5e40f1237ead45320d020b315b39442946
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/declarative_core/tst_geocoding.qml | 27 | ||||
-rw-r--r-- | tests/auto/declarative_core/tst_routing.qml | 25 |
2 files changed, 27 insertions, 25 deletions
diff --git a/tests/auto/declarative_core/tst_geocoding.qml b/tests/auto/declarative_core/tst_geocoding.qml index 577a9110..984fde65 100644 --- a/tests/auto/declarative_core/tst_geocoding.qml +++ b/tests/auto/declarative_core/tst_geocoding.qml @@ -177,16 +177,24 @@ Item { compare(pluginSpy.count, 2) } // Test that model acts gracefully when plugin is not set or is invalid - // (does not support routing) + // (does not support geocoding) GeocodeModel {id: errorModel; plugin: errorPlugin} + GeocodeModel {id: errorModelNoPlugin} SignalSpy {id: countInvalidSpy; target: errorModel; signalName: "countChanged"} SignalSpy {id: errorSpy; target: errorModel; signalName: "errorChanged"} function test_error_plugin() { - compare(errorModel.error,GeocodeModel.NotSupportedError) + // test plugin not set + compare(errorModelNoPlugin.error,GeocodeModel.NoError) + errorModelNoPlugin.update() + compare(errorModelNoPlugin.error,GeocodeModel.EngineNotSetError) + console.log(errorModelNoPlugin.errorString) + + //plugin set but otherwise not offering anything + compare(errorModel.error,GeocodeModel.EngineNotSetError) compare(errorModel.errorString,"This error was expected. No worries !") errorSpy.clear() errorModel.update() - compare(errorModel.error,GeocodeModel.NotSupportedError) + compare(errorModel.error,GeocodeModel.EngineNotSetError) compare(errorModel.errorString,qsTr("Cannot geocode, geocode manager not set.")) compare(errorSpy.count, 1) errorSpy.clear() @@ -201,19 +209,12 @@ Item { compare(errorSpy.count, 0) errorSpy.clear() errorModel.update() - compare(errorModel.error,GeocodeModel.NotSupportedError) + compare(errorModel.error,GeocodeModel.EngineNotSetError) compare(errorModel.errorString,qsTr("Cannot geocode, geocode manager not set.")) compare(errorSpy.count, 1) errorSpy.clear() - errorModel.get(-1) - compare(errorModel.error,GeocodeModel.UnsupportedOptionError) - compare(errorModel.errorString,qsTr("Index '-1' out of range")) - compare(errorSpy.count, 1) - errorSpy.clear() - errorModel.get(1) - compare(errorModel.error,GeocodeModel.UnsupportedOptionError) - compare(errorModel.errorString,qsTr("Index '1' out of range")) - compare(errorSpy.count, 1) + var location = errorModel.get(-1) + compare(location, null) } } diff --git a/tests/auto/declarative_core/tst_routing.qml b/tests/auto/declarative_core/tst_routing.qml index 96a4a10f..f29c7dd3 100644 --- a/tests/auto/declarative_core/tst_routing.qml +++ b/tests/auto/declarative_core/tst_routing.qml @@ -446,14 +446,22 @@ Item { // Test that model acts gracefully when plugin is not set or is invalid // (does not support routing) RouteModel {id: errorModel; plugin: errorPlugin} + RouteModel {id: errorModelNoPlugin} SignalSpy {id: countInvalidSpy; target: errorModel; signalName: "countChanged"} SignalSpy {id: errorSpy; target: errorModel; signalName: "errorChanged"} function test_error_plugin() { - compare(errorModel.error,RouteModel.NotSupportedError) + // test plugin not set + compare(errorModelNoPlugin.error,RouteModel.NoError) + errorModelNoPlugin.update() + compare(errorModelNoPlugin.error,RouteModel.EngineNotSetError) + console.log(errorModelNoPlugin.errorString) + + //plugin set but otherwise not offering anything + compare(errorModel.error,RouteModel.EngineNotSetError) compare(errorModel.errorString,"This error was expected. No worries !") errorSpy.clear() errorModel.update() - compare(errorModel.error,RouteModel.NotSupportedError) + compare(errorModel.error,RouteModel.EngineNotSetError) compare(errorModel.errorString,qsTr("Cannot route, route manager not set.")) compare(errorSpy.count, 1) errorSpy.clear() @@ -468,19 +476,12 @@ Item { compare(errorSpy.count, 0) errorSpy.clear() errorModel.update() - compare(errorModel.error,RouteModel.NotSupportedError) + compare(errorModel.error,RouteModel.EngineNotSetError) compare(errorModel.errorString,qsTr("Cannot route, route manager not set.")) compare(errorSpy.count, 1) errorSpy.clear() - errorModel.get(-1) - compare(errorModel.error,RouteModel.UnsupportedOptionError) - compare(errorModel.errorString,qsTr("Index '-1' out of range")) - compare(errorSpy.count, 1) - errorSpy.clear() - errorModel.get(1) - compare(errorModel.error,RouteModel.UnsupportedOptionError) - compare(errorModel.errorString,qsTr("Index '1' out of range")) - compare(errorSpy.count, 1) + var data = errorModel.get(-1) + compare(data, null) } } |