Skip to content

Commit 836a044

Browse files
Kronos3Kronos3
authored
Array toString() delimited with comma (#3626)
* Array toString() delimited with comma * Bump FPP
1 parent 952e7cf commit 836a044

3 files changed

Lines changed: 88 additions & 43 deletions

File tree

‎FppTest/array/ArrayToStringTest.cpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,12 @@ TYPED_TEST(ArrayToStringTest, ToString) {
5353

5454
buf2 << "[ ";
5555
for (U32 i = 0; i < TypeParam::SIZE; i++) {
56-
buf2 << this->testVals[i] << " ";
56+
if (i > 0) {
57+
buf2 << ", ";
58+
}
59+
buf2 << this->testVals[i];
5760
}
58-
buf2 << "]";
61+
buf2 << " ]";
5962

6063
ASSERT_STREQ(
6164
buf1.str().c_str(),

‎FppTest/array/FormatTest.cpp‎

Lines changed: 70 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,12 @@ TEST_F(FormatTest, Bool) {
4747

4848
buf1 << a;
4949
for (U32 i = 0; i < FormatBool::SIZE; i++) {
50-
buf2 << "a " << testVals[i] << " b ";
50+
if (i > 0) {
51+
buf2 << ", ";
52+
}
53+
buf2 << "a " << testVals[i] << " b";
5154
}
52-
buf2 << "]";
55+
buf2 << " ]";
5356

5457
ASSERT_STREQ(
5558
buf1.str().c_str(),
@@ -63,9 +66,12 @@ TEST_F(FormatTest, U8) {
6366

6467
buf1 << a;
6568
for (U32 i = 0; i < FormatU8::SIZE; i++) {
66-
buf2 << "a " << static_cast<U16>(testVals[i]) << " b ";
69+
if (i > 0) {
70+
buf2 << ", ";
71+
}
72+
buf2 << "a " << static_cast<U16>(testVals[i]) << " b";
6773
}
68-
buf2 << "]";
74+
buf2 << " ]";
6975

7076
ASSERT_STREQ(
7177
buf1.str().c_str(),
@@ -79,9 +85,12 @@ TEST_F(FormatTest, U16Dec) {
7985

8086
buf1 << a;
8187
for (U32 i = 0; i < FormatU16Dec::SIZE; i++) {
82-
buf2 << "a " << std::dec << testVals[i] << " b ";
88+
if (i > 0) {
89+
buf2 << ", ";
90+
}
91+
buf2 << "a " << std::dec << testVals[i] << " b";
8392
}
84-
buf2 << "]";
93+
buf2 << " ]";
8594

8695
ASSERT_STREQ(
8796
buf1.str().c_str(),
@@ -95,9 +104,12 @@ TEST_F(FormatTest, U32Oct) {
95104

96105
buf1 << a;
97106
for (U32 i = 0; i < FormatU32Oct::SIZE; i++) {
98-
buf2 << "a " << std::oct << testVals[i] << " b ";
107+
if (i > 0) {
108+
buf2 << ", ";
109+
}
110+
buf2 << "a " << std::oct << testVals[i] << " b";
99111
}
100-
buf2 << "]";
112+
buf2 << " ]";
101113

102114
ASSERT_STREQ(
103115
buf1.str().c_str(),
@@ -112,9 +124,12 @@ TEST_F(FormatTest, U64Hex) {
112124

113125
buf1 << a;
114126
for (U32 i = 0; i < FormatU64Hex::SIZE; i++) {
115-
buf2 << "a " << std::hex << testVals[i] << " b ";
127+
if (i > 0) {
128+
buf2 << ", ";
129+
}
130+
buf2 << "a " << std::hex << testVals[i] << " b";
116131
}
117-
buf2 << "]";
132+
buf2 << " ]";
118133

119134
ASSERT_STREQ(
120135
buf1.str().c_str(),
@@ -129,9 +144,12 @@ TEST_F(FormatTest, I8) {
129144

130145
buf1 << a;
131146
for (U32 i = 0; i < FormatI8::SIZE; i++) {
132-
buf2 << "a " << static_cast<I16>(testVals[i]) << " b ";
147+
if (i > 0) {
148+
buf2 << ", ";
149+
}
150+
buf2 << "a " << static_cast<I16>(testVals[i]) << " b";
133151
}
134-
buf2 << "]";
152+
buf2 << " ]";
135153

136154
ASSERT_STREQ(
137155
buf1.str().c_str(),
@@ -146,9 +164,12 @@ TEST_F(FormatTest, I16Dec) {
146164

147165
buf1 << a;
148166
for (U32 i = 0; i < FormatI16Dec::SIZE; i++) {
149-
buf2 << "a " << std::dec << testVals[i] << " b ";
167+
if (i > 0) {
168+
buf2 << ", ";
169+
}
170+
buf2 << "a " << std::dec << testVals[i] << " b";
150171
}
151-
buf2 << "]";
172+
buf2 << " ]";
152173

153174
ASSERT_STREQ(
154175
buf1.str().c_str(),
@@ -163,9 +184,12 @@ TEST_F(FormatTest, I32Oct) {
163184

164185
buf1 << a;
165186
for (U32 i = 0; i < FormatI32Oct::SIZE; i++) {
166-
buf2 << "a " << std::oct << testVals[i] << " b ";
187+
if (i > 0) {
188+
buf2 << ", ";
189+
}
190+
buf2 << "a " << std::oct << testVals[i] << " b";
167191
}
168-
buf2 << "]";
192+
buf2 << " ]";
169193

170194
ASSERT_STREQ(
171195
buf1.str().c_str(),
@@ -181,9 +205,12 @@ TEST_F(FormatTest, I64Hex) {
181205

182206
buf1 << a;
183207
for (U32 i = 0; i < FormatI64Hex::SIZE; i++) {
184-
buf2 << "a " << std::hex << testVals[i] << " b ";
208+
if (i > 0) {
209+
buf2 << ", ";
210+
}
211+
buf2 << "a " << std::hex << testVals[i] << " b";
185212
}
186-
buf2 << "]";
213+
buf2 << " ]";
187214

188215
ASSERT_STREQ(
189216
buf1.str().c_str(),
@@ -198,9 +225,12 @@ TEST_F(FormatTest, F32E) {
198225

199226
buf1 << a;
200227
for (U32 i = 0; i < FormatF32e::SIZE; i++) {
201-
buf2 << "a " << std::setprecision(1) << std::scientific << testVals[i] << " b ";
228+
if (i > 0) {
229+
buf2 << ", ";
230+
}
231+
buf2 << "a " << std::setprecision(1) << std::scientific << testVals[i] << " b";
202232
}
203-
buf2 << "]";
233+
buf2 << " ]";
204234

205235
ASSERT_STREQ(
206236
buf1.str().c_str(),
@@ -215,9 +245,12 @@ TEST_F(FormatTest, F32F) {
215245

216246
buf1 << a;
217247
for (U32 i = 0; i < FormatF32f::SIZE; i++) {
218-
buf2 << "a " << std::setprecision(2) << std::fixed << testVals[i] << " b ";
248+
if (i > 0) {
249+
buf2 << ", ";
250+
}
251+
buf2 << "a " << std::setprecision(2) << std::fixed << testVals[i] << " b";
219252
}
220-
buf2 << "]";
253+
buf2 << " ]";
221254

222255
ASSERT_STREQ(
223256
buf1.str().c_str(),
@@ -232,9 +265,12 @@ TEST_F(FormatTest, F64G) {
232265

233266
buf1 << a;
234267
for (U32 i = 0; i < FormatF64g::SIZE; i++) {
235-
buf2 << "a " << std::setprecision(3) << testVals[i] << " b ";
268+
if (i > 0) {
269+
buf2 << ", ";
270+
}
271+
buf2 << "a " << std::setprecision(3) << testVals[i] << " b";
236272
}
237-
buf2 << "]";
273+
buf2 << " ]";
238274

239275
ASSERT_STREQ(
240276
buf1.str().c_str(),
@@ -254,9 +290,12 @@ TEST_F(FormatTest, String) {
254290

255291
buf1 << a;
256292
for (U32 i = 0; i < FormatString::SIZE; i++) {
257-
buf2 << "% " << testVals[i].toChar() << " ";
293+
if (i > 0) {
294+
buf2 << ", ";
295+
}
296+
buf2 << "% " << testVals[i].toChar();
258297
}
259-
buf2 << "]";
298+
buf2 << " ]";
260299

261300
ASSERT_STREQ(
262301
buf1.str().c_str(),
@@ -271,9 +310,12 @@ TEST_F(FormatTest, Char) {
271310

272311
buf1 << a;
273312
for (U32 i = 0; i < FormatChar::SIZE; i++) {
274-
buf2 << "a " << testVals[i] << " b ";
313+
if (i > 0) {
314+
buf2 << ", ";
315+
}
316+
buf2 << "a " << testVals[i] << " b";
275317
}
276-
buf2 << "]";
318+
buf2 << " ]";
277319

278320
ASSERT_STREQ(
279321
buf1.str().c_str(),

‎requirements.txt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ fprime-fpl-convert-xml==1.0.3
2222
fprime-fpl-extract-xml==1.0.3
2323
fprime-fpl-layout==1.0.3
2424
fprime-fpl-write-pic==1.0.3
25-
fprime-fpp-check==3.0.0a10
26-
fprime-fpp-depend==3.0.0a10
27-
fprime-fpp-filenames==3.0.0a10
28-
fprime-fpp-format==3.0.0a10
29-
fprime-fpp-from-xml==3.0.0a10
30-
fprime-fpp-locate-defs==3.0.0a10
31-
fprime-fpp-locate-uses==3.0.0a10
32-
fprime-fpp-syntax==3.0.0a10
33-
fprime-fpp-to-cpp==3.0.0a10
34-
fprime-fpp-to-dict==3.0.0a10
35-
fprime-fpp-to-json==3.0.0a10
36-
fprime-fpp-to-xml==3.0.0a10
37-
fprime-fpp-to-layout==3.0.0a10
25+
fprime-fpp-check==3.0.0a11
26+
fprime-fpp-depend==3.0.0a11
27+
fprime-fpp-filenames==3.0.0a11
28+
fprime-fpp-format==3.0.0a11
29+
fprime-fpp-from-xml==3.0.0a11
30+
fprime-fpp-locate-defs==3.0.0a11
31+
fprime-fpp-locate-uses==3.0.0a11
32+
fprime-fpp-syntax==3.0.0a11
33+
fprime-fpp-to-cpp==3.0.0a11
34+
fprime-fpp-to-dict==3.0.0a11
35+
fprime-fpp-to-json==3.0.0a11
36+
fprime-fpp-to-xml==3.0.0a11
37+
fprime-fpp-to-layout==3.0.0a11
3838
fprime-gds==4.0.0a1
3939
fprime-tools==4.0.0a1
4040
fprime-visual==1.0.2

0 commit comments

Comments
 (0)