Skip to content

Commit 1261441

Browse files
committed
Fix test failures.
1 parent f6396a8 commit 1261441

File tree

1 file changed

+24
-3
lines changed

1 file changed

+24
-3
lines changed

Cesium3DTilesSelection/test/TestTilesetContentManager.cpp

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,8 @@ TEST_CASE("Test tile state machine") {
496496
std::move(pMockedLoader),
497497
std::move(pRootTile)};
498498

499+
pManager->waitUntilIdle();
500+
499501
// test manager loading
500502
Tile& tile = *pManager->getRootTile();
501503
pManager->loadTileContent(tile, options);
@@ -603,6 +605,8 @@ TEST_CASE("Test tile state machine") {
603605
std::move(pMockedLoader),
604606
std::move(pRootTile)};
605607

608+
pManager->waitUntilIdle();
609+
606610
// test manager loading
607611
Tile& tile = *pManager->getRootTile();
608612
pManager->loadTileContent(tile, options);
@@ -681,6 +685,8 @@ TEST_CASE("Test tile state machine") {
681685
std::move(pMockedLoader),
682686
std::move(pRootTile)};
683687

688+
pManager->waitUntilIdle();
689+
684690
// test manager loading
685691
Tile& tile = *pManager->getRootTile();
686692
pManager->loadTileContent(tile, options);
@@ -781,6 +787,8 @@ TEST_CASE("Test tile state machine") {
781787
std::move(pMockedLoader),
782788
std::move(pRootTile)};
783789

790+
pManager->waitUntilIdle();
791+
784792
Tile& tile = *pManager->getRootTile();
785793
Tile& upsampledTile = tile.getChildren().back();
786794

@@ -938,6 +946,8 @@ TEST_CASE("Test the tileset content manager's post processing for gltf") {
938946
std::move(pMockedLoader),
939947
std::move(pRootTile)};
940948

949+
pManager->waitUntilIdle();
950+
941951
// test the gltf model
942952
Tile& tile = *pManager->getRootTile();
943953
pManager->loadTileContent(tile, {});
@@ -1008,6 +1018,8 @@ TEST_CASE("Test the tileset content manager's post processing for gltf") {
10081018
std::move(pMockedLoader),
10091019
std::move(pRootTile)};
10101020

1021+
pManager->waitUntilIdle();
1022+
10111023
// test the gltf model
10121024
Tile& tile = *pManager->getRootTile();
10131025
pManager->loadTileContent(tile, options);
@@ -1074,6 +1086,8 @@ TEST_CASE("Test the tileset content manager's post processing for gltf") {
10741086
std::move(pMockedLoader),
10751087
std::move(pRootTile)};
10761088

1089+
pManager->waitUntilIdle();
1090+
10771091
Tile& tile = *pManager->getRootTile();
10781092
pManager->loadTileContent(tile, {});
10791093
pManager->waitUntilIdle();
@@ -1122,7 +1136,8 @@ TEST_CASE("Test the tileset content manager's post processing for gltf") {
11221136
// add raster overlay
11231137
pManager->getRasterOverlayCollection().add(
11241138
new DebugColorizeTilesRasterOverlay("DebugOverlay"));
1125-
asyncSystem.dispatchMainThreadTasks();
1139+
1140+
pManager->waitUntilIdle();
11261141

11271142
SUBCASE(
11281143
"Generate raster overlay details when tile doesn't have loose region") {
@@ -1417,7 +1432,8 @@ TEST_CASE("Test the tileset content manager's post processing for gltf") {
14171432

14181433
pManager->getRasterOverlayCollection().add(
14191434
new AlwaysMoreDetailRasterOverlay());
1420-
asyncSystem.dispatchMainThreadTasks();
1435+
1436+
pManager->waitUntilIdle();
14211437

14221438
SUBCASE(
14231439
"Generate raster overlay details when tile doesn't have loose region") {
@@ -1639,7 +1655,8 @@ TEST_CASE("Test the tileset content manager's post processing for gltf") {
16391655
// add raster overlay
16401656
pManager->getRasterOverlayCollection().add(
16411657
new DebugColorizeTilesRasterOverlay("DebugOverlay"));
1642-
asyncSystem.dispatchMainThreadTasks();
1658+
1659+
pManager->waitUntilIdle();
16431660

16441661
Tile& tile = *pManager->getRootTile();
16451662
pManager->loadTileContent(tile, {});
@@ -1827,6 +1844,8 @@ TEST_CASE("IPrepareRendererResources::prepareInLoadThread parameters") {
18271844
std::move(pMockedLoader),
18281845
std::move(pRootTile)};
18291846

1847+
pManager->waitUntilIdle();
1848+
18301849
Tile& tile = *pManager->getRootTile();
18311850
pManager->loadTileContent(tile, options);
18321851
pManager->waitUntilIdle();
@@ -1904,6 +1923,8 @@ TEST_CASE("Test GLTF modifier state machine") {
19041923
std::move(pMockedLoader),
19051924
std::move(pRootTile)};
19061925

1926+
pManager->waitUntilIdle();
1927+
19071928
// test manager loading
19081929
Tile& tile = *pManager->getRootTile();
19091930
pManager->loadTileContent(tile, options);

0 commit comments

Comments
 (0)