Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/dbus/gconnman_technology.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void Technology::setTetheringPassphrase(const std::string& passphrase,
void Technology::setTetheringFreq(const uint32_t frequency,
PropertiesSetCallback callback) {
auto data = prepareCallback(std::move(callback));
setProperty(TETHERINGFREQ_STR, g_variant_new_uint32(frequency), nullptr,
setProperty(TETHERINGFREQ_STR, g_variant_new_int32(frequency), nullptr,
Comment thread
EddyTheCo marked this conversation as resolved.
Comment thread
EddyTheCo marked this conversation as resolved.
&Technology::finishAsyncCall, data.release());
}

Expand All @@ -75,7 +75,6 @@ void TechProperties::update(const gchar* key, GVariant* value) {
name_ = g_variant_get_string(value, nullptr);
} else if (g_strcmp0(key, TYPE_STR) == 0U) {
type_ = TYPE_MAP.fromString(g_variant_get_string(value, nullptr));

} else if (g_strcmp0(key, POWERED_STR) == 0U) {
powered_ = g_variant_get_boolean(value) == 1U;
} else if (g_strcmp0(key, CONNECTED_STR) == 0U) {
Expand Down
109 changes: 109 additions & 0 deletions tests/gconnman_tech_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
using Amarula::DBus::G::Connman::Connman;
using Type = Amarula::DBus::G::Connman::TechProperties::Type;

constexpr uint32_t WIFI_FREQ_2412_MHZ = 2412;

TEST(Connman, getTechs) {
bool called = false;
{
Expand Down Expand Up @@ -125,6 +127,113 @@ TEST(Connman, ScanWifiTechnology) {
ASSERT_TRUE(called) << "TechnologiesChanged callback was never called";
}

TEST(Connman, SetTetheringOn) {
bool called = false;
{
const ThreadBundle thread_bundle;
Connman connman;
const auto manager = connman.manager();

manager->onTechnologiesChanged(
[&called, main_tid = thread_bundle.main_tid,
loop_tid = thread_bundle.loop_tid](const auto& technologies) {
ASSERT_FALSE(technologies.empty())
Comment thread
EddyTheCo marked this conversation as resolved.
<< "No technologies returned";

for (const auto& tech : technologies) {
const auto props = tech->properties();
const auto name = props.getName();

if (props.getType() == Type::Wifi) { // test only wifi
std::cout << "Setting tethering properties for " << name
<< "\n";
tech->setTetheringIdentifier(
"AmarulaTestSSID",
[name, main_tid, loop_tid](bool success) {
const auto callback_tid =
std::this_thread::get_id();
EXPECT_NE(callback_tid, main_tid);
EXPECT_NE(callback_tid, loop_tid);
EXPECT_TRUE(success)
<< "Failed to set tethering identifier for "
<< name;
});
tech->setTetheringPassphrase(
"AmarulaTestPassphrase",
[name, main_tid, loop_tid](bool success) {
const auto callback_tid =
std::this_thread::get_id();
EXPECT_NE(callback_tid, main_tid);
EXPECT_NE(callback_tid, loop_tid);
EXPECT_TRUE(success)
<< "Failed to set tethering passphrase for "
<< name;
});

tech->setTetheringFreq(
WIFI_FREQ_2412_MHZ,
[name, main_tid, loop_tid](bool success) {
const auto callback_tid =
std::this_thread::get_id();
EXPECT_NE(callback_tid, main_tid);
EXPECT_NE(callback_tid, loop_tid);
EXPECT_TRUE(success)
<< "Failed to set tethering frequency for "
<< name;
});
tech->setTethering(true, [&called, name, main_tid,
loop_tid](bool success) {
const auto callback_tid =
std::this_thread::get_id();
EXPECT_NE(callback_tid, main_tid);
EXPECT_NE(callback_tid, loop_tid);
EXPECT_TRUE(success)
<< "Failed to set tethering for " << name;
called = true;
});
Comment thread
EddyTheCo marked this conversation as resolved.
}
}
});
}
ASSERT_TRUE(called) << "setTethering callback was never called";
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This assertion will fail if no Wifi technology is found on the system, as called will remain false. This makes the test suite dependent on the host environment's hardware configuration. Consider checking for the existence of a Wifi technology and skipping the test (or marking it as successful/inconclusive) if none is found, rather than failing.

}

TEST(Connman, SetTetheringOff) {
bool called = false;
{
const ThreadBundle thread_bundle;
Connman connman;
const auto manager = connman.manager();

manager->onTechnologiesChanged(
[&called, main_tid = thread_bundle.main_tid,
loop_tid = thread_bundle.loop_tid](const auto& technologies) {
ASSERT_FALSE(technologies.empty())
<< "No technologies returned";

for (const auto& tech : technologies) {
const auto props = tech->properties();
const auto name = props.getName();

if (props.getType() == Type::Wifi) { // test only wifi
std::cout << "Disable tethering for " << name << "\n";
tech->setTethering(false, [&called, name, main_tid,
loop_tid](bool success) {
const auto callback_tid =
std::this_thread::get_id();
EXPECT_NE(callback_tid, main_tid);
EXPECT_NE(callback_tid, loop_tid);
EXPECT_TRUE(success)
<< "Failed to unset tethering for " << name;
called = true;
});
}
}
});
}
ASSERT_TRUE(called) << "setTethering callback was never called";
}

TEST(Connman, PowerOffAllTechnologies) {
bool called = false;
{
Expand Down
Loading