Skip to content

Commit fea4871

Browse files
authored
Merge pull request #178 from dmlloyd/fix-125
Test on multiple OSes
2 parents 69ddbe6 + d481e4f commit fea4871

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

Diff for: .github/workflows/build.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,17 @@ on:
1111

1212
jobs:
1313
build:
14-
15-
runs-on: ubuntu-latest
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
os: [ ubuntu-latest, macos-latest, windows-latest ]
18+
runs-on: ${{ matrix.os }}
19+
name: Build on ${{ matrix.os }}
1620

1721
steps:
18-
- uses: actions/checkout@v4
22+
- name: Check out project
23+
uses: actions/checkout@v4
24+
1925
- name: Set up JDKs
2026
uses: actions/setup-java@v4
2127
with:
@@ -24,5 +30,6 @@ jobs:
2430
11
2531
17
2632
21
33+
2734
- name: Build with Maven
28-
run: mvn verify -ntp -B -Djava11.home=$JAVA_HOME_11_X64 -Djava17.home=$JAVA_HOME_17_X64
35+
run: mvn verify -ntp -B "-Djava11.home=${{env.JAVA_HOME_11_X64}}${{env.JAVA_HOME_11_ARM64}}" "-Djava17.home=${{env.JAVA_HOME_17_X64}}${{env.JAVA_HOME_17_ARM64}}"

Diff for: src/test/java/org/jboss/threads/QueuelessViewExecutorTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ public void testShutdownNow(ExecutorType executorType) throws InterruptedExcepti
7979
assertThatThrownBy(() -> view.execute(NullRunnable.getInstance()))
8080
.as("Submitting work after invoking shutdown or shutdownNow should fail")
8181
.isInstanceOf(RejectedExecutionException.class);
82-
Awaitility.waitAtMost(500, TimeUnit.MILLISECONDS).untilAsserted(() -> {
82+
Awaitility.waitAtMost(3, TimeUnit.SECONDS).untilAsserted(() -> {
8383
assertThat(interrupted).isTrue();
8484
assertThat(view.isTerminated()).isFalse();
8585
});
8686
interruptedLatch.countDown();
87-
Awaitility.waitAtMost(500, TimeUnit.MILLISECONDS)
87+
Awaitility.waitAtMost(3, TimeUnit.SECONDS)
8888
.untilAsserted(() -> assertThat(view.isTerminated()).as("%s", view).isTrue());
8989

9090
assertCleanShutdown(cached);
@@ -182,7 +182,7 @@ public void testShutdown(ExecutorType executorType) throws InterruptedException
182182
.as("Submitting work after invoking shutdown or shutdown should fail")
183183
.isInstanceOf(RejectedExecutionException.class);
184184
assertThat(view.isTerminated()).isFalse();
185-
Awaitility.waitAtMost(600, TimeUnit.MILLISECONDS)
185+
Awaitility.waitAtMost(3, TimeUnit.SECONDS)
186186
.untilAsserted(() -> assertThat(view.isTerminated()).as("%s", view).isTrue());
187187
assertThat(interrupted).isFalse();
188188

0 commit comments

Comments
 (0)