Skip to content

Commit d9d6dcd

Browse files
charles-lunargcharles-lunarg
committed
Remove redundant helper func in tests
Better to use the TestLayerDetails struct directly when a fake layer is needed.
1 parent 006a0c5 commit d9d6dcd

File tree

3 files changed

+45
-43
lines changed

3 files changed

+45
-43
lines changed

‎tests/framework/test_environment.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -482,12 +482,6 @@ void FrameworkEnvironment::add_implicit_layer(ManifestLayer layer_manifest, cons
482482
void FrameworkEnvironment::add_explicit_layer(ManifestLayer layer_manifest, const std::string& json_name) noexcept {
483483
add_layer_impl(TestLayerDetails{layer_manifest, json_name}, ManifestCategory::explicit_layer);
484484
}
485-
void FrameworkEnvironment::add_fake_implicit_layer(ManifestLayer layer_manifest, const std::string& json_name) noexcept {
486-
add_layer_impl(TestLayerDetails{layer_manifest, json_name}.set_is_fake(true), ManifestCategory::implicit_layer);
487-
}
488-
void FrameworkEnvironment::add_fake_explicit_layer(ManifestLayer layer_manifest, const std::string& json_name) noexcept {
489-
add_layer_impl(TestLayerDetails{layer_manifest, json_name}.set_is_fake(true), ManifestCategory::explicit_layer);
490-
}
491485
void FrameworkEnvironment::add_implicit_layer(TestLayerDetails layer_details) noexcept {
492486
add_layer_impl(layer_details, ManifestCategory::implicit_layer);
493487
}

‎tests/framework/test_environment.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,8 +499,6 @@ struct FrameworkEnvironment {
499499
void add_implicit_layer(TestLayerDetails layer_details) noexcept;
500500
void add_explicit_layer(ManifestLayer layer_manifest, const std::string& json_name) noexcept;
501501
void add_explicit_layer(TestLayerDetails layer_details) noexcept;
502-
void add_fake_implicit_layer(ManifestLayer layer_manifest, const std::string& json_name) noexcept;
503-
void add_fake_explicit_layer(ManifestLayer layer_manifest, const std::string& json_name) noexcept;
504502

505503
// Resets the current settings with the values contained in loader_settings.
506504
// Write_to_secure_location determines whether to write to the secure or unsecure settings folder.

‎tests/loader_regression_tests.cpp‎

Lines changed: 45 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1622,10 +1622,11 @@ TEST(TryLoadWrongBinaries, WrongExplicit) {
16221622
env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)).add_physical_device("physical_device_0");
16231623

16241624
const char* layer_name = "DummyLayerExplicit";
1625-
env.add_fake_explicit_layer(
1625+
env.add_explicit_layer(TestLayerDetails{
16261626
ManifestLayer{}.add_layer(
16271627
ManifestLayer::LayerDescription{}.set_name(layer_name).set_lib_path(CURRENT_PLATFORM_DUMMY_BINARY_WRONG_TYPE)),
1628-
"dummy_test_layer.json");
1628+
"dummy_test_layer.json"}
1629+
.set_is_fake(true));
16291630

16301631
auto layer_props = env.GetLayerProperties(1);
16311632
ASSERT_TRUE(string_eq(layer_name, layer_props[0].layerName));
@@ -1652,11 +1653,12 @@ TEST(TryLoadWrongBinaries, WrongImplicit) {
16521653
env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)).add_physical_device("physical_device_0");
16531654

16541655
const char* layer_name = "DummyLayerImplicit0";
1655-
env.add_fake_implicit_layer(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
1656-
.set_name(layer_name)
1657-
.set_lib_path(CURRENT_PLATFORM_DUMMY_BINARY_WRONG_TYPE)
1658-
.set_disable_environment("DISABLE_ENV")),
1659-
"dummy_test_layer.json");
1656+
env.add_implicit_layer(TestLayerDetails{ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
1657+
.set_name(layer_name)
1658+
.set_lib_path(CURRENT_PLATFORM_DUMMY_BINARY_WRONG_TYPE)
1659+
.set_disable_environment("DISABLE_ENV")),
1660+
"dummy_test_layer.json"}
1661+
.set_is_fake(true));
16601662

16611663
auto layer_props = env.GetLayerProperties(1);
16621664
ASSERT_TRUE(string_eq(layer_name, layer_props[0].layerName));
@@ -1683,16 +1685,18 @@ TEST(TryLoadWrongBinaries, WrongExplicitAndImplicit) {
16831685
env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)).add_physical_device("physical_device_0");
16841686

16851687
const char* layer_name_0 = "DummyLayerExplicit";
1686-
env.add_fake_explicit_layer(
1688+
env.add_explicit_layer(TestLayerDetails{
16871689
ManifestLayer{}.add_layer(
16881690
ManifestLayer::LayerDescription{}.set_name(layer_name_0).set_lib_path(CURRENT_PLATFORM_DUMMY_BINARY_WRONG_TYPE)),
1689-
"dummy_test_layer_0.json");
1691+
"dummy_test_layer_0.json"}
1692+
.set_is_fake(true));
16901693
const char* layer_name_1 = "DummyLayerImplicit";
1691-
env.add_fake_implicit_layer(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
1692-
.set_name(layer_name_1)
1693-
.set_lib_path(CURRENT_PLATFORM_DUMMY_BINARY_WRONG_TYPE)
1694-
.set_disable_environment("DISABLE_ENV")),
1695-
"dummy_test_layer_1.json");
1694+
env.add_implicit_layer(TestLayerDetails{ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
1695+
.set_name(layer_name_1)
1696+
.set_lib_path(CURRENT_PLATFORM_DUMMY_BINARY_WRONG_TYPE)
1697+
.set_disable_environment("DISABLE_ENV")),
1698+
"dummy_test_layer_1.json"}
1699+
.set_is_fake(true));
16961700

