Skip to content

Commit a0f667e

Browse files
committed
change configs for compare_virtual_displays in tests/cpu/Config_tests.cpp to use looks, rules, and description
Signed-off-by: annie <[email protected]>
1 parent 9ee7085 commit a0f667e

File tree

1 file changed

+24
-8
lines changed

1 file changed

+24
-8
lines changed

tests/cpu/Config_tests.cpp

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9110,8 +9110,11 @@ OCIO_ADD_TEST(Config, compare_virtual_displays) {
91109110
file_rules:
91119111
- !<Rule> {name: Default, colorspace: default}
91129112
9113+
viewing_rules:
9114+
- !<Rule> {name: Linear, colorspaces: default}
9115+
91139116
shared_views:
9114-
- !<View> {name: Film, view_transform: display_vt, display_colorspace: <USE_DISPLAY_NAME>}
9117+
- !<View> {name: Film, view_transform: display_vt, display_colorspace: <USE_DISPLAY_NAME>, looks: look1, rule: Linear, description: Test view}
91159118
- !<View> {name: view, view_transform: display_vt, display_colorspace: display_cs}
91169119
91179120
displays:
@@ -9124,6 +9127,11 @@ OCIO_ADD_TEST(Config, compare_virtual_displays) {
91249127
- !<View> {name: Raw, colorspace: raw}
91259128
- !<Views> [Film, view]
91269129
9130+
looks:
9131+
- !<Look>
9132+
name: look1
9133+
process_space: default
9134+
91279135
view_transforms:
91289136
- !<ViewTransform>
91299137
name: default_vt
@@ -9151,6 +9159,9 @@ OCIO_ADD_TEST(Config, compare_virtual_displays) {
91519159
file_rules:
91529160
- !<Rule> {name: Default, colorspace: default}
91539161
9162+
viewing_rules:
9163+
- !<Rule> {name: Linear, colorspaces: default}
9164+
91549165
shared_views:
91559166
- !<View> {name: view, view_transform: display_vt, display_colorspace: display_cs}
91569167
@@ -9163,9 +9174,14 @@ OCIO_ADD_TEST(Config, compare_virtual_displays) {
91639174
91649175
virtual_display:
91659176
- !<View> {name: Raw, colorspace: raw}
9166-
- !<View> {name: Film, view_transform: display_vt, display_colorspace: <USE_DISPLAY_NAME>}
9177+
- !<View> {name: Film, view_transform: display_vt, display_colorspace: <USE_DISPLAY_NAME>, looks: look1, rule: Linear, description: Test view}
91679178
- !<Views> [view]
91689179
9180+
looks:
9181+
- !<Look>
9182+
name: look1
9183+
process_space: default
9184+
91699185
view_transforms:
91709186
- !<ViewTransform>
91719187
name: default_vt
@@ -9207,9 +9223,9 @@ OCIO_ADD_TEST(Config, compare_virtual_displays) {
92079223
OCIO_CHECK_EQUAL(std::string("Film"), viewName1);
92089224
OCIO_CHECK_EQUAL(std::string("display_vt"), config1->getVirtualDisplayViewTransformName(viewName1));
92099225
OCIO_CHECK_EQUAL(std::string("<USE_DISPLAY_NAME>"), config1->getVirtualDisplayViewColorSpaceName(viewName1));
9210-
OCIO_CHECK_EQUAL(std::string(""), config1->getVirtualDisplayViewLooks(viewName1));
9211-
OCIO_CHECK_EQUAL(std::string(""), config1->getVirtualDisplayViewRule(viewName1));
9212-
OCIO_CHECK_EQUAL(std::string(""), config1->getVirtualDisplayViewDescription(viewName1));
9226+
OCIO_CHECK_EQUAL(std::string("look1"), config1->getVirtualDisplayViewLooks(viewName1));
9227+
OCIO_CHECK_EQUAL(std::string("Linear"), config1->getVirtualDisplayViewRule(viewName1));
9228+
OCIO_CHECK_EQUAL(std::string("Test view"), config1->getVirtualDisplayViewDescription(viewName1));
92139229

92149230
// Virtual view is a reference to a display-defined view.
92159231
OCIO_REQUIRE_EQUAL(2, config2->getVirtualDisplayNumViews(OCIO::VIEW_DISPLAY_DEFINED));
@@ -9219,9 +9235,9 @@ OCIO_ADD_TEST(Config, compare_virtual_displays) {
92199235
OCIO_CHECK_EQUAL(std::string("Film"), viewName2);
92209236
OCIO_CHECK_EQUAL(std::string("display_vt"), config2->getVirtualDisplayViewTransformName(viewName2));
92219237
OCIO_CHECK_EQUAL(std::string("<USE_DISPLAY_NAME>"), config2->getVirtualDisplayViewColorSpaceName(viewName2));
9222-
OCIO_CHECK_EQUAL(std::string(""), config2->getVirtualDisplayViewLooks(viewName2));
9223-
OCIO_CHECK_EQUAL(std::string(""), config2->getVirtualDisplayViewRule(viewName2));
9224-
OCIO_CHECK_EQUAL(std::string(""), config2->getVirtualDisplayViewDescription(viewName2));
9238+
OCIO_CHECK_EQUAL(std::string("look1"), config2->getVirtualDisplayViewLooks(viewName2));
9239+
OCIO_CHECK_EQUAL(std::string("Linear"), config2->getVirtualDisplayViewRule(viewName2));
9240+
OCIO_CHECK_EQUAL(std::string("Test view"), config2->getVirtualDisplayViewDescription(viewName2));
92259241

92269242
OCIO_CHECK_EQUAL(std::string(viewName1), std::string(viewName2));
92279243
OCIO_CHECK_ASSERT(OCIO::Config::VirtualViewsAreEqual(config1, config2, viewName1));

0 commit comments

Comments
 (0)