Include both catch2 headers

CesiumGS · Nov 22, 2024 · cca8871 · cca8871
1 parent 9b46d6f
commit cca8871
Show file tree

Hide file tree

Showing 97 changed files with 102 additions and 3 deletions.
diff --git a/Cesium3DTiles/test/TestMetadataQuery.cpp b/Cesium3DTiles/test/TestMetadataQuery.cpp
@@ -1,5 +1,6 @@
 #include <Cesium3DTiles/MetadataQuery.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace Cesium3DTiles;

diff --git a/Cesium3DTilesContent/test/TestB3dmToGltfConverter.cpp b/Cesium3DTilesContent/test/TestB3dmToGltfConverter.cpp
@@ -2,6 +2,7 @@
 
 #include <CesiumGltf/ExtensionCesiumRTC.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace Cesium3DTilesContent;

diff --git a/Cesium3DTilesContent/test/TestI3dmToGltfConverter.cpp b/Cesium3DTilesContent/test/TestI3dmToGltfConverter.cpp
@@ -4,6 +4,7 @@
 #include <CesiumGltf/ExtensionCesiumRTC.h>
 #include <CesiumGltf/ExtensionExtMeshGpuInstancing.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <glm/vec3.hpp>
 

diff --git a/Cesium3DTilesContent/test/TestImplicitTilingUtilities.cpp b/Cesium3DTilesContent/test/TestImplicitTilingUtilities.cpp
@@ -5,6 +5,7 @@
 #include <CesiumGeospatial/BoundingRegion.h>
 #include <CesiumGeospatial/S2CellBoundingVolume.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <libmorton/morton.h>
 

diff --git a/Cesium3DTilesContent/test/TestPntsToGltfConverter.cpp b/Cesium3DTilesContent/test/TestPntsToGltfConverter.cpp
@@ -8,6 +8,7 @@
 #include <CesiumGltf/ExtensionModelExtStructuralMetadata.h>
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <rapidjson/document.h>
 #include <spdlog/sinks/ringbuffer_sink.h>

diff --git a/Cesium3DTilesContent/test/TestSkirtMeshMetadata.cpp b/Cesium3DTilesContent/test/TestSkirtMeshMetadata.cpp
@@ -1,6 +1,7 @@
 #include <CesiumGltfContent/SkirtMeshMetadata.h>
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace CesiumGltfContent;

diff --git a/Cesium3DTilesContent/test/TestSubtreeAvailability.cpp b/Cesium3DTilesContent/test/TestSubtreeAvailability.cpp
@@ -7,6 +7,7 @@
 #include <CesiumNativeTests/ThreadTaskProcessor.h>
 #include <CesiumNativeTests/waitForFuture.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <libmorton/morton.h>
 #include <rapidjson/document.h>

diff --git a/Cesium3DTilesContent/test/TestTileBoundingVolumes.cpp b/Cesium3DTilesContent/test/TestTileBoundingVolumes.cpp
@@ -2,6 +2,7 @@
 #include <Cesium3DTiles/Extension3dTilesBoundingVolumeS2.h>
 #include <Cesium3DTilesContent/TileBoundingVolumes.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace Cesium3DTiles;

diff --git a/Cesium3DTilesContent/test/TestTileTransform.cpp b/Cesium3DTilesContent/test/TestTileTransform.cpp
@@ -2,6 +2,7 @@
 #include <Cesium3DTilesContent/TileTransform.h>
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <glm/mat4x4.hpp>
 

diff --git a/Cesium3DTilesContent/test/TestUpgradeBatchTableToExtStructuralMetadata.cpp b/Cesium3DTilesContent/test/TestUpgradeBatchTableToExtStructuralMetadata.cpp
@@ -10,6 +10,7 @@
 #include <CesiumGltf/PropertyTableView.h>
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <rapidjson/document.h>
 #include <spdlog/sinks/ringbuffer_sink.h>

diff --git a/Cesium3DTilesReader/test/TestTilesetReader.cpp b/Cesium3DTilesReader/test/TestTilesetReader.cpp
@@ -3,6 +3,7 @@
 #include <CesiumJsonReader/JsonReader.h>
 #include <CesiumNativeTests/readFile.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <glm/vec3.hpp>
 #include <rapidjson/reader.h>

