Skip to content

Commit 163ba01

Browse files
dconeybedconeybe
committed
new ThrowingRunnable() -> lambda
1 parent 72998ea commit 163ba01

File tree

4 files changed

+15
-124
lines changed

4 files changed

+15
-124
lines changed

‎firebase-firestore/src/test/java/com/google/firebase/firestore/FieldPathTest.java

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static org.junit.Assert.assertThrows;
2020

2121
import org.junit.Test;
22-
import org.junit.function.ThrowingRunnable;
2322
import org.junit.runner.RunWith;
2423
import org.robolectric.RobolectricTestRunner;
2524
import org.robolectric.annotation.Config;
@@ -36,50 +35,22 @@ public void pathWithArray() {
3635

3736
@Test
3837
public void emptyPathIsInvalid() {
39-
assertThrows(
40-
IllegalArgumentException.class,
41-
new ThrowingRunnable() {
42-
@Override
43-
public void run() {
44-
FieldPath.fromDotSeparatedPath("");
45-
}
46-
});
38+
assertThrows(IllegalArgumentException.class, () -> FieldPath.fromDotSeparatedPath(""));
4739
}
4840

4941
@Test
5042
public void emptyFirstSegmentIsInvalid() {
51-
assertThrows(
52-
IllegalArgumentException.class,
53-
new ThrowingRunnable() {
54-
@Override
55-
public void run() {
56-
FieldPath.fromDotSeparatedPath(".a");
57-
}
58-
});
43+
assertThrows(IllegalArgumentException.class, () -> FieldPath.fromDotSeparatedPath(".a"));
5944
}
6045

6146
@Test
6247
public void emptyLastSegmentIsInvalid() {
63-
assertThrows(
64-
IllegalArgumentException.class,
65-
new ThrowingRunnable() {
66-
@Override
67-
public void run() {
68-
FieldPath.fromDotSeparatedPath("a.");
69-
}
70-
});
48+
assertThrows(IllegalArgumentException.class, () -> FieldPath.fromDotSeparatedPath("a."));
7149
}
7250

7351
@Test
7452
public void emptyMiddleSegmentIsInvalid() {
75-
assertThrows(
76-
IllegalArgumentException.class,
77-
new ThrowingRunnable() {
78-
@Override
79-
public void run() {
80-
FieldPath.fromDotSeparatedPath("a..b");
81-
}
82-
});
53+
assertThrows(IllegalArgumentException.class, () -> FieldPath.fromDotSeparatedPath("a..b"));
8354
}
8455

8556
@Test

‎firebase-firestore/src/test/java/com/google/firebase/firestore/bundle/BundleReaderTest.java

Lines changed: 6 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import java.util.List;
4040
import org.json.JSONException;
4141
import org.junit.Test;
42-
import org.junit.function.ThrowingRunnable;
4342
import org.junit.runner.RunWith;
4443
import org.robolectric.RobolectricTestRunner;
4544
import org.robolectric.annotation.Config;
@@ -228,14 +227,7 @@ public void testThrowsWithoutLengthPrefix() throws IOException, JSONException {
228227
BundleReader bundleReader =
229228
new BundleReader(SERIALIZER, new ByteArrayInputStream(bundle.getBytes(UTF8_CHARSET)));
230229

231-
assertThrows(
232-
IllegalArgumentException.class,
233-
new ThrowingRunnable() {
234-
@Override
235-
public void run() throws Throwable {
236-
bundleReader.getBundleMetadata();
237-
}
238-
});
230+
assertThrows(IllegalArgumentException.class, () -> bundleReader.getBundleMetadata());
239231
}
240232

241233
@Test
@@ -245,14 +237,7 @@ public void testThrowsWithMissingBrackets() throws IOException, JSONException {
245237
BundleReader bundleReader =
246238
new BundleReader(SERIALIZER, new ByteArrayInputStream(bundle.getBytes(UTF8_CHARSET)));
247239

248-
assertThrows(
249-
IllegalArgumentException.class,
250-
new ThrowingRunnable() {
251-
@Override
252-
public void run() throws Throwable {
253-
bundleReader.getBundleMetadata();
254-
}
255-
});
240+
assertThrows(IllegalArgumentException.class, () -> bundleReader.getBundleMetadata());
256241
}
257242

258243
@Test
@@ -262,14 +247,7 @@ public void testThrowsWithInvalidJSON() throws IOException, JSONException {
262247
BundleReader bundleReader =
263248
new BundleReader(SERIALIZER, new ByteArrayInputStream(bundle.getBytes(UTF8_CHARSET)));
264249

265-
assertThrows(
266-
JSONException.class,
267-
new ThrowingRunnable() {
268-
@Override
269-
public void run() throws Throwable {
270-
bundleReader.getBundleMetadata();
271-
}
272-
});
250+
assertThrows(JSONException.class, () -> bundleReader.getBundleMetadata());
273251
}
274252

275253
@Test
@@ -281,14 +259,7 @@ public void testThrowsWhenSecondElementIsMissing() throws IOException, JSONExcep
281259
BundleReader bundleReader =
282260
new BundleReader(SERIALIZER, new ByteArrayInputStream(bundle.getBytes(UTF8_CHARSET)));
283261

284-
assertThrows(
285-
IllegalArgumentException.class,
286-
new ThrowingRunnable() {
287-
@Override
288-
public void run() throws Throwable {
289-
bundleReader.getNextElement();
290-
}
291-
});
262+
assertThrows(IllegalArgumentException.class, () -> bundleReader.getNextElement());
292263
}
293264

