Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 12:55:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ATL_APITEST] Simplify code by using ok_int etc. (#1824)

Browse source 
Simplify the code by using ok_int, ok_long etc.
This commit is contained in:
Katayama Hirofumi MZ 2019-08-12 23:10:47 +09:00 • committed by GitHub
parent 211fdcdba7
commit 14c267a3a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 191 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

102
modules/rostests/apitests/atl/CSimpleArray.cpp
View file

@ -45,24 +45,24 @@ START_TEST(CSimpleArray)
{
CSimpleArray<int> array1;
ok(array1.GetSize() == 0, "Expected array1's size is zero, was %d\n", array1.GetSize());
ok_int(array1.GetSize(), 0);
array1.Add(123);
ok(array1.GetSize() == 1, "Expected array1's size is 1, was %d\n", array1.GetSize());
ok(array1.GetData()[0] == 123, "Expected array1.GetData()[0] is 123, was %d\n", array1.GetData()[0]);
ok(array1[0] == 123, "Expected array1[0] is 123, was %d\n", array1[0]);
ok_int(array1.GetSize(), 1);
ok_int(array1.GetData()[0], 123);
ok_int(array1[0], 123);
array1.Add(456);
ok(array1.GetSize() == 2, "Expected array1's size is 2, was %d\n", array1.GetSize());
ok(array1.GetData()[0] == 123, "Expected array1.GetData()[0] is 123, was %d\n", array1.GetData()[0]);
ok(array1[0] == 123, "Expected array1[0] is 123, was %d\n", array1[0]);
ok(array1.GetData()[1] == 456, "Expected array1.GetData()[1] is 456, was %d\n", array1.GetData()[1]);
ok(array1[1] == 456, "Expected array1[1] is 456, was %d\n", array1[1]);
ok_int(array1.GetSize(), 2);
ok_int(array1.GetData()[0], 123);
ok_int(array1[0], 123);
ok_int(array1.GetData()[1], 456);
ok_int(array1[1], 456);
array1.RemoveAll();
ok(array1.GetSize() == 0, "Expected array1's size is 0, was %d\n", array1.GetSize());
ok_int(array1.GetSize(), 0);
array1.Add(1);
array1.Add(1);
@ -70,92 +70,92 @@ START_TEST(CSimpleArray)
array1.Add(2);
array1.Add(2);
array1.Add(3);
ok(array1.GetSize() == 6, "Expected array1's size is 6, was %d\n", array1.GetSize());
ok_int(array1.GetSize(), 6);
array1.Remove(2);
ok(array1.GetSize() == 5, "Expected array1's size is 5, was %d\n", array1.GetSize());
ok_int(array1.GetSize(), 5);
array1.Remove(1);
ok(array1.GetSize() == 4, "Expected array1's size is 4, was %d\n", array1.GetSize());
ok_int(array1.GetSize(), 4);
ok(array1[0] == 1, "Expected array1[0] is 1, was %d\n", array1[0]);
ok(array1[1] == 1, "Expected array1[1] is 1, was %d\n", array1[1]);
ok(array1[2] == 2, "Expected array1[2] is 2, was %d\n", array1[2]);
ok(array1[3] == 3, "Expected array1[3] is 3, was %d\n", array1[3]);
ok_int(array1[0], 1);
ok_int(array1[1], 1);
ok_int(array1[2], 2);
ok_int(array1[3], 3);
ok(CCreature::s_nCount == 0, "Expected CCreature::s_nCount is zero, was: %d\n", CCreature::s_nCount);
ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount);
ok_int(CCreature::s_nCount, 0);
ok_int(CCreature::s_nCopyCount, 0);
CSimpleArray<CCreature> array2;
{
CCreature creature1, creature2;
ok(CCreature::s_nCount == 2, "Expected CCreature::s_nCount is 2, was: %d\n", CCreature::s_nCount);
ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount);
ok_int(CCreature::s_nCount, 2);
ok_int(CCreature::s_nCopyCount, 0);
array2.Add(creature1);
ok(CCreature::s_nCount == 3, "Expected CCreature::s_nCount is 3, was: %d\n", CCreature::s_nCount);
ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount);
ok_int(CCreature::s_nCount, 3);
ok_int(CCreature::s_nCopyCount, 0);
array2.Add(creature2);
ok(CCreature::s_nCount == 4, "Expected CCreature::s_nCount is 4, was: %d\n", CCreature::s_nCount);
ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount);
ok_int(CCreature::s_nCount, 4);
ok_int(CCreature::s_nCopyCount, 0);
}
ok(CCreature::s_nCount == 2, "Expected CCreature::s_nCount is 2, was: %d\n", CCreature::s_nCount);
ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount);
ok_int(CCreature::s_nCount, 2);
ok_int(CCreature::s_nCopyCount, 0);
{
CSimpleArray<CCreature> array3(array2), array4, array5;
ok(CCreature::s_nCount == 4, "Expected CCreature::s_nCount is 4, was: %d\n", CCreature::s_nCount);
ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount);
ok_int(CCreature::s_nCount, 4);
ok_int(CCreature::s_nCopyCount, 0);
array4 = array2;
ok(CCreature::s_nCount == 6, "Expected CCreature::s_nCount is 6, was: %d\n", CCreature::s_nCount);
ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount);
ok_int(CCreature::s_nCount, 6);
ok_int(CCreature::s_nCopyCount, 0);
CCreature creature1;
ok(CCreature::s_nCount == 7, "Expected CCreature::s_nCount is 7, was: %d\n", CCreature::s_nCount);
ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount);
ok_int(CCreature::s_nCount, 7);
ok_int(CCreature::s_nCopyCount, 0);
array4.Add(creature1);
ok(CCreature::s_nCount == 8, "Expected CCreature::s_nCount is 8, was: %d\n", CCreature::s_nCount);
ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount);
ok_int(CCreature::s_nCount, 8);
ok_int(CCreature::s_nCopyCount, 0);
array3 = array4;
ok(CCreature::s_nCount == 9, "Expected CCreature::s_nCount is 9, was: %d\n", CCreature::s_nCount);
ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount);
ok_int(CCreature::s_nCount, 9);
ok_int(CCreature::s_nCopyCount, 0);
array5 = array2;
ok(CCreature::s_nCount == 11, "Expected CCreature::s_nCount is 11, was: %d\n", CCreature::s_nCount);
ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount);
ok_int(CCreature::s_nCount, 11);
ok_int(CCreature::s_nCopyCount, 0);
array5 = array2;
ok(CCreature::s_nCount == 11, "Expected CCreature::s_nCount is 11, was: %d\n", CCreature::s_nCount);
ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount);
ok_int(CCreature::s_nCount, 11);
ok_int(CCreature::s_nCopyCount, 0);
}
ok(CCreature::s_nCount == 2, "Expected CCreature::s_nCount is 2, was: %d\n", CCreature::s_nCount);
ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount);
ok_int(CCreature::s_nCount, 2);
ok_int(CCreature::s_nCopyCount, 0);
array2.RemoveAll();
ok(CCreature::s_nCount == 0, "Expected CCreature::s_nCount is zero, was: %d\n", CCreature::s_nCount);
ok(CCreature::s_nCopyCount == 0, "Expected CCreature::s_nCopyCount is zero, was: %d\n", CCreature::s_nCopyCount);
ok_int(CCreature::s_nCount, 0);
ok_int(CCreature::s_nCopyCount, 0);
array1.RemoveAll();
ok(array1.GetSize() == 0, "Expected array1.GetSize() is zero, was: %d\n", array1.GetSize());
ok_int(array1.GetSize(), 0);
for (int i = 0; i < 100; ++i)
{
array1.Add(i);
}
ok(array1.GetSize() == 100, "Expected array1.GetSize() is 100, was: %d\n", array1.GetSize());
ok_int(array1.GetSize(), 100);
array1.RemoveAll();
ok(array1.GetSize() == 0, "Expected array1.GetSize() is zero, was: %d\n", array1.GetSize());
ok_int(array1.GetSize(), 0);
array1.Add(123);
array1.Add(321);
ok(!!array1.RemoveAt(0), "Expected RemoveAt(0) to succeed\n");
ok(array1.GetSize() == 1, "Expected array1.GetSize() is 1, was: %d\n", array1.GetSize());
ok_int(array1.GetSize(), 1);
if (array1.GetSize() == 1)
{
ok(array1[0] == 321, "Expected array1[0] is 321, was %d\n", array1[0]);
ok_int(array1[0], 321);
}
ok(!!array1.RemoveAt(0), "Expected RemoveAt(0) to succeed\n");
ok(array1.GetSize() == 0, "Expected array1.GetSize() is 0, was: %d\n", array1.GetSize());
ok_int(array1.GetSize(), 0);
}