Update test

seladb · Sep 25, 2024 · 5dfdd6c · 5dfdd6c
1 parent 5da4f20
commit 5dfdd6c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git a/Tests/Pcap++Test/TestDefinition.h b/Tests/Pcap++Test/TestDefinition.h
@@ -78,7 +78,7 @@ PTF_TEST_CASE(TestTcpReassemblyMaxOOOFrags);
 PTF_TEST_CASE(TestTcpReassemblyMaxSeq);
 PTF_TEST_CASE(TestTcpReassemblyDisableOOOCleanup);
 PTF_TEST_CASE(TestTcpReassemblyTimeStamps);
-PTF_TEST_CASE(TestTcpReassemblyFinishReset);
+PTF_TEST_CASE(TestTcpReassemblyFinReset);
 
 // Implemented in IPFragmentationTests.cpp
 PTF_TEST_CASE(TestIPFragmentationSanity);

diff --git a/Tests/Pcap++Test/Tests/TcpReassemblyTests.cpp b/Tests/Pcap++Test/Tests/TcpReassemblyTests.cpp
@@ -1264,7 +1264,7 @@ PTF_TEST_CASE(TestTcpReassemblyTimeStamps)
 	tcpReassemblyResults.clear();
 }  // TestTcpReassemblyTimeStamps
 
-PTF_TEST_CASE(TestTcpReassemblyFinishReset)
+PTF_TEST_CASE(TestTcpReassemblyFinReset)
 {
 	TcpReassemblyMultipleConnStats results;
 	std::string errMsg;
@@ -1273,22 +1273,12 @@ PTF_TEST_CASE(TestTcpReassemblyFinishReset)
 	PTF_ASSERT_TRUE(
 	    readPcapIntoPacketVec("PcapExamples/one_tcp_stream_fin_rst_close_packet.pcap", packetStream, errMsg));
 
-	pcpp::TcpReassemblyConfiguration config(true, 2, 1);
-	pcpp::TcpReassembly tcpReassembly(tcpReassemblyMsgReadyCallback, &results, tcpReassemblyConnectionStartCallback,
-	                                  tcpReassemblyConnectionEndCallback, config);
-
-	for (auto iter : packetStream)
-	{
-		pcpp::Packet packet(&iter);
-		tcpReassembly.reassemblePacket(packet);
-	}
-
-	auto managedConnections = tcpReassembly.getConnectionInformation();  // make a copy of list
-	PTF_ASSERT_EQUAL(managedConnections.size(), 1);
-
-	bool isOpen = tcpReassembly.isConnectionOpen(managedConnections.begin()->second);
-	PTF_ASSERT_FALSE(isOpen);
-
-	packetStream.clear();
+	TcpReassemblyMultipleConnStats tcpReassemblyResults;
+	tcpReassemblyTest(packetStream, tcpReassemblyResults, true, false);
 
-}  // TestTcpReassemblyFinishReset
+	TcpReassemblyMultipleConnStats::Stats& stats = tcpReassemblyResults.stats;
+	PTF_ASSERT_EQUAL(stats.size(), 1);
+	PTF_ASSERT_TRUE(stats.begin()->second.connectionsStarted);
+	PTF_ASSERT_TRUE(stats.begin()->second.connectionsEnded);
+	PTF_ASSERT_FALSE(stats.begin()->second.connectionsEndedManually);
+}  // TestTcpReassemblyFinReset
diff --git a/Tests/Pcap++Test/main.cpp b/Tests/Pcap++Test/main.cpp
@@ -289,7 +289,7 @@ int main(int argc, char* argv[])
 	PTF_RUN_TEST(TestTcpReassemblyMaxSeq, "no_network;tcp_reassembly");
 	PTF_RUN_TEST(TestTcpReassemblyDisableOOOCleanup, "no_network;tcp_reassembly");
 	PTF_RUN_TEST(TestTcpReassemblyTimeStamps, "no_network;tcp_reassembly");
-	PTF_RUN_TEST(TestTcpReassemblyFinishReset, "no_network;tcp_reassembly");
+	PTF_RUN_TEST(TestTcpReassemblyFinReset, "no_network;tcp_reassembly");
 
 	PTF_RUN_TEST(TestIPFragmentationSanity, "no_network;ip_frag");
 	PTF_RUN_TEST(TestIPFragOutOfOrder, "no_network;ip_frag");