Skip to content

Commit 7eda5d9

Browse files
committed
fixed test problems
1 parent 14c05e7 commit 7eda5d9

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void testBufferOutputStream() {
5353
Assertions.assertTrue((1 < oBufferOutputStream.length()));
5454

5555
@SuppressWarnings("resource")
56-
BufferInputStream oBufferInputStream = new BufferInputStream(oBufferOutputStream.getByteBuf());
56+
BufferInputStream oBufferInputStream = new BufferInputStream(oBufferOutputStream.getBuffer().getByteBuf());
5757
Assertions.assertEquals("test", oBufferInputStream.readString());
5858
Assertions.assertEquals(1, oBufferInputStream.readByte());
5959
Assertions.assertEquals(true, oBufferInputStream.readBoolean());

foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/client/tcp/TestTcpClientConnection.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import io.vertx.core.Context;
3333
import io.vertx.core.Handler;
3434
import io.vertx.core.Promise;
35+
import io.vertx.core.buffer.Buffer;
3536
import io.vertx.core.net.NetSocket;
3637
import io.vertx.core.net.impl.NetSocketImpl;
3738
import mockit.Deencapsulation;
@@ -90,14 +91,14 @@ public void send_inWorkingStatus(@Mocked AbstractTcpClientPackage tcpClientPacka
9091
Deencapsulation.setField(tcpClientConnection, "status", Status.WORKING);
9192

9293
long msgId = 1;
93-
ByteBuf byteBuf = Unpooled.buffer();
94+
Buffer byteBuf = Buffer.buffer();
9495
new Expectations(tcpClientConnection) {
9596
{
9697
tcpClientPackage.getMsgId();
9798
result = msgId;
9899
tcpClientPackage.createStream();
99100
result = tcpOutputStream;
100-
tcpOutputStream.getByteBuf();
101+
tcpOutputStream.getBuffer();
101102
result = byteBuf;
102103
}
103104
};
@@ -172,7 +173,7 @@ public void send_disconnectedToWorking(@Mocked AbstractTcpClientPackage tcpClien
172173
{
173174
tcpClientPackage.getMsgId();
174175
result = msgId;
175-
tcpClientConnection.write((ByteBuf) any);
176+
tcpClientConnection.write((Buffer) any);
176177
}
177178
};
178179
new MockUp<Context>(context) {

transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/RestClientInvocation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ protected void handleResponse(HttpClientResponse httpClientResponse) {
220220
return;
221221
}
222222

223-
if (restOperationMeta.isServerSendEvents()) {
223+
if (restOperationMeta != null && restOperationMeta.isServerSendEvents()) {
224224
processFlowableResponseBody(FlowableHelper.toFlowable(httpClientResponse));
225225
return;
226226
}

0 commit comments

Comments
 (0)