Skip to content

Commit 8f20021

Browse files
adinauerclaude
adinauer
and
claude
committed
test(sentry): Remove explicit timeouts from reader recovery tests
Remove the explicit JUnit timeout annotations from the new JsonObjectReader and MapObjectReader recovery tests. These tests already fail deterministically and do not need per-test timeouts. Dropping the annotations keeps the new coverage aligned with the rest of the suite and avoids extra noise in the test definitions. Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 558453c commit 8f20021

2 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎sentry/src/test/java/io/sentry/JsonObjectReaderTest.kt‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ class JsonObjectReaderTest {
244244
verify(fixture.logger, never()).log(any(), any(), any<Throwable>())
245245
}
246246

247-
@Test(timeout = 1000L)
247+
@Test
248248
fun `nextListOrNull skips a failing element`() {
249249
val actual =
250250
getValuesReader("[{\"value\": \"fail\"}]")
@@ -253,7 +253,7 @@ class JsonObjectReaderTest {
253253
assertEquals(emptyList(), actual)
254254
}
255255

256-
@Test(timeout = 1000L)
256+
@Test
257257
fun `nextListOrNull skips an unconsumed failing element`() {
258258
var callCount = 0
259259
val deserializer =
@@ -271,7 +271,7 @@ class JsonObjectReaderTest {
271271
assertEquals(listOf("two"), actual)
272272
}
273273

274-
@Test(timeout = 1000L)
274+
@Test
275275
fun `nextListOrNull keeps elements before a failing element`() {
276276
val actual =
277277
getValuesReader("[{\"value\": \"one\"}, {\"value\": \"fail\"}]")
@@ -280,7 +280,7 @@ class JsonObjectReaderTest {
280280
assertEquals(listOf("one"), actual)
281281
}
282282

283-
@Test(timeout = 1000L)
283+
@Test
284284
fun `nextListOrNull keeps elements after a failing element`() {
285285
val actual =
286286
getValuesReader("[{\"value\": \"fail\"}, {\"value\": \"two\"}]")
@@ -289,7 +289,7 @@ class JsonObjectReaderTest {
289289
assertEquals(listOf("two"), actual)
290290
}
291291

292-
@Test(timeout = 1000L)
292+
@Test
293293
fun `nextListOrNull keeps elements after a fully consumed failing element`() {
294294
val actual =
295295
getValuesReader("[{\"value\": \"fail\"}, {\"value\": \"two\"}]")
@@ -298,7 +298,7 @@ class JsonObjectReaderTest {
298298
assertEquals(listOf("two"), actual)
299299
}
300300

301-
@Test(timeout = 1000L)
301+
@Test
302302
fun `nextListOrNull keeps elements after skipValue consumes a failing element`() {
303303
var callCount = 0
304304
val deserializer =
@@ -317,7 +317,7 @@ class JsonObjectReaderTest {
317317
assertEquals(listOf("two"), actual)
318318
}
319319

320-
@Test(timeout = 1000L)
320+
@Test
321321
fun `nextMapOrNull skips a failing value`() {
322322
val actual =
323323
getValuesReader("{\"bad\": {\"value\": \"fail\"}}")
@@ -326,7 +326,7 @@ class JsonObjectReaderTest {
326326
assertEquals(emptyMap(), actual)
327327
}
328328

329-
@Test(timeout = 1000L)
329+
@Test
330330
fun `nextMapOrNull recovers after failed primitive reads`() {
331331
assertNextMapOrNullRecoversAfterFailedPrimitiveRead(
332332
badValue = "true",
@@ -372,7 +372,7 @@ class JsonObjectReaderTest {
372372
)
373373
}
374374

375-
@Test(timeout = 1000L)
375+
@Test
376376
fun `nextMapOrNull keeps values before a failing value`() {
377377
val actual =
378378
getValuesReader("{\"good\": {\"value\": \"one\"}, \"bad\": {\"value\": \"fail\"}}")
@@ -381,7 +381,7 @@ class JsonObjectReaderTest {
381381
assertEquals(mapOf("good" to "one"), actual)
382382
}
383383

384-
@Test(timeout = 1000L)
384+
@Test
385385
fun `nextMapOrNull keeps values after a failing value`() {
386386
val actual =
387387
getValuesReader("{\"bad\": {\"value\": \"fail\"}, \"good\": {\"value\": \"two\"}}")
@@ -390,7 +390,7 @@ class JsonObjectReaderTest {
390390
assertEquals(mapOf("good" to "two"), actual)
391391
}
392392

393-
@Test(timeout = 1000L)
393+
@Test
394394
fun `nextMapOfListOrNull skips a failing value`() {
395395
val actual =
396396
getValuesReader("{\"bad\": {\"value\": \"fail\"}}")
@@ -399,7 +399,7 @@ class JsonObjectReaderTest {
399399
assertEquals(emptyMap(), actual)
400400
}
401401

402-
@Test(timeout = 1000L)
402+
@Test
403403
fun `nextMapOfListOrNull keeps values before a failing value`() {
404404
val actual =
405405
getValuesReader("{\"good\": [{\"value\": \"one\"}], \"bad\": {\"value\": \"fail\"}}")
@@ -408,7 +408,7 @@ class JsonObjectReaderTest {
408408
assertEquals(mapOf("good" to listOf("one")), actual)
409409
}
410410

411-
@Test(timeout = 1000L)
411+
@Test
412412
fun `nextMapOfListOrNull keeps values after a failing value`() {
413413
val actual =
414414
getValuesReader("{\"bad\": {\"value\": \"fail\"}, \"good\": [{\"value\": \"two\"}]}")
@@ -417,7 +417,7 @@ class JsonObjectReaderTest {
417417
assertEquals(mapOf("good" to listOf("two")), actual)
418418
}
419419

420-
@Test(timeout = 1000L)
420+
@Test
421421
fun `nextMapOfListOrNull keeps nested values after skipValue consumes a failing element`() {
422422
var callCount = 0
423423
val deserializer =
@@ -436,7 +436,7 @@ class JsonObjectReaderTest {
436436
assertEquals(mapOf("good" to listOf("two")), actual)
437437
}
438438

439-
@Test(timeout = 1000L)
439+
@Test
440440
fun `nextListOrNull logs and aborts when recovery fails`() {
441441
assertFailsWith<Exception> {
442442
fixture
@@ -452,7 +452,7 @@ class JsonObjectReaderTest {
452452
)
453453
}
454454

455-
@Test(timeout = 1000L)
455+
@Test
456456
fun `nextMapOrNull logs and aborts when recovery fails`() {
457457
assertFailsWith<Exception> {
458458
fixture
@@ -468,7 +468,7 @@ class JsonObjectReaderTest {
468468
)
469469
}
470470

471-
@Test(timeout = 1000L)
471+
@Test
472472
fun `nextMapOfListOrNull logs and aborts when recovery fails`() {
473473
assertFailsWith<Exception> {
474474
fixture
@@ -484,7 +484,7 @@ class JsonObjectReaderTest {
484484
)
485485
}
486486

487-
@Test(timeout = 1000L)
487+
@Test
488488
fun `nextUnknown logs when recovery fails`() {
489489
val unknown = mutableMapOf<String, Any>()
490490
val reader = fixture.getSut("{\"key\": {\"value\": \"fail\"")

‎sentry/src/test/java/io/sentry/util/MapObjectReaderTest.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,15 @@ class MapObjectReaderTest {
174174
reader.endObject()
175175
}
176176

177-
@Test(timeout = 1000L)
177+
@Test
178178
fun `nextListOrNull skips a failing element`() {
179179
val actual =
180180
getValuesReader(listOf("fail")).nextListOrNull(logger, BasicSerializable.Deserializer())
181181

182182
assertEquals(emptyList(), actual)
183183
}
184184

185-
@Test(timeout = 1000L)
185+
@Test
186186
fun `nextListOrNull keeps elements before a failing element`() {
187187
val actual =
188188
getValuesReader(listOf(serializableValue("one"), "fail"))
@@ -191,7 +191,7 @@ class MapObjectReaderTest {
191191
assertEquals(listOf(BasicSerializable("one")), actual)
192192
}
193193

194-
@Test(timeout = 1000L)
194+
@Test
195195
fun `nextListOrNull keeps elements after a failing element`() {
196196
val actual =
197197
getValuesReader(listOf("fail", serializableValue("two")))
@@ -200,7 +200,7 @@ class MapObjectReaderTest {
200200
assertEquals(listOf(BasicSerializable("two")), actual)
201201
}
202202

203-
@Test(timeout = 1000L)
203+
@Test
204204
fun `nextMapOrNull skips a failing value`() {
205205
val actual =
206206
getValuesReader(linkedMapOf("bad" to "fail"))
@@ -209,7 +209,7 @@ class MapObjectReaderTest {
209209
assertEquals(emptyMap(), actual)
210210
}
211211

212-
@Test(timeout = 1000L)
212+
@Test
213213
fun `nextMapOrNull keeps values before a failing value`() {
214214
val actual =
215215
getValuesReader(linkedMapOf("bad" to "fail", "good" to serializableValue("one")))
@@ -218,7 +218,7 @@ class MapObjectReaderTest {
218218
assertEquals(mapOf("good" to BasicSerializable("one")), actual)
219219
}
220220

221-
@Test(timeout = 1000L)
221+
@Test
222222
fun `nextMapOrNull keeps values after a failing value`() {
223223
val actual =
224224
getValuesReader(linkedMapOf("good" to serializableValue("two"), "bad" to "fail"))
@@ -227,7 +227,7 @@ class MapObjectReaderTest {
227227
assertEquals(mapOf("good" to BasicSerializable("two")), actual)
228228
}
229229

230-
@Test(timeout = 1000L)
230+
@Test
231231
fun `nextMapOfListOrNull skips a failing value`() {
232232
val actual =
233233
getValuesReader(linkedMapOf("bad" to serializableValue("fail")))
@@ -236,7 +236,7 @@ class MapObjectReaderTest {
236236
assertEquals(emptyMap(), actual)
237237
}
238238

239-
@Test(timeout = 1000L)
239+
@Test
240240
fun `nextMapOfListOrNull keeps values before a failing value`() {
241241
val actual =
242242
getValuesReader(
@@ -250,7 +250,7 @@ class MapObjectReaderTest {
250250
assertEquals(mapOf("good" to listOf(BasicSerializable("one"))), actual)
251251
}
252252

253-
@Test(timeout = 1000L)
253+
@Test
254254
fun `nextMapOfListOrNull keeps values after a failing value`() {
255255
val actual =
256256
getValuesReader(
@@ -264,7 +264,7 @@ class MapObjectReaderTest {
264264
assertEquals(mapOf("good" to listOf(BasicSerializable("two"))), actual)
265265
}
266266

267-
@Test(timeout = 1000L)
267+
@Test
268268
fun `nextListOrNull keeps elements after a partially consumed failing element`() {
269269
val actual =
270270
getValuesReader(
@@ -275,7 +275,7 @@ class MapObjectReaderTest {
275275
assertEquals(listOf(BasicSerializable("two")), actual)
276276
}
277277

278-
@Test(timeout = 1000L)
278+
@Test
279279
fun `nextMapOrNull keeps values after a partially consumed failing value`() {
280280
val actual =
281281
getValuesReader(
@@ -289,7 +289,7 @@ class MapObjectReaderTest {
289289
assertEquals(mapOf("good" to BasicSerializable("two")), actual)
290290
}
291291

292-
@Test(timeout = 1000L)
292+
@Test
293293
fun `nextMapOfListOrNull keeps values after a partially consumed failing element`() {
294294
val actual =
295295
getValuesReader(

0 commit comments

Comments
 (0)