Skip to content

Commit 90a2db5

Browse files
committed
wip
1 parent 50bd79e commit 90a2db5

File tree

15 files changed

+813
-156
lines changed

15 files changed

+813
-156
lines changed

gradle/dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ext {
1313
// version which we should use in this build
1414
def mapboxNavigatorVersion = System.getenv("FORCE_MAPBOX_NAVIGATION_NATIVE_VERSION")
1515
if (mapboxNavigatorVersion == null || mapboxNavigatorVersion == '') {
16-
mapboxNavigatorVersion = '133.0.0'
16+
mapboxNavigatorVersion = '134.0.0'
1717
}
1818
println("Navigation Native version: " + mapboxNavigatorVersion)
1919

instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/TelemetryEventsTest.kt

Lines changed: 223 additions & 19 deletions
Large diffs are not rendered by default.

instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/utils/events/domain/EventsDomain.kt

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ internal class EventFeedback(
2727
val feedbackType: String,
2828
val description: String,
2929
val feedbackSubType: Array<String>,
30-
val screenshot: String,
3130
): EventBase(driverMode) {
3231
override val event: String = "navigation.feedback"
3332
}
@@ -70,30 +69,14 @@ internal class EventArrive : EventBaseActiveGuidance() {
7069
override val event: String = "navigation.arrive"
7170
}
7271

73-
/**
74-
* "volumeLevel" -> {Value@20958} "33"
75-
"driverMode" -> {Value@20960} "freeDrive"
76-
"batteryPluggedIn" -> {Value@20962} "false"
77-
"eventVersion" -> {Value@20964} "2.4"
78-
"simulation" -> {Value@20966} "true"
79-
"audioType" -> {Value@20968} "headphones"
80-
"percentTimeInPortrait" -> {Value@20970} "100"
81-
"operatingSystem" -> {Value@20972} "Android 11"
82-
"driverModeId" -> {Value@20974} "6283cc3d-6262-4833-86f5-663581327e2f"
83-
"connectivity" -> {Value@20976} "Unknown"
84-
"driverModeStartTimestamp" -> {Value@20978} "2023-05-17T16:35:26.530Z"
85-
"percentTimeInForeground" -> {Value@20980} "100"
86-
"driverModeStartTimestampMonotime" -> {Value@20982} "526084002909708"
87-
"event" -> {Value@20984} "navigation.freeDrive"
88-
"lat" -> {Value@20986} "38.89514907122847"
89-
"batteryLevel" -> {Value@20988} "100"
90-
"lng" -> {Value@20990} "-77.03195362937024"
91-
"created" -> {Value@20992} "2023-05-17T16:35:33.859Z"
92-
"eventType" -> {Value@20994} "stop"
93-
"version" -> {Value@20996} "2.4"
94-
"sdkIdentifier" -> {Value@20998} "mapbox-navigation-android"
95-
"createdMonotime" -> {Value@21000} "526091271247708"
96-
"locationEngine" -> {Value@21002} "fused"
97-
"screenBrightness" -> {Value@21004} "40"
98-
"device" -> {Value@21006} "generic_x86 (x86; Android SDK built for x86)"
99-
*/
72+
internal class EventCancel : EventBaseActiveGuidance() {
73+
override val event: String = "navigation.cancel"
74+
}
75+
76+
internal class EventAlternativeRoute: EventBaseActiveGuidance() {
77+
override val event: String = "navigation.alternativeRoute"
78+
}
79+
80+
internal class EventReroute: EventBaseActiveGuidance() {
81+
override val event: String = "navigation.reroute"
82+
}

instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/utils/events/verify/EventsVerifyEx.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,13 @@ internal fun EventBase.checkIfSubOf(value: Value): List<String> {
2525

2626
internal fun Collection<EventBase>.verifyEvents(events: List<Value>): List<String> {
2727
if (this.size != events.size) {
28-
return listOf("Events lists must have same sizes: List<EventBase> is ${this.size}, " +
29-
"List<Value> is ${events.size}")
28+
return listOf(
29+
"""---
30+
Events lists must have same sizes: expected List<EventBase> is ${this.size} actual List<Value> is ${events.size}
31+
expected: ${this.joinToString { it.event }}
32+
actual: ${events.joinToString { (it.contents as Map<String, Value>)["event"]?.contents as String }}
33+
---"""
34+
)
3035
}
3136

3237
return this.foldIndexed(mutableListOf<String>()) { index, accumulateList, eventBase ->

0 commit comments

Comments
 (0)