Skip to content

Commit aac6f39

Browse files
fphammerleWanzenBug
authored andcommitted
Revert "replace gtest macro TEST_F with TEST to fix clang-tidy warning cppcoreguidelines-owning-memory"
This reverts commit bbebd82.
1 parent f637967 commit aac6f39

File tree

2 files changed

+33
-28
lines changed

2 files changed

+33
-28
lines changed

.clang-tidy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# https://clang.llvm.org/extra/clang-tidy/checks/list.html
22

33
# gtest's TEST & TEST_F trigger
4+
# - cppcoreguidelines-owning-memory (TEST_F only)
45
# - cppcoreguidelines-special-member-functions
56
# - modernize-use-equals-delete
67

@@ -11,6 +12,7 @@ Checks: >-
1112
bugprone-*,
1213
cppcoreguidelines-*,
1314
-cppcoreguidelines-avoid-goto,
15+
-cppcoreguidelines-owning-memory,
1416
-cppcoreguidelines-special-member-functions,
1517
misc-*,
1618
modernize-*,

tests/HdfFileTest.cpp

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,38 @@
77

88
using namespace hdf4cpp;
99

10-
const HdfFile file{TEST_DATA_PATH "small_test.hdf"};
10+
class HdfFileTest : public ::testing::Test {
11+
protected:
12+
HdfFile file{TEST_DATA_PATH "small_test.hdf"};
13+
};
1114

