huwcampbell.com
Reactos
[ATL_APITEST] Fix CSimpleArray test
The test violated the one definition rule and was using the constructor from a different implementation of CCreature.
+43
-43
+43
-43
modules/rostests/apitests/atl/CSimpleArray.cpp
+43
-43
modules/rostests/apitests/atl/CSimpleArray.cpp
···
14
14
#include <atlbase.h>
15
15
#include <atlsimpcoll.h>
16
16
17
-
struct CCreature
17
+
struct CSimpleCreature
18
18
{
19
19
static int s_nCount;
20
20
static int s_nCopyCount;
21
-
CCreature()
21
+
CSimpleCreature()
22
22
{
23
-
CCreature::s_nCount++;
23
+
CSimpleCreature::s_nCount++;
24
24
}
25
-
CCreature(const CCreature& c)
25
+
CSimpleCreature(const CSimpleCreature& c)
26
26
{
27
-
CCreature::s_nCount++;
27
+
CSimpleCreature::s_nCount++;
28
28
}
29
-
~CCreature()
29
+
~CSimpleCreature()
30
30
{
31
-
CCreature::s_nCount--;
31
+
CSimpleCreature::s_nCount--;
32
32
}
33
-
CCreature& operator=(const CCreature& other)
33
+
CSimpleCreature& operator=(const CSimpleCreature& other)
34
34
{
35
-
CCreature::s_nCopyCount++;
35
+
CSimpleCreature::s_nCopyCount++;
36
36
return *this;
37
37
}
38
38
};
39
39
40
-
int CCreature::s_nCount = 0;
41
-
int CCreature::s_nCopyCount = 0;
40
+
int CSimpleCreature::s_nCount = 0;
41
+
int CSimpleCreature::s_nCopyCount = 0;
42
42
43
43
44
44
START_TEST(CSimpleArray)
···
83
83
ok_int(array1[2], 2);
84
84
ok_int(array1[3], 3);
85
85
86
-
ok_int(CCreature::s_nCount, 0);
87
-
ok_int(CCreature::s_nCopyCount, 0);
86
+
ok_int(CSimpleCreature::s_nCount, 0);
87
+
ok_int(CSimpleCreature::s_nCopyCount, 0);
88
88
89
-
CSimpleArray<CCreature> array2;
89
+
CSimpleArray<CSimpleCreature> array2;
90
90
{
91
-
CCreature creature1, creature2;
91
+
CSimpleCreature creature1, creature2;
92
92
93
-
ok_int(CCreature::s_nCount, 2);
94
-
ok_int(CCreature::s_nCopyCount, 0);
93
+
ok_int(CSimpleCreature::s_nCount, 2);
94
+
ok_int(CSimpleCreature::s_nCopyCount, 0);
95
95
array2.Add(creature1);
96
-
ok_int(CCreature::s_nCount, 3);
97
-
ok_int(CCreature::s_nCopyCount, 0);
96
+
ok_int(CSimpleCreature::s_nCount, 3);
97
+
ok_int(CSimpleCreature::s_nCopyCount, 0);
98
98
array2.Add(creature2);
99
-
ok_int(CCreature::s_nCount, 4);
100
-
ok_int(CCreature::s_nCopyCount, 0);
99
+
ok_int(CSimpleCreature::s_nCount, 4);
100
+
ok_int(CSimpleCreature::s_nCopyCount, 0);
101
101
}
102
-
ok_int(CCreature::s_nCount, 2);
103
-
ok_int(CCreature::s_nCopyCount, 0);
102
+
ok_int(CSimpleCreature::s_nCount, 2);
103
+
ok_int(CSimpleCreature::s_nCopyCount, 0);
104
104
105
105
{
106
-
CSimpleArray<CCreature> array3(array2), array4, array5;
107
-
ok_int(CCreature::s_nCount, 4);
108
-
ok_int(CCreature::s_nCopyCount, 0);
106
+
CSimpleArray<CSimpleCreature> array3(array2), array4, array5;
107
+
ok_int(CSimpleCreature::s_nCount, 4);
108
+
ok_int(CSimpleCreature::s_nCopyCount, 0);
109
109
110
110
array4 = array2;
111
-
ok_int(CCreature::s_nCount, 6);
112
-
ok_int(CCreature::s_nCopyCount, 0);
111
+
ok_int(CSimpleCreature::s_nCount, 6);
112
+
ok_int(CSimpleCreature::s_nCopyCount, 0);
113
113
114
-
CCreature creature1;
115
-
ok_int(CCreature::s_nCount, 7);
116
-
ok_int(CCreature::s_nCopyCount, 0);
114
+
CSimpleCreature creature1;
115
+
ok_int(CSimpleCreature::s_nCount, 7);
116
+
ok_int(CSimpleCreature::s_nCopyCount, 0);
117
117
118
118
array4.Add(creature1);
119
-
ok_int(CCreature::s_nCount, 8);
120
-
ok_int(CCreature::s_nCopyCount, 0);
119
+
ok_int(CSimpleCreature::s_nCount, 8);
120
+
ok_int(CSimpleCreature::s_nCopyCount, 0);
121
121
122
122
array3 = array4;
123
-
ok_int(CCreature::s_nCount, 9);
124
-
ok_int(CCreature::s_nCopyCount, 0);
123
+
ok_int(CSimpleCreature::s_nCount, 9);
124
+
ok_int(CSimpleCreature::s_nCopyCount, 0);
125
125
126
126
array5 = array2;
127
-
ok_int(CCreature::s_nCount, 11);
128
-
ok_int(CCreature::s_nCopyCount, 0);
127
+
ok_int(CSimpleCreature::s_nCount, 11);
128
+
ok_int(CSimpleCreature::s_nCopyCount, 0);
129
129
130
130
array5 = array2;
131
-
ok_int(CCreature::s_nCount, 11);
132
-
ok_int(CCreature::s_nCopyCount, 0);
131
+
ok_int(CSimpleCreature::s_nCount, 11);
132
+
ok_int(CSimpleCreature::s_nCopyCount, 0);
133
133
}
134
-
ok_int(CCreature::s_nCount, 2);
135
-
ok_int(CCreature::s_nCopyCount, 0);
134
+
ok_int(CSimpleCreature::s_nCount, 2);
135
+
ok_int(CSimpleCreature::s_nCopyCount, 0);
136
136
137
137
array2.RemoveAll();
138
-
ok_int(CCreature::s_nCount, 0);
139
-
ok_int(CCreature::s_nCopyCount, 0);
138
+
ok_int(CSimpleCreature::s_nCount, 0);
139
+
ok_int(CSimpleCreature::s_nCopyCount, 0);
140
140
141
141
array1.RemoveAll();
142
142
ok_int(array1.GetSize(), 0);