You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ma...@apache.org on 2018/04/20 03:25:04 UTC
[trafficserver] branch quic-latest updated: Fix unit tests
This is an automated email from the ASF dual-hosted git repository.
maskit pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/quic-latest by this push:
new 59543aa Fix unit tests
59543aa is described below
commit 59543aacaf5a9235dfce88256a68f5992d2e5e60
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Fri Apr 20 12:24:43 2018 +0900
Fix unit tests
---
iocore/net/quic/Mock.h | 8 ++++++++
iocore/net/quic/test/test_QUICFrame.cc | 2 +-
iocore/net/quic/test/test_QUICLossDetector.cc | 3 ++-
iocore/net/quic/test/test_QUICPacketFactory.cc | 2 +-
iocore/net/quic/test/test_QUICStream.cc | 13 +++++--------
iocore/net/quic/test/test_QUICStreamManager.cc | 8 ++++----
6 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/iocore/net/quic/Mock.h b/iocore/net/quic/Mock.h
index 0156e04..bed653e 100644
--- a/iocore/net/quic/Mock.h
+++ b/iocore/net/quic/Mock.h
@@ -507,3 +507,11 @@ public:
return EVENT_CONT;
}
};
+
+class MockQUICRTTProvider : public QUICRTTProvider
+{
+ ink_hrtime smoothed_rtt() const
+ {
+ return HRTIME_MSECONDS(1);
+ }
+};
diff --git a/iocore/net/quic/test/test_QUICFrame.cc b/iocore/net/quic/test/test_QUICFrame.cc
index fd4f4e5..992b03d 100644
--- a/iocore/net/quic/test/test_QUICFrame.cc
+++ b/iocore/net/quic/test/test_QUICFrame.cc
@@ -1123,7 +1123,7 @@ TEST_CASE("QUICFrameFactory Create CONNECTION_CLOSE with a QUICConnectionError",
TEST_CASE("QUICFrameFactory Create RST_STREAM with a QUICStreamError", "[quic]")
{
- QUICStream stream(0, 0x1234, 0, 0);
+ QUICStream stream(new MockQUICRTTProvider(), 0, 0x1234, 0, 0);
std::unique_ptr<QUICStreamError> error =
std::unique_ptr<QUICStreamError>(new QUICStreamError(&stream, static_cast<QUICAppErrorCode>(0x01)));
std::unique_ptr<QUICRstStreamFrame, QUICFrameDeleterFunc> rst_stream_frame1 =
diff --git a/iocore/net/quic/test/test_QUICLossDetector.cc b/iocore/net/quic/test/test_QUICLossDetector.cc
index d777ba9..b3ee4f0 100644
--- a/iocore/net/quic/test/test_QUICLossDetector.cc
+++ b/iocore/net/quic/test/test_QUICLossDetector.cc
@@ -137,7 +137,8 @@ TEST_CASE("QUICLossDetector_Loss", "[quic]")
afc->update(pn8, false, true);
afc->update(pn9, false, true);
ink_hrtime_sleep(HRTIME_MSECONDS(1000));
- frame = afc->create();
+ std::shared_ptr<QUICFrame> x = afc->generate_frame(2048, 2048);
+ frame = std::dynamic_pointer_cast<QUICAckFrame>(x);
detector.handle_frame(frame);
ink_hrtime_sleep(HRTIME_MSECONDS(5000));
diff --git a/iocore/net/quic/test/test_QUICPacketFactory.cc b/iocore/net/quic/test/test_QUICPacketFactory.cc
index 29ff72a..fc9c895 100644
--- a/iocore/net/quic/test/test_QUICPacketFactory.cc
+++ b/iocore/net/quic/test/test_QUICPacketFactory.cc
@@ -91,7 +91,7 @@ TEST_CASE("QUICPacketFactory_Create_Handshake", "[quic]")
CHECK(packet->type() == QUICPacketType::HANDSHAKE);
CHECK(packet->connection_id() == 0x01020304);
CHECK(memcmp(packet->payload(), raw, sizeof(raw)) == 0);
- CHECK((packet->packet_number() & 0xFFFFFFFF80000000) == 0);
+ CHECK(packet->packet_number() <= 0xFFFFFBFF);
CHECK(packet->version() == 0x11223344);
}
diff --git a/iocore/net/quic/test/test_QUICStream.cc b/iocore/net/quic/test/test_QUICStream.cc
index 508d015..3dfb2ae 100644
--- a/iocore/net/quic/test/test_QUICStream.cc
+++ b/iocore/net/quic/test/test_QUICStream.cc
@@ -69,7 +69,7 @@ TEST_CASE("QUICStream", "[quic]")
MIOBuffer *read_buffer = new_MIOBuffer(BUFFER_SIZE_INDEX_4K);
IOBufferReader *reader = read_buffer->alloc_reader();
- std::unique_ptr<QUICStream> stream(new QUICStream(0, stream_id, 1024, 1024));
+ std::unique_ptr<QUICStream> stream(new QUICStream(new MockQUICRTTProvider(), 0, stream_id, 1024, 1024));
stream->do_io_read(nullptr, 0, read_buffer);
stream->recv(frame_1);
@@ -94,7 +94,7 @@ TEST_CASE("QUICStream", "[quic]")
MIOBuffer *read_buffer = new_MIOBuffer(BUFFER_SIZE_INDEX_4K);
IOBufferReader *reader = read_buffer->alloc_reader();
- std::unique_ptr<QUICStream> stream(new QUICStream(0, stream_id, UINT64_MAX, UINT64_MAX));
+ std::unique_ptr<QUICStream> stream(new QUICStream(new MockQUICRTTProvider(), 0, stream_id, UINT64_MAX, UINT64_MAX));
stream->do_io_read(nullptr, 0, read_buffer);
stream->recv(frame_8);
@@ -119,7 +119,7 @@ TEST_CASE("QUICStream", "[quic]")
MIOBuffer *read_buffer = new_MIOBuffer(BUFFER_SIZE_INDEX_4K);
IOBufferReader *reader = read_buffer->alloc_reader();
- std::unique_ptr<QUICStream> stream(new QUICStream(0, stream_id, UINT64_MAX, UINT64_MAX));
+ std::unique_ptr<QUICStream> stream(new QUICStream(new MockQUICRTTProvider(), 0, stream_id, UINT64_MAX, UINT64_MAX));
stream->do_io_read(nullptr, 0, read_buffer);
stream->recv(frame_8);
@@ -148,7 +148,7 @@ TEST_CASE("QUICStream", "[quic]")
MIOBuffer *read_buffer = new_MIOBuffer(BUFFER_SIZE_INDEX_4K);
IOBufferReader *reader = read_buffer->alloc_reader();
- std::unique_ptr<QUICStream> stream(new QUICStream(0, stream_id));
+ std::unique_ptr<QUICStream> stream(new QUICStream(new MockQUICRTTProvider(), 0, stream_id));
stream->init_flow_control_params(4096, 4096);
stream->do_io_read(nullptr, 0, read_buffer);
@@ -184,7 +184,7 @@ TEST_CASE("QUICStream", "[quic]")
IOBufferReader *read_buffer_reader = read_buffer->alloc_reader();
IOBufferReader *write_buffer_reader = write_buffer->alloc_reader();
- std::unique_ptr<QUICStream> stream(new QUICStream(0, stream_id));
+ std::unique_ptr<QUICStream> stream(new QUICStream(new MockQUICRTTProvider(), 0, stream_id));
stream->init_flow_control_params(4096, 4096);
MockContinuation mock_cont(stream->mutex);
stream->do_io_read(nullptr, 0, read_buffer);
@@ -196,9 +196,6 @@ TEST_CASE("QUICStream", "[quic]")
stream->handleEvent(VC_EVENT_WRITE_READY, nullptr);
CHECK(stream->will_generate_frame() == true);
frame = stream->generate_frame(4096, 4096);
- CHECK(frame->type() == QUICFrameType::MAX_STREAM_DATA);
- CHECK(stream->will_generate_frame() == true);
- frame = stream->generate_frame(4096, 4096);
CHECK(frame->type() == QUICFrameType::STREAM);
CHECK(stream->will_generate_frame() == false);
diff --git a/iocore/net/quic/test/test_QUICStreamManager.cc b/iocore/net/quic/test/test_QUICStreamManager.cc
index c05794e..796ca26 100644
--- a/iocore/net/quic/test/test_QUICStreamManager.cc
+++ b/iocore/net/quic/test/test_QUICStreamManager.cc
@@ -34,7 +34,7 @@ TEST_CASE("QUICStreamManager_NewStream", "[quic]")
QUICApplicationMap app_map;
MockQUICApplication mock_app;
app_map.set_default(&mock_app);
- QUICStreamManager sm(0, &app_map);
+ QUICStreamManager sm(new MockQUICRTTProvider(), 0, &app_map, NET_VCONNECTION_IN);
std::shared_ptr<QUICTransportParameters> local_tp =
std::make_shared<QUICTransportParametersInEncryptedExtensions>(static_cast<QUICVersion>(0));
std::shared_ptr<QUICTransportParameters> remote_tp =
@@ -80,7 +80,7 @@ TEST_CASE("QUICStreamManager_first_initial_map", "[quic]")
QUICApplicationMap app_map;
MockQUICApplication mock_app;
app_map.set_default(&mock_app);
- QUICStreamManager sm(0, &app_map);
+ QUICStreamManager sm(new MockQUICRTTProvider(), 0, &app_map, NET_VCONNECTION_IN);
std::shared_ptr<QUICTransportParameters> local_tp =
std::make_shared<QUICTransportParametersInEncryptedExtensions>(static_cast<QUICVersion>(0));
std::shared_ptr<QUICTransportParameters> remote_tp =
@@ -100,7 +100,7 @@ TEST_CASE("QUICStreamManager_total_offset_received", "[quic]")
QUICApplicationMap app_map;
MockQUICApplication mock_app;
app_map.set_default(&mock_app);
- QUICStreamManager sm(0, &app_map);
+ QUICStreamManager sm(new MockQUICRTTProvider(), 0, &app_map, NET_VCONNECTION_IN);
std::shared_ptr<QUICTransportParameters> local_tp =
std::make_shared<QUICTransportParametersInEncryptedExtensions>(static_cast<QUICVersion>(0));
local_tp->set(QUICTransportParameterId::INITIAL_MAX_STREAM_DATA, UINT32_C(4096));
@@ -133,7 +133,7 @@ TEST_CASE("QUICStreamManager_total_offset_sent", "[quic]")
QUICApplicationMap app_map;
MockQUICApplication mock_app;
app_map.set_default(&mock_app);
- QUICStreamManager sm(0, &app_map);
+ QUICStreamManager sm(new MockQUICRTTProvider(), 0, &app_map, NET_VCONNECTION_IN);
std::shared_ptr<QUICTransportParameters> local_tp =
std::make_shared<QUICTransportParametersInEncryptedExtensions>(static_cast<QUICVersion>(0));
local_tp->set(QUICTransportParameterId::INITIAL_MAX_STREAM_DATA, UINT32_C(4096));
--
To stop receiving notification emails like this one, please contact
maskit@apache.org.