Skip to content

Commit 2adf852

Browse files
authored
Build: Test Java 15 (#157)
* Test under Java 15 * Fix assertion
1 parent 5171a09 commit 2adf852

File tree

3 files changed

+12
-19
lines changed

3 files changed

+12
-19
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
2121
restore-keys: ${{ runner.os }}-m2
2222
- run: mvn verify
23-
Java-14:
23+
Java-15:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- uses: actions/checkout@v2
2727
- uses: actions/setup-java@v1
2828
with:
29-
java-version: 14
29+
java-version: 15
3030
- uses: actions/cache@v1
3131
with:
3232
path: ~/.m2

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ in different frameworks. You can run these tests using:
66

77
mvn clean install
88

9-
This project is tested under Java 11 and Java 14.
9+
This project is tested under Java 11 and Java 15.
1010

1111
## Module List
1212

oca/src/test/java/io/mincong/ocajp/chapter3/ArrayListTest.java

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
package io.mincong.ocajp.chapter3;
22

3-
import static org.junit.Assert.assertEquals;
4-
import static org.junit.Assert.assertNull;
5-
import static org.junit.Assert.assertSame;
6-
import static org.junit.Assert.assertTrue;
7-
import static org.junit.Assert.fail;
8-
9-
import java.util.ArrayList;
10-
import java.util.Arrays;
11-
import java.util.Collections;
12-
import java.util.List;
3+
import static org.junit.Assert.*;
4+
5+
import java.util.*;
136
import java.util.stream.Collectors;
147
import java.util.stream.Stream;
158
import org.junit.Test;
@@ -77,12 +70,12 @@ public void testAutoboxing() {
7770
weights.add(new Double(60)); // ok
7871

7972
weights.add(null);
80-
try {
81-
double w = weights.get(2); // cannot unwrap
82-
fail();
83-
} catch (NullPointerException e) {
84-
assertNull(e.getMessage());
85-
}
73+
assertThrows(
74+
NullPointerException.class,
75+
() -> {
76+
@SuppressWarnings("unused")
77+
double w = weights.get(2); // cannot unwrap null
78+
});
8679
}
8780

8881
@Test

0 commit comments

Comments
 (0)