forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from 1828c5356..c9cdae001
c9cdae001 fix(toxav): remove extra copy of video frame on encode 4f6d4546b test: Improve the fake network library. a2581e700 refactor(toxcore): generate `Friend_Request` and `Dht_Nodes_Response` 2aaa11770 refactor(toxcore): use Tox_Memory in generated events 5c367452b test(toxcore): fix incorrect mutex in tox_scenario_get_time 8f92e710f perf: Add a timed limit of number of cookie requests. 695b6417a test: Add some more simulated network support. 815ae9ce9 test(toxcore): fix thread-safety in scenario framework 6d85c754e test(toxcore): add unit tests for net_crypto 9c22e79cc test(support): add SimulatedEnvironment for deterministic testing f34fcb195 chore: Update windows Dockerfile to debian stable (trixie). ece0e8980 fix(group_moderation): allow validating unsorted sanction list signatures a4fa754d7 refactor: rename struct Packet to struct Net_Packet d6f330f85 cleanup: Fix some warnings from coverity. e206bffa2 fix(group_chats): fix sync packets reverting topics 0e4715598 test: Add new scenario testing framework. 668291f44 refactor(toxcore): decouple Network_Funcs from sockaddr via IP_Port fc4396cef fix: potential division by zero in toxav and unsafe hex parsing 8e8b352ab refactor: Add nullable annotations to struct members. 7740bb421 refactor: decouple net_crypto from DHT 1936d4296 test: add benchmark for toxav audio and video 46bfdc2df fix: correct printf format specifiers for unsigned integers REVERT: 1828c5356 fix(toxav): remove extra copy of video frame on encode git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: c9cdae001341e701fca980c9bb9febfeb95d2902
This commit is contained in:
@@ -1,20 +1,26 @@
|
||||
// clang-format off
|
||||
#include "../testing/support/public/simulated_environment.hh"
|
||||
#include "group_announce.h"
|
||||
// clang-format on
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "DHT.h"
|
||||
#include "crypto_core.h"
|
||||
#include "logger.h"
|
||||
#include "mem_test_util.hh"
|
||||
#include "mono_time.h"
|
||||
#include "mono_time_test_util.hh"
|
||||
#include "network.h"
|
||||
|
||||
namespace {
|
||||
|
||||
using tox::test::FakeClock;
|
||||
using tox::test::SimulatedEnvironment;
|
||||
|
||||
struct Announces : ::testing::Test {
|
||||
protected:
|
||||
Test_Memory mem_;
|
||||
uint64_t clock_ = 1000;
|
||||
SimulatedEnvironment env;
|
||||
Tox_Memory c_mem_;
|
||||
Mono_Time *mono_time_ = nullptr;
|
||||
GC_Announces_List *gca_ = nullptr;
|
||||
GC_Announce _ann1;
|
||||
@@ -22,24 +28,24 @@ protected:
|
||||
|
||||
void SetUp() override
|
||||
{
|
||||
mono_time_ = mono_time_new(mem_, nullptr, nullptr);
|
||||
c_mem_ = env.fake_memory().get_c_memory();
|
||||
mono_time_ = mono_time_new(&c_mem_, nullptr, nullptr);
|
||||
ASSERT_NE(mono_time_, nullptr);
|
||||
mono_time_set_current_time_callback(
|
||||
mono_time_, [](void *user_data) { return *static_cast<uint64_t *>(user_data); },
|
||||
&clock_);
|
||||
gca_ = new_gca_list(mem_);
|
||||
setup_fake_clock(mono_time_, env.fake_clock());
|
||||
|
||||
gca_ = new_gca_list(&c_mem_);
|
||||
ASSERT_NE(gca_, nullptr);
|
||||
}
|
||||
|
||||
~Announces() override
|
||||
{
|
||||
kill_gca(gca_);
|
||||
mono_time_free(mem_, mono_time_);
|
||||
mono_time_free(&c_mem_, mono_time_);
|
||||
}
|
||||
|
||||
void advance_clock(uint64_t increment)
|
||||
{
|
||||
clock_ += increment;
|
||||
env.fake_clock().advance(increment);
|
||||
mono_time_update(mono_time_);
|
||||
}
|
||||
};
|
||||
@@ -54,10 +60,10 @@ TEST_F(Announces, CanBeCreatedAndDeleted)
|
||||
{
|
||||
GC_Public_Announce ann{};
|
||||
ann.chat_public_key[0] = 0x88;
|
||||
ASSERT_NE(gca_add_announce(mem_, mono_time_, gca_, &ann), nullptr);
|
||||
ASSERT_NE(gca_add_announce(&c_mem_, mono_time_, gca_, &ann), nullptr);
|
||||
#ifndef __clang__
|
||||
ASSERT_EQ(gca_add_announce(mem_, mono_time_, gca_, nullptr), nullptr);
|
||||
ASSERT_EQ(gca_add_announce(mem_, mono_time_, nullptr, &ann), nullptr);
|
||||
ASSERT_EQ(gca_add_announce(&c_mem_, mono_time_, gca_, nullptr), nullptr);
|
||||
ASSERT_EQ(gca_add_announce(&c_mem_, mono_time_, nullptr, &ann), nullptr);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -67,7 +73,7 @@ TEST_F(Announces, AnnouncesCanTimeOut)
|
||||
ASSERT_EQ(gca_->root_announces, nullptr);
|
||||
GC_Public_Announce ann{};
|
||||
ann.chat_public_key[0] = 0xae;
|
||||
ASSERT_NE(gca_add_announce(mem_, mono_time_, gca_, &ann), nullptr);
|
||||
ASSERT_NE(gca_add_announce(&c_mem_, mono_time_, gca_, &ann), nullptr);
|
||||
ASSERT_NE(gca_->root_announces, nullptr);
|
||||
ASSERT_EQ(gca_->root_announces->chat_id[0], 0xae);
|
||||
|
||||
@@ -95,9 +101,9 @@ TEST_F(Announces, AnnouncesGetAndCleanup)
|
||||
ann2.chat_public_key[0] = 0x92;
|
||||
ann2.base_announce.peer_public_key[0] = 0x7c;
|
||||
|
||||
ASSERT_NE(gca_add_announce(mem_, mono_time_, gca_, &ann1), nullptr);
|
||||
ASSERT_NE(gca_add_announce(mem_, mono_time_, gca_, &ann2), nullptr);
|
||||
ASSERT_NE(gca_add_announce(mem_, mono_time_, gca_, &ann2), nullptr);
|
||||
ASSERT_NE(gca_add_announce(&c_mem_, mono_time_, gca_, &ann1), nullptr);
|
||||
ASSERT_NE(gca_add_announce(&c_mem_, mono_time_, gca_, &ann2), nullptr);
|
||||
ASSERT_NE(gca_add_announce(&c_mem_, mono_time_, gca_, &ann2), nullptr);
|
||||
|
||||
uint8_t empty_pk[ENC_PUBLIC_KEY_SIZE] = {0};
|
||||
|
||||
@@ -117,13 +123,15 @@ TEST_F(Announces, AnnouncesGetAndCleanup)
|
||||
|
||||
struct AnnouncesPack : ::testing::Test {
|
||||
protected:
|
||||
SimulatedEnvironment env;
|
||||
Tox_Memory c_mem_;
|
||||
std::vector<GC_Announce> announces_;
|
||||
Test_Memory mem_;
|
||||
Logger *logger_ = nullptr;
|
||||
|
||||
void SetUp() override
|
||||
{
|
||||
logger_ = logger_new(mem_);
|
||||
c_mem_ = env.fake_memory().get_c_memory();
|
||||
logger_ = logger_new(&c_mem_);
|
||||
ASSERT_NE(logger_, nullptr);
|
||||
|
||||
// Add an announce without TCP relay.
|
||||
|
||||
Reference in New Issue
Block a user