Skip to content

Commit ab7f4d4

Browse files
rohitkaradkarpocmo
authored andcommitted
Closes mozilla-mobile#1105: Remove unnecessary non-null assertions in glean tests
1 parent 312854a commit ab7f4d4

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

components/service/glean/src/test/java/mozilla/components/service/glean/storages/EventsStorageEngineTest.kt

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ class EventsStorageEngineTest {
3535
for (storeName in storeNames) {
3636
val snapshot = EventsStorageEngine.getSnapshot(storeName = storeName, clearStore = false)
3737
assertEquals(1, snapshot!!.size)
38-
assertEquals("telemetry", snapshot!!.first().category)
39-
assertEquals("test_event_no_optional", snapshot!!.first().name)
40-
assertEquals("test_event_object", snapshot!!.first().objectId)
38+
assertEquals("telemetry", snapshot.first().category)
39+
assertEquals("test_event_no_optional", snapshot.first().name)
40+
assertEquals("test_event_object", snapshot.first().objectId)
4141
assertNull("The 'value' must be null if not provided",
42-
snapshot!!.first().value)
42+
snapshot.first().value)
4343
assertNull("The 'extra' must be null if not provided",
44-
snapshot!!.first().extra)
44+
snapshot.first().extra)
4545
}
4646
}
4747

@@ -63,11 +63,11 @@ class EventsStorageEngineTest {
6363
for (storeName in storeNames) {
6464
val snapshot = EventsStorageEngine.getSnapshot(storeName = storeName, clearStore = false)
6565
assertEquals(1, snapshot!!.size)
66-
assertEquals("telemetry", snapshot!!.first().category)
67-
assertEquals("test_event_with_optional", snapshot!!.first().name)
68-
assertEquals("test_event_object", snapshot!!.first().objectId)
69-
assertEquals("user_value", snapshot!!.first().value)
70-
assertEquals(mapOf("key1" to "value1", "key2" to "value2"), snapshot!!.first().extra)
66+
assertEquals("telemetry", snapshot.first().category)
67+
assertEquals("test_event_with_optional", snapshot.first().name)
68+
assertEquals("test_event_object", snapshot.first().objectId)
69+
assertEquals("user_value", snapshot.first().value)
70+
assertEquals(mapOf("key1" to "value1", "key2" to "value2"), snapshot.first().extra)
7171
}
7272
}
7373

@@ -86,14 +86,14 @@ class EventsStorageEngineTest {
8686

8787
val snapshot = EventsStorageEngine.getSnapshot(storeName = "store1", clearStore = false)
8888
assertEquals(1, snapshot!!.size)
89-
assertEquals("telemetry", snapshot!!.first().category)
90-
assertEquals("test_event_time", snapshot!!.first().name)
91-
assertEquals("test_event_object", snapshot!!.first().objectId)
89+
assertEquals("telemetry", snapshot.first().category)
90+
assertEquals("test_event_time", snapshot.first().name)
91+
assertEquals("test_event_object", snapshot.first().objectId)
9292
assertNull("The 'value' must be null if not provided",
93-
snapshot!!.first().value)
93+
snapshot.first().value)
9494
assertNull("The 'extra' must be null if not provided",
95-
snapshot!!.first().extra)
96-
assertEquals(expectedTimeSinceStart, snapshot!!.first().msSinceStart)
95+
snapshot.first().extra)
96+
assertEquals(expectedTimeSinceStart, snapshot.first().msSinceStart)
9797
}
9898

9999
@Test
@@ -125,13 +125,13 @@ class EventsStorageEngineTest {
125125
val snapshot2 = EventsStorageEngine.getSnapshot(storeName = "store2", clearStore = false)
126126
for (s in listOf(snapshot, snapshot2)) {
127127
assertEquals(1, s!!.size)
128-
assertEquals("telemetry", s!!.first().category)
129-
assertEquals("test_event_clear", s!!.first().name)
130-
assertEquals("test_event_object", s!!.first().objectId)
128+
assertEquals("telemetry", s.first().category)
129+
assertEquals("test_event_clear", s.first().name)
130+
assertEquals("test_event_object", s.first().objectId)
131131
assertNull("The 'value' must be null if not provided",
132-
s!!.first().value)
132+
s.first().value)
133133
assertNull("The 'extra' must be null if not provided",
134-
s!!.first().extra)
134+
s.first().extra)
135135
}
136136
}
137137
}

0 commit comments

Comments
 (0)