16971701
auto layer_props = env.GetLayerProperties(2);
16981702
ASSERT_TRUE(check_permutation({layer_name_0, layer_name_1}, layer_props));
@@ -1722,16 +1726,18 @@ TEST(TryLoadWrongBinaries, WrongExplicitAndImplicitErrorOnly) {
17221726
env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)).add_physical_device("physical_device_0");
17231727

17241728
const char* layer_name_0 = "DummyLayerExplicit";
1725-
env.add_fake_explicit_layer(
1729+
env.add_explicit_layer(TestLayerDetails{
17261730
ManifestLayer{}.add_layer(
17271731
ManifestLayer::LayerDescription{}.set_name(layer_name_0).set_lib_path(CURRENT_PLATFORM_DUMMY_BINARY_WRONG_TYPE)),
1728-
"dummy_test_layer_0.json");
1732+
"dummy_test_layer_0.json"}
1733+
.set_is_fake(true));
17291734
const char* layer_name_1 = "DummyLayerImplicit";
1730-
env.add_fake_implicit_layer(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
1731-
.set_name(layer_name_1)
1732-
.set_lib_path(CURRENT_PLATFORM_DUMMY_BINARY_WRONG_TYPE)
1733-
.set_disable_environment("DISABLE_ENV")),
1734-
"dummy_test_layer_1.json");
1735+
env.add_implicit_layer(TestLayerDetails{ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
1736+
.set_name(layer_name_1)
1737+
.set_lib_path(CURRENT_PLATFORM_DUMMY_BINARY_WRONG_TYPE)
1738+
.set_disable_environment("DISABLE_ENV")),
1739+
"dummy_test_layer_1.json"}
1740+
.set_is_fake(true));
17351741

17361742
auto layer_props = env.GetLayerProperties(2);
17371743
ASSERT_TRUE(check_permutation({layer_name_0, layer_name_1}, layer_props));
@@ -1760,10 +1766,11 @@ TEST(TryLoadWrongBinaries, BadExplicit) {
17601766
env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)).add_physical_device("physical_device_0");
17611767

17621768
const char* layer_name = "DummyLayerExplicit";
1763-
env.add_fake_explicit_layer(
1769+
env.add_explicit_layer(TestLayerDetails{
17641770
ManifestLayer{}.add_layer(
17651771
ManifestLayer::LayerDescription{}.set_name(layer_name).set_lib_path(CURRENT_PLATFORM_DUMMY_BINARY_BAD)),
1766-
"dummy_test_layer.json");
1772+
"dummy_test_layer.json"}
1773+
.set_is_fake(true));
17671774

17681775
auto layer_props = env.GetLayerProperties(1);
17691776
ASSERT_TRUE(string_eq(layer_name, layer_props[0].layerName));
@@ -1789,11 +1796,12 @@ TEST(TryLoadWrongBinaries, BadImplicit) {
17891796
env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)).add_physical_device("physical_device_0");
17901797

17911798
const char* layer_name = "DummyLayerImplicit0";
1792-
env.add_fake_implicit_layer(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
1793-
.set_name(layer_name)
1794-
.set_lib_path(CURRENT_PLATFORM_DUMMY_BINARY_BAD)
1795-
.set_disable_environment("DISABLE_ENV")),
1796-
"dummy_test_layer.json");
1799+
env.add_implicit_layer(TestLayerDetails{ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
1800+
.set_name(layer_name)
1801+
.set_lib_path(CURRENT_PLATFORM_DUMMY_BINARY_BAD)
1802+
.set_disable_environment("DISABLE_ENV")),
1803+
"dummy_test_layer.json"}
1804+
.set_is_fake(true));
17971805

17981806
auto layer_props = env.GetLayerProperties(1);
17991807
ASSERT_TRUE(string_eq(layer_name, layer_props[0].layerName));
@@ -1819,16 +1827,18 @@ TEST(TryLoadWrongBinaries, BadExplicitAndImplicit) {
18191827
env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)).add_physical_device("physical_device_0");
18201828

18211829
const char* layer_name_0 = "DummyLayerExplicit";
1822-
env.add_fake_explicit_layer(
1830+
env.add_explicit_layer(TestLayerDetails{
18231831
ManifestLayer{}.add_layer(
18241832
ManifestLayer::LayerDescription{}.set_name(layer_name_0).set_lib_path(CURRENT_PLATFORM_DUMMY_BINARY_BAD)),
1825-
"dummy_test_layer_0.json");
1833+
"dummy_test_layer_0.json"}
1834+
.set_is_fake(true));
18261835
const char* layer_name_1 = "DummyLayerImplicit0";
1827-
env.add_fake_implicit_layer(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
1828-
.set_name(layer_name_1)
1829-
.set_lib_path(CURRENT_PLATFORM_DUMMY_BINARY_BAD)
1830-
.set_disable_environment("DISABLE_ENV")),
1831-
"dummy_test_layer_1.json");
1836+
env.add_implicit_layer(TestLayerDetails{ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
1837+
.set_name(layer_name_1)
1838+
.set_lib_path(CURRENT_PLATFORM_DUMMY_BINARY_BAD)
1839+
.set_disable_environment("DISABLE_ENV")),
1840+
"dummy_test_layer_1.json"}
1841+
.set_is_fake(true));
18321842

18331843
auto layer_props = env.GetLayerProperties(2);
18341844
ASSERT_TRUE(check_permutation({layer_name_0, layer_name_1}, layer_props));

0 commit comments

Comments
 (0)