Skip to content

Commit

Permalink
Improve names and organization of perf tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kring
kring committed Sep 19, 2024
1 parent 5770b74 commit cf032b3
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 39 deletions.
55 changes: 28 additions & 27 deletions ...e/Private/Tests/Google3dTilesLoadTest.cpp → .../GooglePhotorealistic3dTilesLoad.perf.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,48 +15,48 @@
using namespace Cesium;

IMPLEMENT_SIMPLE_AUTOMATION_TEST(
FGoogleTilesPompidou,
"Cesium.Performance.GoogleTiles.LocalePompidou",
FLoadTilesetGooglePompidou,
"Cesium.Performance.Tileset Loading.Google P3DT Pompidou",
EAutomationTestFlags::EditorContext | EAutomationTestFlags::PerfFilter)

IMPLEMENT_SIMPLE_AUTOMATION_TEST(
FGoogleTilesChrysler,
"Cesium.Performance.GoogleTiles.LocaleChrysler",
FLoadTilesetGoogleChrysler,
"Cesium.Performance.Tileset Loading.Google P3DT Chrysler",
EAutomationTestFlags::EditorContext | EAutomationTestFlags::PerfFilter)

IMPLEMENT_SIMPLE_AUTOMATION_TEST(
FGoogleTilesChryslerWarm,
"Cesium.Performance.GoogleTiles.LocaleChrysler (Warm)",
FLoadTilesetGoogleChryslerWarm,
"Cesium.Performance.Tileset Loading.Google P3DT Chrysler, warm cache",
EAutomationTestFlags::EditorContext | EAutomationTestFlags::PerfFilter)

IMPLEMENT_SIMPLE_AUTOMATION_TEST(
FGoogleTilesGuggenheim,
"Cesium.Performance.GoogleTiles.LocaleGuggenheim",
FLoadTilesetGoogleGuggenheim,
"Cesium.Performance.Tileset Loading.Google P3DT Guggenheim",
EAutomationTestFlags::EditorContext | EAutomationTestFlags::PerfFilter)

IMPLEMENT_SIMPLE_AUTOMATION_TEST(
FGoogleTilesDeathValley,
"Cesium.Performance.GoogleTiles.LocaleDeathValley",
FLoadTilesetGoogleDeathValley,
"Cesium.Performance.Tileset Loading.Google P3DT DeathValley",
EAutomationTestFlags::EditorContext | EAutomationTestFlags::PerfFilter)

IMPLEMENT_SIMPLE_AUTOMATION_TEST(
FGoogleTilesDeathValleyWarm,
"Cesium.Performance.GoogleTiles.LocaleDeathValley (Warm)",
FLoadTilesetGoogleDeathValleyWarm,
"Cesium.Performance.Tileset Loading.Google P3DT DeathValley, warm cache",
EAutomationTestFlags::EditorContext | EAutomationTestFlags::PerfFilter)

IMPLEMENT_SIMPLE_AUTOMATION_TEST(
FGoogleTilesTokyo,
"Cesium.Performance.GoogleTiles.LocaleTokyo",
FLoadTilesetGoogleTokyo,
"Cesium.Performance.Tileset Loading.Google P3DT Tokyo",
EAutomationTestFlags::EditorContext | EAutomationTestFlags::PerfFilter)

IMPLEMENT_SIMPLE_AUTOMATION_TEST(
FGoogleTilesGoogleplex,
"Cesium.Performance.GoogleTiles.LocaleGoogleplex",
FLoadTilesetGoogleGoogleplex,
"Cesium.Performance.Tileset Loading.Google P3DT Googleplex",
EAutomationTestFlags::EditorContext | EAutomationTestFlags::PerfFilter)

IMPLEMENT_SIMPLE_AUTOMATION_TEST(
FGoogleTilesMaxTileLoads,
"Cesium.Performance.GoogleTiles.VaryMaxTileLoads",
FLoadTilesetGoogleChryslerVaryMaxTileLoads,
"Cesium.Performance.Tileset Loading.Google P3DT Chrysler, vary max tile loads",
EAutomationTestFlags::EditorContext | EAutomationTestFlags::PerfFilter)

