Skip to content

Commit b918042

Browse files
normanmaurerchrisvest
normanmaurer
and
chrisvest
authored
Update some dependencies (#16198) (#16215)
Motivation: Some of our test dependencies are outdated and have vulnerabilities. Modification: Update some of our test/optional dependencies to newer but compatible versions. Result: More up to date dependencies. Co-authored-by: Chris Vest <[email protected]>
1 parent 874c995 commit b918042

7 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎buffer/src/test/java/io/netty/buffer/UnpooledTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ public void testUnmodifiableBuffer() throws Exception {
476476
} catch (UnsupportedOperationException e) {
477477
// Expected
478478
}
479-
Mockito.verifyZeroInteractions(inputStream);
479+
Mockito.verifyNoInteractions(inputStream);
480480

481481
ScatteringByteChannel scatteringByteChannel = Mockito.mock(ScatteringByteChannel.class);
482482
try {
@@ -485,7 +485,7 @@ public void testUnmodifiableBuffer() throws Exception {
485485
} catch (UnsupportedOperationException e) {
486486
// Expected
487487
}
488-
Mockito.verifyZeroInteractions(scatteringByteChannel);
488+
Mockito.verifyNoInteractions(scatteringByteChannel);
489489
buf.release();
490490
}
491491

‎codec-http/src/test/java/io/netty/handler/codec/spdy/SpdyFrameDecoderTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import static org.mockito.Mockito.mock;
3232
import static org.mockito.Mockito.times;
3333
import static org.mockito.Mockito.verify;
34-
import static org.mockito.Mockito.verifyZeroInteractions;
34+
import static org.mockito.Mockito.verifyNoInteractions;
3535

3636
public class SpdyFrameDecoderTest {
3737

@@ -841,7 +841,7 @@ public void testDiscardUnknownFrame() throws Exception {
841841
buf.writeLong(RANDOM.nextLong());
842842

843843
decoder.decode(buf);
844-
verifyZeroInteractions(delegate);
844+
verifyNoInteractions(delegate);
845845
assertFalse(buf.isReadable());
846846
buf.release();
847847
}
@@ -856,7 +856,7 @@ public void testDiscardUnknownEmptyFrame() throws Exception {
856856
encodeControlFrameHeader(buf, type, flags, length);
857857

858858
decoder.decode(buf);
859-
verifyZeroInteractions(delegate);
859+
verifyNoInteractions(delegate);
860860
assertFalse(buf.isReadable());
861861
buf.release();
862862
}
@@ -878,7 +878,7 @@ public void testProgressivelyDiscardUnknownEmptyFrame() throws Exception {
878878
decoder.decode(header);
879879
decoder.decode(segment1);
880880
decoder.decode(segment2);
881-
verifyZeroInteractions(delegate);
881+
verifyNoInteractions(delegate);
882882
assertFalse(header.isReadable());
883883
assertFalse(segment1.isReadable());
884884
assertFalse(segment2.isReadable());

‎codec-http2/src/test/java/io/netty/handler/codec/http2/DefaultHttp2RemoteFlowControllerTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import static org.mockito.Mockito.times;
5454
import static org.mockito.Mockito.verify;
5555
import static org.mockito.Mockito.verifyNoMoreInteractions;
56-
import static org.mockito.Mockito.verifyZeroInteractions;
56+
import static org.mockito.Mockito.verifyNoInteractions;
5757
import static org.mockito.Mockito.when;
5858

5959
/**
@@ -140,7 +140,7 @@ public void windowUpdateShouldChangeConnectionWindow() throws Http2Exception {
140140
assertEquals(DEFAULT_WINDOW_SIZE, window(STREAM_B));
141141
assertEquals(DEFAULT_WINDOW_SIZE, window(STREAM_C));
142142
assertEquals(DEFAULT_WINDOW_SIZE, window(STREAM_D));
143-
verifyZeroInteractions(listener);
143+
verifyNoInteractions(listener);
144144
}
145145

146146
@Test
@@ -151,18 +151,18 @@ public void windowUpdateShouldChangeStreamWindow() throws Http2Exception {
151151
assertEquals(DEFAULT_WINDOW_SIZE, window(STREAM_B));
152152
assertEquals(DEFAULT_WINDOW_SIZE, window(STREAM_C));
153153
assertEquals(DEFAULT_WINDOW_SIZE, window(STREAM_D));
154-
verifyZeroInteractions(listener);
154+
verifyNoInteractions(listener);
155155
}
156156

157157
@Test
158158
public void payloadSmallerThanWindowShouldBeWrittenImmediately() throws Http2Exception {
159159
FakeFlowControlled data = new FakeFlowControlled(5);
160160
sendData(STREAM_A, data);
161161
data.assertNotWritten();
162-
verifyZeroInteractions(listener);
162+
verifyNoInteractions(listener);
163163
controller.writePendingBytes();
164164
data.assertFullyWritten();
165-
verifyZeroInteractions(listener);
165+
verifyNoInteractions(listener);
166166
}
167167

168168
@Test
@@ -172,7 +172,7 @@ public void emptyPayloadShouldBeWrittenImmediately() throws Http2Exception {
172172
data.assertNotWritten();
173173
controller.writePendingBytes();
174174
data.assertFullyWritten();
175-
verifyZeroInteractions(listener);
175+
verifyNoInteractions(listener);
176176
}
177177

178178
@Test
@@ -238,7 +238,7 @@ public void stalledStreamShouldQueuePayloads() throws Http2Exception {
238238
sendData(STREAM_A, moreData);
239239
controller.writePendingBytes();
240240
moreData.assertNotWritten();
241-
verifyZeroInteractions(listener);
241+
verifyNoInteractions(listener);
242242
}
243243

244244
@Test
@@ -260,7 +260,7 @@ public void queuedPayloadsReceiveErrorOnStreamClose() throws Http2Exception {
260260
connection.stream(STREAM_A).close();
261261
data.assertError(Http2Error.STREAM_CLOSED);
262262
moreData.assertError(Http2Error.STREAM_CLOSED);
263-
verifyZeroInteractions(listener);
263+
verifyNoInteractions(listener);
264264
}
265265

266266
@Test
@@ -748,7 +748,7 @@ public void execute() throws Throwable {
748748
verify(flowControlled, never()).writeComplete();
749749

750750
assertEquals(90, windowBefore - window(STREAM_A));
751-
verifyZeroInteractions(listener);
751+
verifyNoInteractions(listener);
752752
}
753753

754754
@Test

‎codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionHandlerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
import static org.mockito.Mockito.times;
8282
import static org.mockito.Mockito.verify;
8383
import static org.mockito.Mockito.verifyNoMoreInteractions;
84-
import static org.mockito.Mockito.verifyZeroInteractions;
84+
import static org.mockito.Mockito.verifyNoInteractions;
8585
import static org.mockito.Mockito.when;
8686

8787
/**
@@ -765,7 +765,7 @@ public void clientChannelClosedDoesNotSendGoAwayBeforePreface() throws Exception
765765
handler = newHandler();
766766
when(channel.isActive()).thenReturn(true);
767767
handler.close(ctx, promise);
768-
verifyZeroInteractions(frameWriter);
768+
verifyNoInteractions(frameWriter);
769769
}
770770

771771
@Test

‎handler/src/test/java/io/netty/handler/ssl/OptionalSslHandlerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.mockito.MockitoAnnotations;
2929

3030
import static org.mockito.Mockito.verify;
31-
import static org.mockito.Mockito.verifyZeroInteractions;
31+
import static org.mockito.Mockito.verifyNoInteractions;
3232
import static org.mockito.Mockito.when;
3333

3434
public class OptionalSslHandlerTest {
@@ -115,7 +115,7 @@ public void decodeBuffered() throws Exception {
115115
final ByteBuf payload = Unpooled.wrappedBuffer(new byte[] { 22, 3 });
116116
try {
117117
handler.decode(context, payload, null);
118-
verifyZeroInteractions(pipeline);
118+
verifyNoInteractions(pipeline);
119119
} finally {
120120
payload.release();
121121
}

‎pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@
753753
<jni.classifier>${os.detected.name}-${os.detected.arch}</jni.classifier>
754754
<logging.config>${project.basedir}/../common/src/test/resources/logback-test.xml</logging.config>
755755
<logging.logLevel>warn</logging.logLevel>
756-
<log4j2.version>2.23.1</log4j2.version>
756+
<log4j2.version>2.25.3</log4j2.version>
757757
<enforcer.plugin.version>3.0.0</enforcer.plugin.version>
758758
<junit.version>5.12.1</junit.version>
759759
<skipTests>false</skipTests>
@@ -1119,13 +1119,13 @@
11191119
<dependency>
11201120
<groupId>org.assertj</groupId>
11211121
<artifactId>assertj-core</artifactId>
1122-
<version>3.18.0</version>
1122+
<version>3.27.7</version>
11231123
<scope>test</scope>
11241124
</dependency>
11251125
<dependency>
11261126
<groupId>org.mockito</groupId>
11271127
<artifactId>mockito-core</artifactId>
1128-
<version>3.6.28</version>
1128+
<version>4.11.0</version>
11291129
<scope>test</scope>
11301130
</dependency>
11311131
<dependency>
@@ -1173,15 +1173,15 @@
11731173
<dependency>
11741174
<groupId>org.apache.commons</groupId>
11751175
<artifactId>commons-compress</artifactId>
1176-
<version>1.26.0</version>
1176+
<version>1.28.0</version>
11771177
<scope>test</scope>
11781178
</dependency>
11791179

11801180
<!-- Test dependency for Brotli compression codec -->
11811181
<dependency>
11821182
<groupId>commons-io</groupId>
11831183
<artifactId>commons-io</artifactId>
1184-
<version>2.14.0</version>
1184+
<version>2.20.0</version>
11851185
<scope>test</scope>
11861186
</dependency>
11871187

‎transport/src/test/java/io/netty/channel/CompleteChannelFutureTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void shouldNotDoAnythingOnRemove() {
4444
ChannelFutureListener l = Mockito.mock(ChannelFutureListener.class);
4545
future.removeListener(l);
4646
Mockito.verifyNoMoreInteractions(l);
47-
Mockito.verifyZeroInteractions(channel);
47+
Mockito.verifyNoInteractions(channel);
4848
}
4949

5050
@Test
@@ -60,7 +60,7 @@ public void testConstantProperties() throws InterruptedException {
6060
assertSame(future, future.awaitUninterruptibly());
6161
assertTrue(future.awaitUninterruptibly(1));
6262
assertTrue(future.awaitUninterruptibly(1, TimeUnit.NANOSECONDS));
63-
Mockito.verifyZeroInteractions(channel);
63+
Mockito.verifyNoInteractions(channel);
6464
}
6565

6666
private static class CompleteChannelFutureImpl extends CompleteChannelFuture {

0 commit comments

Comments
 (0)