Skip to content

Commit 4f61e97

Browse files
PKEuSPKEuS
committed
Fixed VS warnings in testsymboldatabase.cpp
1 parent d3dbfad commit 4f61e97

1 file changed

Lines changed: 114 additions & 74 deletions

File tree

‎test/testsymboldatabase.cpp‎

Lines changed: 114 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -2245,114 +2245,154 @@ class TestSymbolDatabase: public TestFixture {
22452245
void varTypesIntegral() {
22462246
GET_SYMBOL_DB("void f() { bool b; char c; unsigned char uc; short s; unsigned short us; int i; unsigned u; unsigned int ui; long l; unsigned long ul; long long ll; }");
22472247
const Variable *b = db->getVariableFromVarId(1);
2248-
ASSERT(b);
2249-
ASSERT_EQUALS("b", b->nameToken()->str());
2250-
ASSERT_EQUALS(true, b->isIntegralType());
2251-
ASSERT_EQUALS(false, b->isFloatingType());
2248+
ASSERT(b != nullptr);
2249+
if (b) {
2250+
ASSERT_EQUALS("b", b->nameToken()->str());
2251+
ASSERT_EQUALS(true, b->isIntegralType());
2252+
ASSERT_EQUALS(false, b->isFloatingType());
2253+
}
22522254
const Variable *c = db->getVariableFromVarId(2);
2253-
ASSERT(c);
2254-
ASSERT_EQUALS("c", c->nameToken()->str());
2255-
ASSERT_EQUALS(true, c->isIntegralType());
2256-
ASSERT_EQUALS(false, c->isFloatingType());
2255+
ASSERT(c != nullptr);
2256+
if (c) {
2257+
ASSERT_EQUALS("c", c->nameToken()->str());
2258+
ASSERT_EQUALS(true, c->isIntegralType());
2259+
ASSERT_EQUALS(false, c->isFloatingType());
2260+
}
22572261
const Variable *uc = db->getVariableFromVarId(3);
2258-
ASSERT(uc);
2259-
ASSERT_EQUALS("uc", uc->nameToken()->str());
2260-
ASSERT_EQUALS(true, uc->isIntegralType());
2261-
ASSERT_EQUALS(false, uc->isFloatingType());
2262+
ASSERT(uc != nullptr);
2263+
if (uc) {
2264+
ASSERT_EQUALS("uc", uc->nameToken()->str());
2265+
ASSERT_EQUALS(true, uc->isIntegralType());
2266+
ASSERT_EQUALS(false, uc->isFloatingType());
2267+
}
22622268
const Variable *s = db->getVariableFromVarId(4);
2263-
ASSERT(s);
2264-
ASSERT_EQUALS("s", s->nameToken()->str());
2265-
ASSERT_EQUALS(true, s->isIntegralType());
2266-
ASSERT_EQUALS(false, s->isFloatingType());
2269+
ASSERT(s != nullptr);
2270+
if (s) {
2271+
ASSERT_EQUALS("s", s->nameToken()->str());
2272+
ASSERT_EQUALS(true, s->isIntegralType());
2273+
ASSERT_EQUALS(false, s->isFloatingType());
2274+
}
22672275
const Variable *us = db->getVariableFromVarId(5);
2268-
ASSERT(us);
2269-
ASSERT_EQUALS("us", us->nameToken()->str());
2270-
ASSERT_EQUALS(true, us->isIntegralType());
2271-
ASSERT_EQUALS(false, us->isFloatingType());
2276+
ASSERT(us != nullptr);
2277+
if (us) {
2278+
ASSERT_EQUALS("us", us->nameToken()->str());
2279+
ASSERT_EQUALS(true, us->isIntegralType());
2280+
ASSERT_EQUALS(false, us->isFloatingType());
2281+
}
22722282
const Variable *i = db->getVariableFromVarId(6);
2273-
ASSERT(i);
2274-
ASSERT_EQUALS("i", i->nameToken()->str());
2275-
ASSERT_EQUALS(true, i->isIntegralType());
2276-
ASSERT_EQUALS(false, i->isFloatingType());
2283+
ASSERT(i != nullptr);
2284+
if (i) {
2285+
ASSERT_EQUALS("i", i->nameToken()->str());
2286+
ASSERT_EQUALS(true, i->isIntegralType());
2287+
ASSERT_EQUALS(false, i->isFloatingType());
2288+
}
22772289
const Variable *u = db->getVariableFromVarId(7);
2278-
ASSERT(u);
2279-
ASSERT_EQUALS("u", u->nameToken()->str());
2280-
ASSERT_EQUALS(true, u->isIntegralType());
2281-
ASSERT_EQUALS(false, u->isFloatingType());
2290+
ASSERT(u != nullptr);
2291+
if (u) {
2292+
ASSERT_EQUALS("u", u->nameToken()->str());
2293+
ASSERT_EQUALS(true, u->isIntegralType());
2294+
ASSERT_EQUALS(false, u->isFloatingType());
2295+
}
22822296
const Variable *ui = db->getVariableFromVarId(8);
2283-
ASSERT(ui);
2284-
ASSERT_EQUALS("ui", ui->nameToken()->str());
2285-
ASSERT_EQUALS(true, ui->isIntegralType());
2286-
ASSERT_EQUALS(false, ui->isFloatingType());
2297+
ASSERT(ui != nullptr);
2298+
if (ui) {
2299+
ASSERT_EQUALS("ui", ui->nameToken()->str());
2300+
ASSERT_EQUALS(true, ui->isIntegralType());
2301+
ASSERT_EQUALS(false, ui->isFloatingType());
2302+
}
22872303
const Variable *l = db->getVariableFromVarId(9);
2288-
ASSERT(l);
2289-
ASSERT_EQUALS("l", l->nameToken()->str());
2290-
ASSERT_EQUALS(true, l->isIntegralType());
2291-
ASSERT_EQUALS(false, l->isFloatingType());
2304+
ASSERT(l != nullptr);
2305+
if (l) {
2306+
ASSERT_EQUALS("l", l->nameToken()->str());
2307+
ASSERT_EQUALS(true, l->isIntegralType());
2308+
ASSERT_EQUALS(false, l->isFloatingType());
2309+
}
22922310
const Variable *ul = db->getVariableFromVarId(10);
2293-
ASSERT(ul);
2294-
ASSERT_EQUALS("ul", ul->nameToken()->str());
2295-
ASSERT_EQUALS(true, ul->isIntegralType());
2296-
ASSERT_EQUALS(false, ul->isFloatingType());
2311+
ASSERT(ul != nullptr);
2312+
if (ul) {
2313+
ASSERT_EQUALS("ul", ul->nameToken()->str());
2314+
ASSERT_EQUALS(true, ul->isIntegralType());
2315+
ASSERT_EQUALS(false, ul->isFloatingType());
2316+
}
22972317
const Variable *ll = db->getVariableFromVarId(11);
2298-
ASSERT(ui);
2299-
ASSERT_EQUALS("ll", ll->nameToken()->str());
2300-
ASSERT_EQUALS(true, ll->isIntegralType());
2301-
ASSERT_EQUALS(false, ll->isFloatingType());
2318+
ASSERT(ui != nullptr);
2319+
if (ui) {
2320+
ASSERT_EQUALS("ll", ll->nameToken()->str());
2321+
ASSERT_EQUALS(true, ll->isIntegralType());
2322+
ASSERT_EQUALS(false, ll->isFloatingType());
2323+
}
23022324
}
23032325

23042326
void varTypesFloating() {
23052327
{
23062328
GET_SYMBOL_DB("void f() { float f; double d; long double ld; }");
23072329
const Variable *f = db->getVariableFromVarId(1);
2308-
ASSERT(f);
2309-
ASSERT_EQUALS("f", f->nameToken()->str());
2310-
ASSERT_EQUALS(false, f->isIntegralType());
2311-
ASSERT_EQUALS(true, f->isFloatingType());
2330+
ASSERT(f != nullptr);
2331+
if (f) {
2332+
ASSERT_EQUALS("f", f->nameToken()->str());
2333+
ASSERT_EQUALS(false, f->isIntegralType());
2334+
ASSERT_EQUALS(true, f->isFloatingType());
2335+
}
23122336
const Variable *d = db->getVariableFromVarId(2);
2313-
ASSERT(d);
2314-
ASSERT_EQUALS("d", d->nameToken()->str());
2315-
ASSERT_EQUALS(false, d->isIntegralType());
2316-
ASSERT_EQUALS(true, d->isFloatingType());
2337+
ASSERT(d != nullptr);
2338+
if (d) {
2339+
ASSERT_EQUALS("d", d->nameToken()->str());
2340+
ASSERT_EQUALS(false, d->isIntegralType());
2341+
ASSERT_EQUALS(true, d->isFloatingType());
2342+
}
23172343
const Variable *ld = db->getVariableFromVarId(3);
2318-
ASSERT(ld);
2319-
ASSERT_EQUALS("ld", ld->nameToken()->str());
2320-
ASSERT_EQUALS(false, ld->isIntegralType());
2321-
ASSERT_EQUALS(true, ld->isFloatingType());
2344+
ASSERT(ld != nullptr);
2345+
if (ld) {
2346+
ASSERT_EQUALS("ld", ld->nameToken()->str());
2347+
ASSERT_EQUALS(false, ld->isIntegralType());
2348+
ASSERT_EQUALS(true, ld->isFloatingType());
2349+
}
23222350
}
23232351
{
23242352
GET_SYMBOL_DB("void f() { float * f; static const float * scf; }");
23252353
const Variable *f = db->getVariableFromVarId(1);
2326-
ASSERT(f);
2327-
ASSERT_EQUALS("f", f->nameToken()->str());
2328-
ASSERT_EQUALS(false, f->isIntegralType());
2329-
ASSERT_EQUALS(false, f->isFloatingType());
2354+
ASSERT(f != nullptr);
2355+
if (f) {
2356+
ASSERT_EQUALS("f", f->nameToken()->str());
2357+
ASSERT_EQUALS(false, f->isIntegralType());
2358+
ASSERT_EQUALS(false, f->isFloatingType());
2359+
}
23302360
const Variable *scf = db->getVariableFromVarId(2);
2331-
ASSERT(scf);
2332-
ASSERT_EQUALS("scf", scf->nameToken()->str());
2333-
ASSERT_EQUALS(false, scf->isIntegralType());
2334-
ASSERT_EQUALS(false, scf->isFloatingType());
2361+
ASSERT(scf != nullptr);
2362+
if (scf) {
2363+
ASSERT_EQUALS("scf", scf->nameToken()->str());
2364+
ASSERT_EQUALS(false, scf->isIntegralType());
2365+
ASSERT_EQUALS(false, scf->isFloatingType());
2366+
}
23352367
}
23362368
{
23372369
GET_SYMBOL_DB("void f() { float fa[42]; }");
23382370
const Variable *fa = db->getVariableFromVarId(1);
2339-
ASSERT(fa);
2340-
ASSERT_EQUALS("fa", fa->nameToken()->str());
2341-
ASSERT_EQUALS(false, fa->isIntegralType());
2342-
ASSERT_EQUALS(false, fa->isFloatingType());
2371+
ASSERT(fa != nullptr);
2372+
if (fa) {
2373+
ASSERT_EQUALS("fa", fa->nameToken()->str());
2374+
ASSERT_EQUALS(false, fa->isIntegralType());
2375+
ASSERT_EQUALS(false, fa->isFloatingType());
2376+
}
23432377
}
23442378
}
23452379

23462380
void varTypesOther() {
23472381
GET_SYMBOL_DB("void f() { class A {} a; void *b; }");
23482382
const Variable *a = db->getVariableFromVarId(1);
2349-
ASSERT_EQUALS("a", a->nameToken()->str());
2350-
ASSERT_EQUALS(false, a->isIntegralType());
2351-
ASSERT_EQUALS(false, a->isFloatingType());
2383+
ASSERT(a != nullptr);
2384+
if (a) {
2385+
ASSERT_EQUALS("a", a->nameToken()->str());
2386+
ASSERT_EQUALS(false, a->isIntegralType());
2387+
ASSERT_EQUALS(false, a->isFloatingType());
2388+
}
23522389
const Variable *b = db->getVariableFromVarId(2);
2353-
ASSERT_EQUALS("b", b->nameToken()->str());
2354-
ASSERT_EQUALS(false, b->isIntegralType());
2355-
ASSERT_EQUALS(false, b->isFloatingType());
2390+
ASSERT(b != nullptr);
2391+
if (b) {
2392+
ASSERT_EQUALS("b", b->nameToken()->str());
2393+
ASSERT_EQUALS(false, b->isIntegralType());
2394+
ASSERT_EQUALS(false, b->isFloatingType());
2395+
}
23562396
}
23572397
};
23582398

0 commit comments

Comments
 (0)