From 1b6567b31b6494fb0402b2f2e43a8d8df74dc4ee Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Thu, 13 Mar 2025 11:14:39 +0100
Subject: [PATCH] test/net/TestIPv[46]Address: initialize WinSock for some of
the tests
Not necessary with WINE, but the "real" Windows seems to be picky
about this.
---
test/net/TestIPv4Address.cxx | 11 +++++++++++
test/net/TestIPv6Address.cxx | 9 +++++++++
2 files changed, 20 insertions(+)
diff --git a/test/net/TestIPv4Address.cxx b/test/net/TestIPv4Address.cxx
index 3a9f18eb5..e6f2efa57 100644
--- a/test/net/TestIPv4Address.cxx
+++ b/test/net/TestIPv4Address.cxx
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: BSD-2-Clause
// author: Max Kellermann <max.kellermann@gmail.com>
+#include "net/Init.hxx"
#include "net/IPv4Address.hxx"
#include "net/ToString.hxx"
#include "util/Compiler.h"
@@ -96,18 +97,24 @@ ToString(const struct in_addr &a)
TEST(IPv4Address, Octets)
{
+ const ScopeNetInit net_init;
+
static constexpr auto a = IPv4Address(11, 22, 33, 44, 1234);
EXPECT_EQ(ToString(a.GetAddress()), "11.22.33.44");
}
TEST(IPv4Address, Any)
{
+ const ScopeNetInit net_init;
+
EXPECT_EQ(ToString(IPv4Address(1234).GetAddress()), "0.0.0.0");
EXPECT_EQ(ToString(IPv4Address(1234)), "0.0.0.0:1234");
}
TEST(IPv4Address, Port)
{
+ const ScopeNetInit net_init;
+
EXPECT_EQ(IPv4Address(0).GetPort(), 0);
EXPECT_EQ(IPv4Address(1).GetPort(), 1);
EXPECT_EQ(IPv4Address(1234).GetPort(), 1234);
@@ -116,12 +123,16 @@ TEST(IPv4Address, Port)
TEST(IPv4Address, Loopback)
{
+ const ScopeNetInit net_init;
+
static constexpr auto a = IPv4Address(IPv4Address::Loopback(), 1234);
EXPECT_EQ(ToString(a.GetAddress()), "127.0.0.1");
}
TEST(IPv4Address, MaskFromPrefix)
{
+ const ScopeNetInit net_init;
+
EXPECT_EQ(ToString(IPv4Address::MaskFromPrefix(0).GetAddress()), "0.0.0.0");
EXPECT_EQ(ToString(IPv4Address::MaskFromPrefix(4).GetAddress()), "240.0.0.0");
EXPECT_EQ(ToString(IPv4Address::MaskFromPrefix(8).GetAddress()), "255.0.0.0");
diff --git a/test/net/TestIPv6Address.cxx b/test/net/TestIPv6Address.cxx
index 171e3ca9d..b751a1ac9 100644
--- a/test/net/TestIPv6Address.cxx
+++ b/test/net/TestIPv6Address.cxx
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: BSD-2-Clause
// author: Max Kellermann <max.kellermann@gmail.com>
+#include "net/Init.hxx"
#include "net/IPv6Address.hxx"
#include "net/ToString.hxx"
#include "util/Compiler.h"
@@ -93,6 +94,8 @@ ToString(const struct in6_addr &a)
TEST(IPv6Address, Octets)
{
+ const ScopeNetInit net_init;
+
static constexpr auto a = IPv6Address(0x1110, 0x2220, 0x3330, 0x4440,
0x5550, 0x6660, 0x7770, 0x8880,
1234);
@@ -101,12 +104,16 @@ TEST(IPv6Address, Octets)
TEST(IPv6Address, Any)
{
+ const ScopeNetInit net_init;
+
EXPECT_EQ(ToString(IPv6Address(1234).GetAddress()), "::");
EXPECT_EQ(ToString(IPv6Address(1234)), "[::]:1234");
}
TEST(IPv6Address, Port)
{
+ const ScopeNetInit net_init;
+
EXPECT_EQ(IPv6Address(0).GetPort(), 0);
EXPECT_EQ(IPv6Address(1).GetPort(), 1);
EXPECT_EQ(IPv6Address(1234).GetPort(), 1234);
@@ -115,6 +122,8 @@ TEST(IPv6Address, Port)
TEST(IPv6Address, MaskFromPrefix)
{
+ const ScopeNetInit net_init;
+
EXPECT_EQ(ToString(IPv6Address::MaskFromPrefix(0).GetAddress()), "::");
EXPECT_EQ(ToString(IPv6Address::MaskFromPrefix(1).GetAddress()), "8000::");
EXPECT_EQ(ToString(IPv6Address::MaskFromPrefix(8).GetAddress()), "ff00::");