[Bf-blender-cvs] [369dc20e651] temp-cxx-upgrade: Tests: Use explicit signature constants
Sergey Sharybin
noreply at git.blender.org
Thu Jun 18 15:20:27 CEST 2020
Commit: 369dc20e651a6c86d167b555f958b2ac85256ada
Author: Sergey Sharybin
Date: Thu Jun 18 15:15:08 2020 +0200
Branches: temp-cxx-upgrade
https://developer.blender.org/rB369dc20e651a6c86d167b555f958b2ac85256ada
Tests: Use explicit signature constants
Are reported by MSVC 2019 after C++17 switch.
One might suggest lets just silence the warning, I will say why to have
specific signed/unsigned types in API just to then (usafely) ignore the
sign conversion.
===================================================================
M tests/gtests/blenlib/BLI_array_test.cc
M tests/gtests/blenlib/BLI_index_range_test.cc
M tests/gtests/blenlib/BLI_linear_allocator_test.cc
M tests/gtests/blenlib/BLI_map_test.cc
M tests/gtests/blenlib/BLI_set_test.cc
M tests/gtests/blenlib/BLI_span_test.cc
M tests/gtests/blenlib/BLI_stack_cxx_test.cc
M tests/gtests/blenlib/BLI_string_ref_test.cc
M tests/gtests/blenlib/BLI_vector_set_test.cc
M tests/gtests/blenlib/BLI_vector_test.cc
===================================================================
diff --git a/tests/gtests/blenlib/BLI_array_test.cc b/tests/gtests/blenlib/BLI_array_test.cc
index fc3c15fe813..9ff4dc9a371 100644
--- a/tests/gtests/blenlib/BLI_array_test.cc
+++ b/tests/gtests/blenlib/BLI_array_test.cc
@@ -7,21 +7,21 @@ using namespace blender;
TEST(array, DefaultConstructor)
{
Array<int> array;
- EXPECT_EQ(array.size(), 0);
+ EXPECT_EQ(array.size(), 0u);
EXPECT_TRUE(array.is_empty());
}
TEST(array, SizeConstructor)
{
Array<int> array(5);
- EXPECT_EQ(array.size(), 5);
+ EXPECT_EQ(array.size(), 5u);
EXPECT_FALSE(array.is_empty());
}
TEST(array, FillConstructor)
{
Array<int> array(5, 8);
- EXPECT_EQ(array.size(), 5);
+ EXPECT_EQ(array.size(), 5u);
EXPECT_EQ(array[0], 8);
EXPECT_EQ(array[1], 8);
EXPECT_EQ(array[2], 8);
@@ -32,7 +32,7 @@ TEST(array, FillConstructor)
TEST(array, InitializerListConstructor)
{
Array<int> array = {4, 5, 6, 7};
- EXPECT_EQ(array.size(), 4);
+ EXPECT_EQ(array.size(), 4u);
EXPECT_EQ(array[0], 4);
EXPECT_EQ(array[1], 5);
EXPECT_EQ(array[2], 6);
@@ -44,7 +44,7 @@ TEST(array, SpanConstructor)
int stackarray[4] = {6, 7, 8, 9};
Span<int> span(stackarray, ARRAY_SIZE(stackarray));
Array<int> array(span);
- EXPECT_EQ(array.size(), 4);
+ EXPECT_EQ(array.size(), 4u);
EXPECT_EQ(array[0], 6);
EXPECT_EQ(array[1], 7);
EXPECT_EQ(array[2], 8);
@@ -56,8 +56,8 @@ TEST(array, CopyConstructor)
Array<int> array = {5, 6, 7, 8};
Array<int> new_array(array);
- EXPECT_EQ(array.size(), 4);
- EXPECT_EQ(new_array.size(), 4);
+ EXPECT_EQ(array.size(), 4u);
+ EXPECT_EQ(new_array.size(), 4u);
EXPECT_NE(array.data(), new_array.data());
EXPECT_EQ(new_array[0], 5);
EXPECT_EQ(new_array[1], 6);
@@ -70,8 +70,8 @@ TEST(array, MoveConstructor)
Array<int> array = {5, 6, 7, 8};
Array<int> new_array(std::move(array));
- EXPECT_EQ(array.size(), 0);
- EXPECT_EQ(new_array.size(), 4);
+ EXPECT_EQ(array.size(), 0u);
+ EXPECT_EQ(new_array.size(), 4u);
EXPECT_EQ(new_array[0], 5);
EXPECT_EQ(new_array[1], 6);
EXPECT_EQ(new_array[2], 7);
@@ -82,10 +82,10 @@ TEST(array, CopyAssignment)
{
Array<int> array = {1, 2, 3};
Array<int> new_array = {4};
- EXPECT_EQ(new_array.size(), 1);
+ EXPECT_EQ(new_array.size(), 1u);
new_array = array;
- EXPECT_EQ(new_array.size(), 3);
- EXPECT_EQ(array.size(), 3);
+ EXPECT_EQ(new_array.size(), 3u);
+ EXPECT_EQ(array.size(), 3u);
EXPECT_NE(array.data(), new_array.data());
EXPECT_EQ(new_array[0], 1);
EXPECT_EQ(new_array[1], 2);
@@ -96,10 +96,10 @@ TEST(array, MoveAssignment)
{
Array<int> array = {1, 2, 3};
Array<int> new_array = {4};
- EXPECT_EQ(new_array.size(), 1);
+ EXPECT_EQ(new_array.size(), 1u);
new_array = std::move(array);
- EXPECT_EQ(new_array.size(), 3);
- EXPECT_EQ(array.size(), 0);
+ EXPECT_EQ(new_array.size(), 3u);
+ EXPECT_EQ(array.size(), 0u);
EXPECT_EQ(new_array[0], 1);
EXPECT_EQ(new_array[1], 2);
EXPECT_EQ(new_array[2], 3);
diff --git a/tests/gtests/blenlib/BLI_index_range_test.cc b/tests/gtests/blenlib/BLI_index_range_test.cc
index da51b7a66c0..6b628909f18 100644
--- a/tests/gtests/blenlib/BLI_index_range_test.cc
+++ b/tests/gtests/blenlib/BLI_index_range_test.cc
@@ -8,41 +8,41 @@ using namespace blender;
TEST(index_range, DefaultConstructor)
{
IndexRange range;
- EXPECT_EQ(range.size(), 0);
+ EXPECT_EQ(range.size(), 0u);
Vector<uint> vector;
for (uint value : range) {
vector.append(value);
}
- EXPECT_EQ(vector.size(), 0);
+ EXPECT_EQ(vector.size(), 0u);
}
TEST(index_range, SingleElementRange)
{
IndexRange range(4, 1);
- EXPECT_EQ(range.size(), 1);
- EXPECT_EQ(*range.begin(), 4);
+ EXPECT_EQ(range.size(), 1u);
+ EXPECT_EQ(*range.begin(), 4u);
Vector<uint> vector;
for (uint value : range) {
vector.append(value);
}
- EXPECT_EQ(vector.size(), 1);
- EXPECT_EQ(vector[0], 4);
+ EXPECT_EQ(vector.size(), 1u);
+ EXPECT_EQ(vector[0], 4u);
}
TEST(index_range, MultipleElementRange)
{
IndexRange range(6, 4);
- EXPECT_EQ(range.size(), 4);
+ EXPECT_EQ(range.size(), 4u);
Vector<uint> vector;
for (uint value : range) {
vector.append(value);
}
- EXPECT_EQ(vector.size(), 4);
+ EXPECT_EQ(vector.size(), 4u);
for (uint i = 0; i < 4; i++) {
EXPECT_EQ(vector[i], i + 6);
}
@@ -51,28 +51,28 @@ TEST(index_range, MultipleElementRange)
TEST(index_range, SubscriptOperator)
{
IndexRange range(5, 5);
- EXPECT_EQ(range[0], 5);
- EXPECT_EQ(range[1], 6);
- EXPECT_EQ(range[2], 7);
+ EXPECT_EQ(range[0], 5u);
+ EXPECT_EQ(range[1], 6u);
+ EXPECT_EQ(range[2], 7u);
}
TEST(index_range, Before)
{
IndexRange range = IndexRange(5, 5).before(3);
- EXPECT_EQ(range[0], 2);
- EXPECT_EQ(range[1], 3);
- EXPECT_EQ(range[2], 4);
- EXPECT_EQ(range.size(), 3);
+ EXPECT_EQ(range[0], 2u);
+ EXPECT_EQ(range[1], 3u);
+ EXPECT_EQ(range[2], 4u);
+ EXPECT_EQ(range.size(), 3u);
}
TEST(index_range, After)
{
IndexRange range = IndexRange(5, 5).after(4);
- EXPECT_EQ(range[0], 10);
- EXPECT_EQ(range[1], 11);
- EXPECT_EQ(range[2], 12);
- EXPECT_EQ(range[3], 13);
- EXPECT_EQ(range.size(), 4);
+ EXPECT_EQ(range[0], 10u);
+ EXPECT_EQ(range[1], 11u);
+ EXPECT_EQ(range[2], 12u);
+ EXPECT_EQ(range[3], 13u);
+ EXPECT_EQ(range.size(), 4u);
}
TEST(index_range, Contains)
@@ -88,52 +88,52 @@ TEST(index_range, Contains)
TEST(index_range, First)
{
IndexRange range = IndexRange(5, 3);
- EXPECT_EQ(range.first(), 5);
+ EXPECT_EQ(range.first(), 5u);
}
TEST(index_range, Last)
{
IndexRange range = IndexRange(5, 3);
- EXPECT_EQ(range.last(), 7);
+ EXPECT_EQ(range.last(), 7u);
}
TEST(index_range, OneAfterEnd)
{
IndexRange range = IndexRange(5, 3);
- EXPECT_EQ(range.one_after_last(), 8);
+ EXPECT_EQ(range.one_after_last(), 8u);
}
TEST(index_range, Start)
{
IndexRange range = IndexRange(6, 2);
- EXPECT_EQ(range.start(), 6);
+ EXPECT_EQ(range.start(), 6u);
}
TEST(index_range, Slice)
{
IndexRange range = IndexRange(5, 15);
IndexRange slice = range.slice(2, 6);
- EXPECT_EQ(slice.size(), 6);
- EXPECT_EQ(slice.first(), 7);
- EXPECT_EQ(slice.last(), 12);
+ EXPECT_EQ(slice.size(), 6u);
+ EXPECT_EQ(slice.first(), 7u);
+ EXPECT_EQ(slice.last(), 12u);
}
TEST(index_range, SliceRange)
{
IndexRange range = IndexRange(5, 15);
IndexRange slice = range.slice(IndexRange(3, 5));
- EXPECT_EQ(slice.size(), 5);
- EXPECT_EQ(slice.first(), 8);
- EXPECT_EQ(slice.last(), 12);
+ EXPECT_EQ(slice.size(), 5u);
+ EXPECT_EQ(slice.first(), 8u);
+ EXPECT_EQ(slice.last(), 12u);
}
TEST(index_range, AsSpan)
{
IndexRange range = IndexRange(4, 6);
Span<uint> span = range.as_span();
- EXPECT_EQ(span.size(), 6);
- EXPECT_EQ(span[0], 4);
- EXPECT_EQ(span[1], 5);
- EXPECT_EQ(span[2], 6);
- EXPECT_EQ(span[3], 7);
+ EXPECT_EQ(span.size(), 6u);
+ EXPECT_EQ(span[0], 4u);
+ EXPECT_EQ(span[1], 5u);
+ EXPECT_EQ(span[2], 6u);
+ EXPECT_EQ(span[3], 7u);
}
diff --git a/tests/gtests/blenlib/BLI_linear_allocator_test.cc b/tests/gtests/blenlib/BLI_linear_allocator_test.cc
index 0d926ca7931..9c230d404f2 100644
--- a/tests/gtests/blenlib/BLI_linear_allocator_test.cc
+++ b/tests/gtests/blenlib/BLI_linear_allocator_test.cc
@@ -68,7 +68,7 @@ TEST(linear_allocator, AllocateArray)
LinearAllocator<> allocator;
MutableSpan<int> span = allocator.allocate_array<int>(5);
- EXPECT_EQ(span.size(), 5);
+ EXPECT_EQ(span.size(), 5u);
}
TEST(linear_allocator, Construct)
@@ -77,7 +77,7 @@ TEST(linear_allocator, Construct)
std::array<int, 5> values = {1, 2, 3, 4, 5};
Vector<int> *vector = allocator.construct<Vector<int>>(values);
- EXPECT_EQ(vector->size(), 5);
+ EXPECT_EQ(vector->size(), 5u);
EXPECT_EQ((*vector)[3], 4);
vector->~Vector();
}
@@ -90,8 +90,8 @@ TEST(linear_allocator, ConstructElementsAndPointerArray)
Span<Vector<int> *> vectors = allocator.construct_elements_and_pointer_array<Vector<int>>(
5, values);
- EXPECT_EQ(vectors.size(), 5);
- EXPECT_EQ(vectors[3]->size(), 7);
+ EXPECT_EQ(vectors.size(), 5u);
+ EXPECT_EQ(vectors[3]->size(), 7u);
EXPECT_EQ((*vectors[2])[5], 6);
for (Vector<int> *vector : vectors) {
@@ -107,8 +107,8 @@ TEST(linear_allocator, ConstructArrayCopy)
MutableSpan<int> span1 = allocator.construct_array_copy(values.as_span());
MutableSpan<int> span2 = allocator.construct_array_copy(values.as_span());
EXPECT_NE(span1.data(), span2.data());
- EXPECT_EQ(span1.size(), 3);
- EXPECT_EQ(span2.size(), 3);
+ EXPECT_EQ(span1.size(), 3u);
+ EXPECT_EQ(span2.size(), 3u);
EXPECT_EQ(span1[1], 2);
EXPECT_EQ(span2[2], 3);
}
diff --git a/tests/gtests/blenlib/BLI_map_test.cc b/tests/gtests/blenlib/BLI_map_test.cc
index 85b2f642654..79a8786def9 100644
--- a/tests/gtests/blenlib/BLI_map_test.cc
+++ b/tests/gtests/blenlib/BLI_map_test.cc
@@ -11,20 +11,20 @@ using namespace blender;
TEST(map, DefaultConstructor)
{
Map<int, float> map;
- EXPECT_EQ(map.size(), 0);
+ EXPECT_EQ(map.size(), 0u);
EXPECT_TRUE(map.is_empty());
}
TEST(map, AddIncreasesSize)
{
Map<int, float> map;
- EXPECT_EQ(map.size(), 0);
+ EXPECT_EQ(map.size(), 0u);
EXPECT_TRUE(map.is_empty());
map.add(2, 5.0f);
- EXPECT_EQ(map.size(), 1);
+ EXPECT_EQ(map.size(), 1u);
EXPECT_FALSE(map.is_empty());
map.add(6, 2.0f);
- EXPECT_EQ(map.size(), 2);
+ EXPECT_EQ(map.size(), 2u);
EXPECT_FALSE(map.is_empty());
}
@@ -87,16 +87,16 @@ TEST(map, PopTry)
Map<int, int> map;
map.add(1, 5);
map.add(2, 7);
- EXPECT_EQ(map.size(), 2);
+ EXPECT_EQ(map.size(), 2u);
Optional<int> value = map.pop_try(4);
- EXPECT_EQ(map.size(), 2);
+ EXPECT_EQ(map.size(), 2u);
EXPECT_FALSE(value.has_value());
value = map.pop_try(2);
- EXPECT_EQ(map.size(), 1);
+ EXPECT_EQ(map.size(), 1u);
EXPECT_TRUE(value.has_value());
EXPECT_EQ(value.value(), 7);
EXPECT_EQ(*map.pop_try(1), 5);
- EXPECT_EQ(map.size(), 0);
+ EXPECT_EQ(map.size(), 0u);
}
TEST(map, PopDefault)
@@ -105,17 +105,17 @@ TEST(map, PopDefault)
map.add(1, 4);
map.add(2, 7);
map.add(3, 8);
- EXPECT_EQ(map.size(), 3);
+ EXPECT_EQ(map.size(), 3u);
EXPECT_EQ(map.pop_default(4, 10), 10);
- EXPECT_EQ(map.size(), 3);
+ EXPEC
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list