update test to expect LoadState::Failed without a failcallback

CesiumGS · Sep 9, 2021 · 8f5291e · 8f5291e
1 parent c8a2f1a
commit 8f5291e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/Cesium3DTilesSelection/src/Tileset.cpp b/Cesium3DTilesSelection/src/Tileset.cpp
@@ -1421,6 +1421,9 @@ bool Tileset::_queueLoadOfChildrenRequiredForRefinement(
     if (!child.isRenderable()) {
       waitingForChildren = true;
 
+      // While we are waiting for the child to load, we need to push along the
+      // tile and raster loading by continuing to update it.
+      child.update(frameState.lastFrameNumber, frameState.currentFrameNumber);
       this->_markTileVisited(child);
 
       // We're using the distance to the parent tile to compute the load
@@ -1431,13 +1434,6 @@ bool Tileset::_queueLoadOfChildrenRequiredForRefinement(
           frameState.frustums,
           child,
           distances);
-
-      // While we are waiting for the child to load, we need to push along the
-      // tile and raster loading by continuing to update it, as if we were
-      // visiting it.
-      if (child.getState() >= Tile::LoadState::ContentLoaded) {
-        child.update(frameState.lastFrameNumber, frameState.currentFrameNumber);
-      }
     }
   }
   return waitingForChildren;

diff --git a/Cesium3DTilesSelection/test/TestTilesetSelectionAlgorithm.cpp b/Cesium3DTilesSelection/test/TestTilesetSelectionAlgorithm.cpp
@@ -281,7 +281,7 @@ TEST_CASE("Test replace refinement for render") {
       REQUIRE(root->getState() == Tile::LoadState::Done);
       REQUIRE(!doesTileMeetSSE(viewState, *root, tileset));
       for (const auto& child : root->getChildren()) {
-        REQUIRE(child.getState() == Tile::LoadState::FailedTemporarily);
+        REQUIRE(child.getState() == Tile::LoadState::Failed);
         REQUIRE(doesTileMeetSSE(viewState, child, tileset));
       }