1
0
Fork 0

Fix tests build

This commit is contained in:
James Turner 2021-08-04 15:10:18 +01:00
parent 01216e4c19
commit 18e7bfc4b0

View file

@ -67,7 +67,7 @@ void OptionsTests::testLoadDefaultAircraft()
}
fgInitAircraftPaths(false);
fgInitAircraft(false);
fgInitAircraft(false, false);
CPPUNIT_ASSERT_EQUAL("c172p"s, string{fgGetString("/sim/aircraft")});
CPPUNIT_ASSERT_EQUAL("c172p"s, string{fgGetString("/sim/aircraft-id")});
@ -89,7 +89,7 @@ void OptionsTests::testOptionAircraftWithAircraftDir()
}
fgInitAircraftPaths(false);
fgInitAircraft(false);
fgInitAircraft(false, false);
CPPUNIT_ASSERT_EQUAL("ufo"s, string{fgGetString("/sim/aircraft")});
CPPUNIT_ASSERT_EQUAL("ufo"s, string{fgGetString("/sim/aircraft-id")});
@ -111,7 +111,7 @@ void OptionsTests::testOptionAircraftWithFGAircraft()
}
fgInitAircraftPaths(false);
fgInitAircraft(false);
fgInitAircraft(false, false);
CPPUNIT_ASSERT_EQUAL("ufo"s, string{fgGetString("/sim/aircraft")});
CPPUNIT_ASSERT_EQUAL("ufo"s, string{fgGetString("/sim/aircraft-id")});
@ -136,7 +136,7 @@ void OptionsTests::testOptionAircraftUnqualified()
}
fgInitAircraftPaths(false);
fgInitAircraft(false);
fgInitAircraft(false, false);
CPPUNIT_ASSERT_EQUAL("bob"s, string{fgGetString("/sim/aircraft")});
CPPUNIT_ASSERT_EQUAL("org.fg.test.catalog1.bob"s, string{fgGetString("/sim/aircraft-id")});
@ -161,7 +161,7 @@ void OptionsTests::testOptionAircraftFullyQualified()
}
fgInitAircraftPaths(false);
fgInitAircraft(false);
fgInitAircraft(false, false);
CPPUNIT_ASSERT_EQUAL("bob"s, string{fgGetString("/sim/aircraft")});
CPPUNIT_ASSERT_EQUAL("org.fg.test.catalog1.bob"s, string{fgGetString("/sim/aircraft-id")});