diff --git a/Cesium3DTilesSelection/test/SimplePrepareRendererResource.h b/Cesium3DTilesSelection/test/SimplePrepareRendererResource.h
@@ -4,6 +4,7 @@
 #include "Cesium3DTilesSelection/Tile.h"
 #include "CesiumRasterOverlays/RasterOverlayTile.h"
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 #include <atomic>

diff --git a/Cesium3DTilesSelection/test/TestBoundingVolume.cpp b/Cesium3DTilesSelection/test/TestBoundingVolume.cpp
@@ -1,6 +1,7 @@
 #include <Cesium3DTilesSelection/BoundingVolume.h>
 #include <CesiumGeometry/QuadtreeTileID.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace Cesium3DTilesSelection;

diff --git a/Cesium3DTilesSelection/test/TestCreditSystem.cpp b/Cesium3DTilesSelection/test/TestCreditSystem.cpp
@@ -1,5 +1,6 @@
 #include "CesiumUtility/CreditSystem.h"
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace CesiumUtility;

diff --git a/Cesium3DTilesSelection/test/TestImplicitOctreeLoader.cpp b/Cesium3DTilesSelection/test/TestImplicitOctreeLoader.cpp
@@ -12,6 +12,7 @@
 #include <CesiumNativeTests/readFile.h>
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 #include <filesystem>

diff --git a/Cesium3DTilesSelection/test/TestImplicitQuadtreeLoader.cpp b/Cesium3DTilesSelection/test/TestImplicitQuadtreeLoader.cpp
@@ -12,6 +12,7 @@
 #include <CesiumNativeTests/readFile.h>
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 #include <filesystem>

diff --git a/Cesium3DTilesSelection/test/TestLayerJsonTerrainLoader.cpp b/Cesium3DTilesSelection/test/TestLayerJsonTerrainLoader.cpp
@@ -12,6 +12,7 @@
 #include <CesiumNativeTests/readFile.h>
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 #include <filesystem>

diff --git a/Cesium3DTilesSelection/test/TestTilesetContentManager.cpp b/Cesium3DTilesSelection/test/TestTilesetContentManager.cpp
@@ -21,6 +21,7 @@
 #include <CesiumUtility/IntrusivePointer.h>
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <glm/glm.hpp>
 

diff --git a/Cesium3DTilesSelection/test/TestTilesetHeightQueries.cpp b/Cesium3DTilesSelection/test/TestTilesetHeightQueries.cpp
@@ -7,6 +7,7 @@
 #include <CesiumUtility/StringHelpers.h>
 #include <CesiumUtility/Uri.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 #include <filesystem>

diff --git a/Cesium3DTilesSelection/test/TestTilesetJsonLoader.cpp b/Cesium3DTilesSelection/test/TestTilesetJsonLoader.cpp
@@ -12,6 +12,7 @@
 #include <CesiumNativeTests/SimpleTaskProcessor.h>
 #include <CesiumNativeTests/readFile.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 #include <cstddef>

diff --git a/Cesium3DTilesSelection/test/TestTilesetJsonLoader.h b/Cesium3DTilesSelection/test/TestTilesetJsonLoader.h
@@ -11,6 +11,7 @@
 #include <CesiumNativeTests/SimpleTaskProcessor.h>
 #include <CesiumNativeTests/readFile.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 #include <memory>

diff --git a/Cesium3DTilesSelection/test/TestTilesetSelectionAlgorithm.cpp b/Cesium3DTilesSelection/test/TestTilesetSelectionAlgorithm.cpp
@@ -12,6 +12,7 @@
 #include <CesiumNativeTests/readFile.h>
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <glm/mat4x4.hpp>
 

diff --git a/Cesium3DTilesWriter/test/TestTilesetWriter.cpp b/Cesium3DTilesWriter/test/TestTilesetWriter.cpp
@@ -3,6 +3,7 @@
 #include <Cesium3DTiles/Extension3dTilesBoundingVolumeS2.h>
 #include <Cesium3DTilesReader/TilesetReader.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <rapidjson/document.h>
 