#define TEST_SCREEN_WIDTH 1280
Expand Down Expand Up @@ -183,7 +183,7 @@ void setupForGoogleplex(SceneGenerationContext& context) {
context.tilesets.push_back(tileset);
}

bool FGoogleTilesPompidou::RunTest(const FString& Parameters) {
bool FLoadTilesetGooglePompidou::RunTest(const FString& Parameters) {
std::vector<TestPass> testPasses;
testPasses.push_back(TestPass{"Cold Cache", googleSetupClearCache, nullptr});

Expand All @@ -195,7 +195,7 @@ bool FGoogleTilesPompidou::RunTest(const FString& Parameters) {
TEST_SCREEN_HEIGHT);
}

bool FGoogleTilesChrysler::RunTest(const FString& Parameters) {
bool FLoadTilesetGoogleChrysler::RunTest(const FString& Parameters) {
std::vector<TestPass> testPasses;
testPasses.push_back(TestPass{"Cold Cache", googleSetupClearCache, nullptr});

Expand All @@ -207,7 +207,7 @@ bool FGoogleTilesChrysler::RunTest(const FString& Parameters) {
TEST_SCREEN_HEIGHT);
}

bool FGoogleTilesChryslerWarm::RunTest(const FString& Parameters) {
bool FLoadTilesetGoogleChryslerWarm::RunTest(const FString& Parameters) {
std::vector<TestPass> testPasses;
testPasses.push_back(
TestPass{"Warm Cache", googleSetupRefreshTilesets, nullptr});
Expand All @@ -220,7 +220,7 @@ bool FGoogleTilesChryslerWarm::RunTest(const FString& Parameters) {
TEST_SCREEN_HEIGHT);
}

bool FGoogleTilesGuggenheim::RunTest(const FString& Parameters) {
bool FLoadTilesetGoogleGuggenheim::RunTest(const FString& Parameters) {
std::vector<TestPass> testPasses;
testPasses.push_back(TestPass{"Cold Cache", googleSetupClearCache, nullptr});

Expand All @@ -232,7 +232,7 @@ bool FGoogleTilesGuggenheim::RunTest(const FString& Parameters) {
TEST_SCREEN_HEIGHT);
}

bool FGoogleTilesDeathValley::RunTest(const FString& Parameters) {
bool FLoadTilesetGoogleDeathValley::RunTest(const FString& Parameters) {
std::vector<TestPass> testPasses;
testPasses.push_back(TestPass{"Cold Cache", googleSetupClearCache, nullptr});

Expand All @@ -244,7 +244,7 @@ bool FGoogleTilesDeathValley::RunTest(const FString& Parameters) {
TEST_SCREEN_HEIGHT);
}

bool FGoogleTilesDeathValleyWarm::RunTest(const FString& Parameters) {
bool FLoadTilesetGoogleDeathValleyWarm::RunTest(const FString& Parameters) {
std::vector<TestPass> testPasses;
testPasses.push_back(
TestPass{"Warm Cache", googleSetupRefreshTilesets, nullptr});
Expand All @@ -257,7 +257,7 @@ bool FGoogleTilesDeathValleyWarm::RunTest(const FString& Parameters) {
TEST_SCREEN_HEIGHT);
}

bool FGoogleTilesTokyo::RunTest(const FString& Parameters) {
bool FLoadTilesetGoogleTokyo::RunTest(const FString& Parameters) {
std::vector<TestPass> testPasses;
testPasses.push_back(TestPass{"Cold Cache", googleSetupClearCache, nullptr});

Expand All @@ -269,7 +269,7 @@ bool FGoogleTilesTokyo::RunTest(const FString& Parameters) {
TEST_SCREEN_HEIGHT);
}

bool FGoogleTilesGoogleplex::RunTest(const FString& Parameters) {
bool FLoadTilesetGoogleGoogleplex::RunTest(const FString& Parameters) {
std::vector<TestPass> testPasses;
testPasses.push_back(TestPass{"Cold Cache", googleSetupClearCache, nullptr});

Expand All @@ -281,7 +281,8 @@ bool FGoogleTilesGoogleplex::RunTest(const FString& Parameters) {
TEST_SCREEN_HEIGHT);
}

bool FGoogleTilesMaxTileLoads::RunTest(const FString& Parameters) {
bool FLoadTilesetGoogleChryslerVaryMaxTileLoads::RunTest(
const FString& Parameters) {
auto setupPass = [this](
SceneGenerationContext& context,
TestPass::TestingParameter parameter) {
Expand Down
24 changes: 12 additions & 12 deletions ...e/Private/Tests/CesiumLoadTestSamples.cpp → ...Private/Tests/SampleTilesetsLoad.perf.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
using namespace Cesium;

IMPLEMENT_SIMPLE_AUTOMATION_TEST(
FCesiumSampleDenver,
"Cesium.Performance.SampleLocaleDenver",
FLoadTilesetDenver,
"Cesium.Performance.Tileset Loading.Aerometrex Denver",
EAutomationTestFlags::EditorContext | EAutomationTestFlags::PerfFilter)

IMPLEMENT_SIMPLE_AUTOMATION_TEST(
FCesiumSampleMelbourne,
"Cesium.Performance.SampleLocaleMelbourne",
FLoadTilesetMelbourne,
"Cesium.Performance.Tileset Loading.Melbourne photogrammetry (open data)",
EAutomationTestFlags::EditorContext | EAutomationTestFlags::PerfFilter)

IMPLEMENT_SIMPLE_AUTOMATION_TEST(
FCesiumSampleMontrealPointCloud,
"Cesium.Performance.SampleTestPointCloud",
FLoadTilesetMontrealPointCloud,
"Cesium.Performance.Tileset Loading.Montreal point cloud (open data)",
EAutomationTestFlags::EditorContext | EAutomationTestFlags::PerfFilter)

IMPLEMENT_SIMPLE_AUTOMATION_TEST(
FSampleMaxTileLoads,
"Cesium.Performance.SampleVaryMaxTileLoads",
FLoadTilesetMelbourneVaryMaxTileLoads,
"Cesium.Performance.Tileset Loading.Melbourne photogrammetry (open data), vary max tile loads",
EAutomationTestFlags::EditorContext | EAutomationTestFlags::PerfFilter)

void samplesClearCache(SceneGenerationContext&, TestPass::TestingParameter) {
Expand Down Expand Up @@ -146,7 +146,7 @@ void setupForMontrealPointCloud(SceneGenerationContext& context) {
context.tilesets.push_back(montrealTileset);
}

bool FCesiumSampleDenver::RunTest(const FString& Parameters) {
bool FLoadTilesetDenver::RunTest(const FString& Parameters) {
std::vector<TestPass> testPasses;
testPasses.push_back(TestPass{"Cold Cache", samplesClearCache, nullptr});
testPasses.push_back(TestPass{"Warm Cache", samplesRefreshTilesets, nullptr});
Expand All @@ -159,7 +159,7 @@ bool FCesiumSampleDenver::RunTest(const FString& Parameters) {
768);
}

bool FCesiumSampleMelbourne::RunTest(const FString& Parameters) {
bool FLoadTilesetMelbourne::RunTest(const FString& Parameters) {
std::vector<TestPass> testPasses;
testPasses.push_back(TestPass{"Cold Cache", samplesClearCache, nullptr});
testPasses.push_back(TestPass{"Warm Cache", samplesRefreshTilesets, nullptr});
Expand All @@ -172,7 +172,7 @@ bool FCesiumSampleMelbourne::RunTest(const FString& Parameters) {
768);
}

bool FCesiumSampleMontrealPointCloud::RunTest(const FString& Parameters) {
bool FLoadTilesetMontrealPointCloud::RunTest(const FString& Parameters) {
auto adjustCamera = [this](
SceneGenerationContext& context,
TestPass::TestingParameter parameter) {
Expand Down Expand Up @@ -227,7 +227,7 @@ bool FCesiumSampleMontrealPointCloud::RunTest(const FString& Parameters) {
512);
}

bool FSampleMaxTileLoads::RunTest(const FString& Parameters) {
bool FLoadTilesetMelbourneVaryMaxTileLoads::RunTest(const FString& Parameters) {

auto setupPass = [this](
SceneGenerationContext& context,
Expand Down

0 comments on commit cf032b3

Please sign in to comment.