archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

UUID: add != operator for comparing UUIDs

Browse Source 
Make it possible to unit test with `EXPECT_NE(uuid1, uuid2)`.
This commit is contained in:
Sybren A. Stüvel
2021-09-23 17:22:17 +02:00
parent bd63944a73
commit 105115da9f
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenlib/BLI_uuid.h
View File

@@ -93,6 +93,7 @@ class bUUID : public ::bUUID {
}; };
bool operator==(bUUID uuid1, bUUID uuid2); bool operator==(bUUID uuid1, bUUID uuid2);
bool operator!=(bUUID uuid1, bUUID uuid2);
} // namespace blender } // namespace blender

5
source/blender/blenlib/intern/uuid.cc
View File

@@ -184,4 +184,9 @@ bool operator==(const bUUID uuid1, const bUUID uuid2)
return BLI_uuid_equal(uuid1, uuid2); return BLI_uuid_equal(uuid1, uuid2);
} }
bool operator!=(const bUUID uuid1, const bUUID uuid2)
{
return !(uuid1 == uuid2);
}
} // namespace blender } // namespace blender

8
source/blender/blenlib/tests/BLI_uuid_test.cc
View File

@@ -40,7 +40,7 @@ TEST(BLI_uuid, generate_many_random)
/* Generate lots of UUIDs to get some indication that the randomness is okay. */ /* Generate lots of UUIDs to get some indication that the randomness is okay. */
for (int i = 0; i < 1000000; ++i) { for (int i = 0; i < 1000000; ++i) {
const bUUID uuid = BLI_uuid_generate_random(); const bUUID uuid = BLI_uuid_generate_random();
EXPECT_FALSE(BLI_uuid_equal(first_uuid, uuid)); EXPECT_NE(first_uuid, uuid);
// Check that the non-random bits are set according to RFC4122. // Check that the non-random bits are set according to RFC4122.
const uint16_t version = uuid.time_hi_and_version >> 12; const uint16_t version = uuid.time_hi_and_version >> 12;
@@ -55,7 +55,7 @@ TEST(BLI_uuid, nil_value)
const bUUID nil_uuid = BLI_uuid_nil(); const bUUID nil_uuid = BLI_uuid_nil();
const bUUID zeroes_uuid{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; const bUUID zeroes_uuid{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
EXPECT_TRUE(BLI_uuid_equal(nil_uuid, zeroes_uuid)); EXPECT_EQ(nil_uuid, zeroes_uuid);
EXPECT_TRUE(BLI_uuid_is_nil(nil_uuid)); EXPECT_TRUE(BLI_uuid_is_nil(nil_uuid));
std::string buffer(36, '\0'); std::string buffer(36, '\0');
@@ -68,8 +68,8 @@ TEST(BLI_uuid, equality)
const bUUID uuid1 = BLI_uuid_generate_random(); const bUUID uuid1 = BLI_uuid_generate_random();
const bUUID uuid2 = BLI_uuid_generate_random(); const bUUID uuid2 = BLI_uuid_generate_random();
EXPECT_TRUE(BLI_uuid_equal(uuid1, uuid1)); EXPECT_EQ(uuid1, uuid1);
EXPECT_FALSE(BLI_uuid_equal(uuid1, uuid2)); EXPECT_NE(uuid1, uuid2);
} }
TEST(BLI_uuid, string_formatting) TEST(BLI_uuid, string_formatting)