diff --git a/CesiumAsync/test/TestAsyncSystem.cpp b/CesiumAsync/test/TestAsyncSystem.cpp
@@ -1,5 +1,6 @@
 #include "CesiumAsync/AsyncSystem.h"
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 #include <chrono>

diff --git a/CesiumAsync/test/TestCacheAssetAccessor.cpp b/CesiumAsync/test/TestCacheAssetAccessor.cpp
@@ -8,6 +8,7 @@
 #include "MockTaskProcessor.h"
 #include "ResponseCacheControl.h"
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <spdlog/spdlog.h>
 

diff --git a/CesiumAsync/test/TestDiskCache.cpp b/CesiumAsync/test/TestDiskCache.cpp
@@ -3,6 +3,7 @@
 #include "MockAssetResponse.h"
 #include "ResponseCacheControl.h"
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <spdlog/spdlog.h>
 

diff --git a/CesiumAsync/test/TestGunzipAssetAccessor.cpp b/CesiumAsync/test/TestGunzipAssetAccessor.cpp
@@ -5,6 +5,7 @@
 
 #include <CesiumAsync/GunzipAssetAccessor.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace CesiumAsync;

diff --git a/CesiumAsync/test/TestInternalTimegm.cpp b/CesiumAsync/test/TestInternalTimegm.cpp
@@ -1,6 +1,7 @@
 #define _CRT_SECURE_NO_WARNINGS
 #include "InternalTimegm.h"
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace CesiumAsync;

diff --git a/CesiumAsync/test/TestResponseCacheControl.cpp b/CesiumAsync/test/TestResponseCacheControl.cpp
@@ -1,5 +1,6 @@
 #include "ResponseCacheControl.h"
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace CesiumAsync;

diff --git a/CesiumAsync/test/TestSharedAssetDepot.cpp b/CesiumAsync/test/TestSharedAssetDepot.cpp
@@ -3,6 +3,7 @@
 #include <CesiumNativeTests/SimpleTaskProcessor.h>
 #include <CesiumUtility/SharedAsset.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace CesiumAsync;

diff --git a/CesiumGeometry/test/TestAvailability.cpp b/CesiumGeometry/test/TestAvailability.cpp
@@ -8,6 +8,7 @@
 #include "CesiumGeometry/Rectangle.h"
 #include "CesiumGeometry/TileAvailabilityFlags.h"
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 #include <algorithm>
@@ -195,7 +196,8 @@ TEST_CASE("Test OctreeAvailability") {
             }
 
             REQUIRE(
-                (bool)(availability & TileAvailabilityFlags::CONTENT_AVAILABLE) ==
+                (bool)(availability &
+                       TileAvailabilityFlags::CONTENT_AVAILABLE) ==
                 contentShouldBeAvailable);
           }
         }

diff --git a/CesiumGeometry/test/TestAxisAlignedBox.cpp b/CesiumGeometry/test/TestAxisAlignedBox.cpp
@@ -1,5 +1,6 @@
 #include "CesiumGeometry/AxisAlignedBox.h"
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace CesiumGeometry;

diff --git a/CesiumGeometry/test/TestBoundingSphere.cpp b/CesiumGeometry/test/TestBoundingSphere.cpp
@@ -2,6 +2,7 @@
 #include "CesiumGeometry/Plane.h"
 #include "CesiumUtility/Math.h"
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtx/euler_angles.hpp>

diff --git a/CesiumGeometry/test/TestClipTriangleAtAxisAlignedThreshold.cpp b/CesiumGeometry/test/TestClipTriangleAtAxisAlignedThreshold.cpp
@@ -1,5 +1,6 @@
 #include "CesiumGeometry/clipTriangleAtAxisAlignedThreshold.h"
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace CesiumGeometry;

diff --git a/CesiumGeometry/test/TestIntersectionTests.cpp b/CesiumGeometry/test/TestIntersectionTests.cpp
@@ -6,6 +6,7 @@
 #include "CesiumGeospatial/Ellipsoid.h"
 #include "CesiumUtility/Math.h"
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <glm/gtc/matrix_inverse.hpp>
 #include <glm/gtx/transform.hpp>