294265
@Test
@@ -298,14 +269,7 @@ public void testThrowsWhenBundleDoesNotContainEnoughData() throws IOException, J
298269
BundleReader bundleReader =
299270
new BundleReader(SERIALIZER, new ByteArrayInputStream(bundle.getBytes(UTF8_CHARSET)));
300271

301-
assertThrows(
302-
IllegalArgumentException.class,
303-
new ThrowingRunnable() {
304-
@Override
305-
public void run() throws Throwable {
306-
bundleReader.getBundleMetadata();
307-
}
308-
});
272+
assertThrows(IllegalArgumentException.class, () -> bundleReader.getBundleMetadata());
309273
}
310274

311275
@Test
@@ -324,14 +288,7 @@ public void testWhenFirstElementIsNotBundleMetadata() throws IOException, JSONEx
324288
BundleReader bundleReader =
325289
new BundleReader(SERIALIZER, new ByteArrayInputStream(bundle.getBytes(UTF8_CHARSET)));
326290

327-
assertThrows(
328-
IllegalArgumentException.class,
329-
new ThrowingRunnable() {
330-
@Override
331-
public void run() throws Throwable {
332-
bundleReader.getBundleMetadata();
333-
}
334-
});
291+
assertThrows(IllegalArgumentException.class, () -> bundleReader.getBundleMetadata());
335292
}
336293

337294
@Test

‎firebase-firestore/src/test/java/com/google/firebase/firestore/bundle/BundleSerializerTest.java

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.json.JSONException;
4545
import org.json.JSONObject;
4646
import org.junit.Test;
47-
import org.junit.function.ThrowingRunnable;
4847
import org.junit.runner.RunWith;
4948
import org.robolectric.RobolectricTestRunner;
5049
import org.robolectric.annotation.Config;
@@ -602,56 +601,28 @@ public void testDecodesEndBeforeQuery() throws JSONException {
602601
public void testDoesNotDecodeOffset() throws JSONException {
603602
String json = "{ from: [ { collectionId: 'coll' } ], offset: 5 }";
604603
Query query = TestUtil.query("coll");
605-
assertThrows(
606-
IllegalArgumentException.class,
607-
new ThrowingRunnable() {
608-
@Override
609-
public void run() throws Throwable {
610-
assertDecodesNamedQuery(json, query);
611-
}
612-
});
604+
assertThrows(IllegalArgumentException.class, () -> assertDecodesNamedQuery(json, query));
613605
}
614606

615607
@Test
616608
public void testDoesNotDecodeSelect() throws JSONException {
617609
String json = "{ from: [ { collectionId: 'coll' } ], select: [] }";
618610
Query query = TestUtil.query("coll");
619-
assertThrows(
620-
IllegalArgumentException.class,
621-
new ThrowingRunnable() {
622-
@Override
623-
public void run() throws Throwable {
624-
assertDecodesNamedQuery(json, query);
625-
}
626-
});
611+
assertThrows(IllegalArgumentException.class, () -> assertDecodesNamedQuery(json, query));
627612
}
628613

629614
@Test
630615
public void testDoesNotDecodeMissingCollection() throws JSONException {
631616
String json = "{ from: [ ] }";
632617
Query query = TestUtil.query("coll");
633-
assertThrows(
634-
IllegalArgumentException.class,
635-
new ThrowingRunnable() {
636-
@Override
637-
public void run() throws Throwable {
638-
assertDecodesNamedQuery(json, query);
639-
}
640-
});
618+
assertThrows(IllegalArgumentException.class, () -> assertDecodesNamedQuery(json, query));
641619
}
642620

643621
@Test
644622
public void testDoesNotDecodeMultipleCollections() throws JSONException {
645623
String json = "{ from: [ { collectionId: 'c1' }, { collectionId: 'c2' } ] }";
646624
Query query = TestUtil.query("coll");
647-
assertThrows(
648-
IllegalArgumentException.class,
649-
new ThrowingRunnable() {
650-
@Override
651-
public void run() throws Throwable {
652-
assertDecodesNamedQuery(json, query);
653-
}
654-
});
625+
assertThrows(IllegalArgumentException.class, () -> assertDecodesNamedQuery(json, query));
655626
}
656627

657628
// BundleMetadata tests

‎firebase-firestore/src/test/java/com/google/firebase/firestore/model/DocumentKeyTest.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.Collections;
2424
import java.util.List;
2525
import org.junit.Test;
26-
import org.junit.function.ThrowingRunnable;
2726
import org.junit.runner.RunWith;
2827
import org.robolectric.RobolectricTestRunner;
2928
import org.robolectric.annotation.Config;
@@ -63,13 +62,6 @@ public void testComparison() {
6362
@Test
6463
public void testUnevenNumberOfSegmentsAreRejected() {
6564
List<String> segments = Collections.singletonList("a");
66-
assertThrows(
67-
Throwable.class,
68-
new ThrowingRunnable() {
69-
@Override
70-
public void run() {
71-
DocumentKey.fromSegments(segments);
72-
}
73-
});
65+
assertThrows(Throwable.class, () -> DocumentKey.fromSegments(segments));
7466
}
7567
}

0 commit comments

Comments
 (0)