TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 22:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed unit tests. Unit tests were failing locally, mostly just type mismatches, but there was an error in the GetDownloadPath for the test utilities.

Browse Source 
PiperOrigin-RevId: 474358069
This commit is contained in:
John Carroll
2022-09-14 12:17:35 -07:00
committed by Copybara-Service
parent 6b5251f8d2
commit 0b57cd5c5f
3 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/windows/test_utils.cc
+8 -3
View File
@@ -16,8 +16,12 @@
#include <shlobj.h>
#include <algorithm>
#include <sstream>
#include "absl/strings/str_format.h"
#include "absl/strings/str_replace.h"
namespace test_utils {
std::wstring StringToWideString(const std::string& s) {
int len;
@@ -60,11 +64,12 @@ std::string GetPayloadPath(location::nearby::PayloadId payload_id) {
CoTaskMemFree(basePath);
std::stringstream path("");
std::string path =
absl::StrFormat("%s\\%s", fullPath, std::to_string(payload_id));
path << fullPath << "\\" << std::to_string(payload_id);
path = absl::StrReplaceAll(path, {{"\\", "/"}});
return path.str();
return path;
}
} // namespace test_utils
internal/platform/implementation/windows/utils_test.cc
+3 -2
View File
@@ -49,7 +49,8 @@ TEST(UtilsTests, StringToMacAddress) {
}
constexpr absl::string_view kIpDotdecimal{"192.168.1.37"};
constexpr char kIp4Bytes[] = {192, 168, 1, 37};
constexpr char kIp4Bytes[] = {(char)192, (char)168, (char)1, (char)37};
TEST(UtilsTests, Ip4BytesToDotdecimal) {
std::string result =
@@ -62,7 +63,7 @@ TEST(UtilsTests, IpDotdecimalTo4Bytes) {
std::string result =
ipaddr_dotdecimal_to_4bytes_string(std::string(kIpDotdecimal));
EXPECT_EQ(result, std::string(kIp4Bytes));
EXPECT_EQ(result, std::string(kIp4Bytes, 4));
}
} // namespace windows
internal/platform/uuid_test.cc
+32 -16
View File
@@ -64,22 +64,38 @@ TEST(UuidTest, CreateFromBinaryCanOutputString) {
std::array<char, 16> uuid_data = uuid.data();
std::string uuid_str(uuid);
NEARBY_LOGS(INFO) << "UUID: " << uuid_str;
EXPECT_EQ(uuid_data[0], (kCopresenceServiceUuidMsb >> 56) & 0xFF);
EXPECT_EQ(uuid_data[1], (kCopresenceServiceUuidMsb >> 48) & 0xFF);
EXPECT_EQ(uuid_data[2], (kCopresenceServiceUuidMsb >> 40) & 0xFF);
EXPECT_EQ(uuid_data[3], (kCopresenceServiceUuidMsb >> 32) & 0xFF);
EXPECT_EQ(uuid_data[4], (kCopresenceServiceUuidMsb >> 24) & 0xFF);
EXPECT_EQ(uuid_data[5], (kCopresenceServiceUuidMsb >> 16) & 0xFF);
EXPECT_EQ(uuid_data[6], (kCopresenceServiceUuidMsb >> 8) & 0xFF);
EXPECT_EQ(uuid_data[7], (kCopresenceServiceUuidMsb >> 0) & 0xFF);
EXPECT_EQ(uuid_data[8], (kCopresenceServiceUuidLsb >> 56) & 0xFF);
EXPECT_EQ(uuid_data[9], (kCopresenceServiceUuidLsb >> 48) & 0xFF);
EXPECT_EQ(uuid_data[10], (kCopresenceServiceUuidLsb >> 40) & 0xFF);
EXPECT_EQ(uuid_data[11], (kCopresenceServiceUuidLsb >> 32) & 0xFF);
EXPECT_EQ(uuid_data[12], (kCopresenceServiceUuidLsb >> 24) & 0xFF);
EXPECT_EQ(uuid_data[13], (kCopresenceServiceUuidLsb >> 16) & 0xFF);
EXPECT_EQ(uuid_data[14], (kCopresenceServiceUuidLsb >> 8) & 0xFF);
EXPECT_EQ(uuid_data[15], (kCopresenceServiceUuidLsb >> 0) & 0xFF);
EXPECT_EQ(uuid_data[0],
static_cast<char>((kCopresenceServiceUuidMsb >> 56) & 0xFF));
EXPECT_EQ(uuid_data[1],
static_cast<char>((kCopresenceServiceUuidMsb >> 48) & 0xFF));
EXPECT_EQ(uuid_data[2],
static_cast<char>((kCopresenceServiceUuidMsb >> 40) & 0xFF));
EXPECT_EQ(uuid_data[3],
static_cast<char>((kCopresenceServiceUuidMsb >> 32) & 0xFF));
EXPECT_EQ(uuid_data[4],
static_cast<char>((kCopresenceServiceUuidMsb >> 24) & 0xFF));
EXPECT_EQ(uuid_data[5],
static_cast<char>((kCopresenceServiceUuidMsb >> 16) & 0xFF));
EXPECT_EQ(uuid_data[6],
static_cast<char>((kCopresenceServiceUuidMsb >> 8) & 0xFF));
EXPECT_EQ(uuid_data[7],
static_cast<char>((kCopresenceServiceUuidMsb >> 0) & 0xFF));
EXPECT_EQ(uuid_data[8],
static_cast<char>((kCopresenceServiceUuidLsb >> 56) & 0xFF));
EXPECT_EQ(uuid_data[9],
static_cast<char>((kCopresenceServiceUuidLsb >> 48) & 0xFF));
EXPECT_EQ(uuid_data[10],
static_cast<char>((kCopresenceServiceUuidLsb >> 40) & 0xFF));
EXPECT_EQ(uuid_data[11],
static_cast<char>((kCopresenceServiceUuidLsb >> 32) & 0xFF));
EXPECT_EQ(uuid_data[12],
static_cast<char>((kCopresenceServiceUuidLsb >> 24) & 0xFF));
EXPECT_EQ(uuid_data[13],
static_cast<char>((kCopresenceServiceUuidLsb >> 16) & 0xFF));
EXPECT_EQ(uuid_data[14],
static_cast<char>((kCopresenceServiceUuidLsb >> 8) & 0xFF));
EXPECT_EQ(uuid_data[15],
static_cast<char>((kCopresenceServiceUuidLsb >> 0) & 0xFF));
EXPECT_THAT(uuid_str, StrCaseEq("0000FEF3-0000-1000-8000-00805F9B34FB"));
EXPECT_THAT(uuid.Get16BitAsString(), StrCaseEq("FEF3"));