diff --git a/CesiumGeometry/test/TestOrientedBoundingBox.cpp b/CesiumGeometry/test/TestOrientedBoundingBox.cpp
@@ -3,6 +3,7 @@
 #include <Cesium3DTilesSelection/ViewState.h>
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtx/euler_angles.hpp>

diff --git a/CesiumGeometry/test/TestPlane.cpp b/CesiumGeometry/test/TestPlane.cpp
@@ -2,6 +2,7 @@
 
 #include <CesiumGeospatial/Ellipsoid.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <glm/geometric.hpp>
 

diff --git a/CesiumGeometry/test/TestRectangle.cpp b/CesiumGeometry/test/TestRectangle.cpp
@@ -2,6 +2,7 @@
 
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace CesiumGeometry;

diff --git a/CesiumGeometry/test/TestTransforms.cpp b/CesiumGeometry/test/TestTransforms.cpp
@@ -3,6 +3,7 @@
 
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <glm/mat4x4.hpp>
 

diff --git a/CesiumGeospatial/test/TestBoundingRegion.cpp b/CesiumGeospatial/test/TestBoundingRegion.cpp
@@ -5,6 +5,7 @@
 #include <CesiumGeometry/Plane.h>
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace CesiumUtility;

diff --git a/CesiumGeospatial/test/TestBoundingRegionBuilder.cpp b/CesiumGeospatial/test/TestBoundingRegionBuilder.cpp
@@ -2,6 +2,7 @@
 
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 #include <cstring>

diff --git a/CesiumGeospatial/test/TestEarthGravitationalModel1996Grid.cpp b/CesiumGeospatial/test/TestEarthGravitationalModel1996Grid.cpp
@@ -4,6 +4,7 @@
 #include <CesiumNativeTests/readFile.h>
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 #include <filesystem>

diff --git a/CesiumGeospatial/test/TestGlobeAnchor.cpp b/CesiumGeospatial/test/TestGlobeAnchor.cpp
@@ -2,6 +2,7 @@
 #include <CesiumGeospatial/GlobeAnchor.h>
 #include <CesiumGeospatial/LocalHorizontalCoordinateSystem.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <glm/gtx/quaternion.hpp>
 

diff --git a/CesiumGeospatial/test/TestGlobeRectangle.cpp b/CesiumGeospatial/test/TestGlobeRectangle.cpp
@@ -1,6 +1,7 @@
 #include "CesiumGeospatial/GlobeRectangle.h"
 #include "CesiumUtility/Math.h"
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace CesiumGeospatial;

diff --git a/CesiumGeospatial/test/TestLocalHorizontalCoordinateSystem.cpp b/CesiumGeospatial/test/TestLocalHorizontalCoordinateSystem.cpp
@@ -1,6 +1,7 @@
 #include <CesiumGeospatial/LocalHorizontalCoordinateSystem.h>
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace CesiumGeospatial;

diff --git a/CesiumGeospatial/test/TestProjection.cpp b/CesiumGeospatial/test/TestProjection.cpp
@@ -3,6 +3,7 @@
 
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <glm/geometric.hpp>
 

diff --git a/CesiumGeospatial/test/TestS2CellBoundingVolume.cpp b/CesiumGeospatial/test/TestS2CellBoundingVolume.cpp
@@ -1,6 +1,7 @@
 #include <CesiumGeospatial/S2CellBoundingVolume.h>
 #include <CesiumGeospatial/S2CellID.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <glm/geometric.hpp>
 

diff --git a/CesiumGeospatial/test/TestS2CellID.cpp b/CesiumGeospatial/test/TestS2CellID.cpp
@@ -3,6 +3,7 @@
 #include <CesiumGeospatial/S2CellID.h>
 #include <CesiumUtility/Math.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 using namespace CesiumGeometry;

diff --git a/CesiumGeospatial/test/TestSimplePlanarEllipsoidCurve.cpp b/CesiumGeospatial/test/TestSimplePlanarEllipsoidCurve.cpp
@@ -1,5 +1,6 @@
 #include <CesiumGeospatial/SimplePlanarEllipsoidCurve.h>
 
+#include <catch2/catch.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <glm/geometric.hpp>