12-
TEST(HdfFileTest, DatasetValidity) {
15+
TEST_F(HdfFileTest, DatasetValidity) {
1316
ASSERT_NO_THROW(file.get("Data"));
1417
}
1518

16-
TEST(HdfFileTest, GroupValidity) {
19+
TEST_F(HdfFileTest, GroupValidity) {
1720
ASSERT_NO_THROW(file.get("Group"));
1821
}
1922

20-
TEST(HdfFileTest, InvalidItem) {
23+
TEST_F(HdfFileTest, InvalidItem) {
2124
ASSERT_THROW(file.get("InvalidKey"), HdfException);
2225
}
2326

24-
TEST(HdfFileTest, ReadData1) {
27+
TEST_F(HdfFileTest, ReadData1) {
2528
HdfItem item = file.get("Data");
2629
std::vector<int32> vec;
2730
item.read(vec);
2831
ASSERT_EQ(vec, std::vector<int32>({1, 2, 3, 4, 5, 6, 7, 8, 9}));
2932
}
3033

31-
TEST(HdfFileTest, ReadData2) {
34+
TEST_F(HdfFileTest, ReadData2) {
3235
HdfItem item = file.get("DataWithAttributes");
3336
std::vector<float32> vec;
3437
item.read(vec);
3538
ASSERT_EQ(vec, std::vector<float32>({0.0f, 0.1f, 0.2f, 1.0f, 1.1f, 1.2f, 2.0f, 2.1f, 2.2f}));
3639
}
3740

38-
TEST(HdfFileTest, ReadDatasetAttributes) {
41+
TEST_F(HdfFileTest, ReadDatasetAttributes) {
3942
HdfItem item = file.get("DataWithAttributes");
4043

4144
HdfAttribute attribute1 = item.getAttribute("Integer");
@@ -49,7 +52,7 @@ TEST(HdfFileTest, ReadDatasetAttributes) {
4952
ASSERT_EQ(integers, std::vector<int32>({1, 12, 123, 1234, 12345}));
5053
}
5154

52-
TEST(HdfFileTest, ReadGroupAttributes) {
55+
TEST_F(HdfFileTest, ReadGroupAttributes) {
5356
HdfItem item = file.get("GroupWithOnlyAttribute");
5457

5558
{
@@ -74,11 +77,11 @@ TEST(HdfFileTest, ReadGroupAttributes) {
7477
}
7578
}
7679

77-
TEST(HdfFileTest, ReadInvalidData) {
80+
TEST_F(HdfFileTest, ReadInvalidData) {
7881
ASSERT_THROW(file.get("InvalidKey"), HdfException);
7982
}
8083

81-
TEST(HdfFileTest, ReadDataInRange) {
84+
TEST_F(HdfFileTest, ReadDataInRange) {
8285
{
8386
HdfItem item = file.get("Data");
8487
std::vector<int32> vec;
@@ -93,17 +96,17 @@ TEST(HdfFileTest, ReadDataInRange) {
9396
}
9497
}
9598

96-
TEST(HdfFileTest, ReadInvalidDatasetAttribute) {
99+
TEST_F(HdfFileTest, ReadInvalidDatasetAttribute) {
97100
HdfItem item = file.get("Data");
98101
ASSERT_THROW(HdfAttribute attribute = item.getAttribute("Attribute"), HdfException);
99102
}
100103

101-
TEST(HdfFileTest, ReadInvalidGroupAttribute) {
104+
TEST_F(HdfFileTest, ReadInvalidGroupAttribute) {
102105
HdfItem item = file.get("Group");
103106
ASSERT_THROW(HdfAttribute attribute = item.getAttribute("Attribute"), HdfException);
104107
}
105108

106-
TEST(HdfFileTest, GetAllDatsetsWithTheSameName) {
109+
TEST_F(HdfFileTest, GetAllDatsetsWithTheSameName) {
107110
std::vector<HdfItem> items = file.getAll("DoubleDataset");
108111
ASSERT_EQ(items.size(), 4);
109112
std::vector<int32> vec;
@@ -113,34 +116,34 @@ TEST(HdfFileTest, GetAllDatsetsWithTheSameName) {
113116
ASSERT_EQ(vec, std::vector<int32>({0, 1}));
114117
}
115118

116-
TEST(HdfFileTest, DatasetTypeIncompatibility) {
119+
TEST_F(HdfFileTest, DatasetTypeIncompatibility) {
117120
std::vector<std::string> vec;
118121
HdfItem item = file.get("Data");
119122
ASSERT_THROW(item.read(vec), HdfException);
120123
}
121124

122-
TEST(HdfFileTest, DatasetAttributeTypeIncompatibility) {
125+
TEST_F(HdfFileTest, DatasetAttributeTypeIncompatibility) {
123126
std::vector<std::string> vec;
124127
HdfItem item = file.get("DataWithAttributes");
125128
HdfAttribute attribute = item.getAttribute("Integer");
126129
ASSERT_THROW(attribute.get(vec), HdfException);
127130
}
128131

129-
TEST(HdfFileTest, GroupAttributeTypeIncompatibility) {
132+
TEST_F(HdfFileTest, GroupAttributeTypeIncompatibility) {
130133
std::vector<std::string> vec;
131134
HdfItem item = file.get("GroupWithOnlyAttribute");
132135
HdfAttribute attribute = item.getAttribute("Egy");
133136
ASSERT_THROW(attribute.get(vec), HdfException);
134137
}
135138

136-
TEST(HdfFileTest, GlobalAttribute) {
139+
TEST_F(HdfFileTest, GlobalAttribute) {
137140
std::vector<int8> vec;
138141
HdfAttribute attribute = file.getAttribute("GlobalAttribute");
139142
attribute.get(vec);
140143
ASSERT_EQ(vec, std::vector<int8>({11, 22}));
141144
}
142145

143-
TEST(HdfFileTest, FileIterator) {
146+
TEST_F(HdfFileTest, FileIterator) {
144147
std::ostringstream out;
145148
for (auto it : file) {
146149
out << it.getName() << '*';
@@ -149,7 +152,7 @@ TEST(HdfFileTest, FileIterator) {
149152
"small_test.hdf*Egy*One*Ein*Vdata*attribute*"));
150153
}
151154

152-
TEST(HdfFileTest, GroupIterator) {
155+
TEST_F(HdfFileTest, GroupIterator) {
153156
HdfItem item = file.get("Group");
154157
std::ostringstream out;
155158
for (auto it : item) {
@@ -158,7 +161,7 @@ TEST(HdfFileTest, GroupIterator) {
158161
ASSERT_EQ(out.str(), "Data*DataWithAttributes*");
159162
}
160163

161-
TEST(HdfFileTest, IteratingOverNonGroupItems) {
164+
TEST_F(HdfFileTest, IteratingOverNonGroupItems) {
162165
std::ostringstream out;
163166
HdfItem sdata = file.get("DoubleDataset");
164167
for (const auto &item : sdata) {
@@ -171,25 +174,25 @@ TEST(HdfFileTest, IteratingOverNonGroupItems) {
171174
ASSERT_TRUE(out.str().empty());
172175
}
173176

174-
TEST(HdfFileTest, ItemIterator3) {
177+
TEST_F(HdfFileTest, ItemIterator3) {
175178
auto it = file.begin();
176179
HdfItem item = *it;
177180
ASSERT_EQ(item.getName(), "Group");
178181
}
179182

180-
TEST(HdfFileTest, HiddenGroup) {
183+
TEST_F(HdfFileTest, HiddenGroup) {
181184
ASSERT_NO_THROW(file.get("RIG0.0"));
182185
}
183186

184-
TEST(HdfFileTest, VDataRead1) {
187+
TEST_F(HdfFileTest, VDataRead1) {
185188
HdfItem item = file.get("Vdata");
186189
ASSERT_EQ(item.getName(), "Vdata");
187190
std::vector<int32> vec;
188191
item.read(vec, "age");
189192
ASSERT_EQ(vec, std::vector<int32>({39, 19, 55}));
190193
}
191194

192-
TEST(HdfFileTest, VDataRead2) {
195+
TEST_F(HdfFileTest, VDataRead2) {
193196
HdfItem item = file.get("Vdata");
194197
ASSERT_EQ(item.getName(), "Vdata");
195198
std::vector<std::vector<char>> vec;
@@ -201,7 +204,7 @@ TEST(HdfFileTest, VDataRead2) {
201204
}
202205
}
203206

204-
TEST(HdfFileTest, VDataAttributes) {
207+
TEST_F(HdfFileTest, VDataAttributes) {
205208
HdfItem item = file.get("Vdata");
206209
ASSERT_EQ(item.getName(), "Vdata");
207210
HdfAttribute attribute = item.getAttribute("attribute");
@@ -210,21 +213,21 @@ TEST(HdfFileTest, VDataAttributes) {
210213
ASSERT_EQ(vec, std::vector<int32>({1, 2, 3, 3, 2, 1}));
211214
}
212215

213-
TEST(HdfFileTest, SdataDestroyer) {
216+
TEST_F(HdfFileTest, SdataDestroyer) {
214217
HdfAttribute attribute = file.get("DataWithAttributes").getAttribute("Integer");
215218
std::vector<int32> vec;
216219
attribute.get(vec);
217220
ASSERT_EQ(vec, std::vector<int32>({12345}));
218221
}
219222

220-
TEST(HdfFileTest, VgroupDestroyer) {
223+
TEST_F(HdfFileTest, VgroupDestroyer) {
221224
HdfAttribute attribute = file.get("GroupWithOnlyAttribute").getAttribute("Egy");
222225
std::vector<int8> vec;
223226
attribute.get(vec);
224227
ASSERT_EQ(vec, std::vector<int8>({1}));
225228
}
226229

227-
TEST(HdfFileTest, VdataDestroyer) {
230+
TEST_F(HdfFileTest, VdataDestroyer) {
228231
HdfAttribute attribute = file.get("Vdata").getAttribute("attribute");
229232
std::vector<int32> vec;
230233
attribute.get(vec);

0 commit comments

Comments
 (0)