diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-02-03 13:35:34 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-02-03 13:35:34 +0300 |
| commit | e1e85454eac03b752fc216cc6bba7816d66b6c84 (patch) | |
| tree | 5a0ee714c5f6b2422bb9a87d1dd3c04403375a32 /intern/cycles/test/render_graph_finalize_test.cpp | |
| parent | 103f2655ab6e670cacfbf695adafe667c24c43eb (diff) | |
Cycles: Cleanup, order of arguments to EXPECT_EQ
The order was wrong from the semantic point of view, caused
by some legacy workarounds in Libmv. Didn't realize it's was
not how things were expected to be used.
Diffstat (limited to 'intern/cycles/test/render_graph_finalize_test.cpp')
| -rw-r--r-- | intern/cycles/test/render_graph_finalize_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/test/render_graph_finalize_test.cpp b/intern/cycles/test/render_graph_finalize_test.cpp index 32b4c7265ee..3fc086cbc0c 100644 --- a/intern/cycles/test/render_graph_finalize_test.cpp +++ b/intern/cycles/test/render_graph_finalize_test.cpp @@ -92,7 +92,7 @@ public: template<typename T> ShaderGraphBuilder& add_node(const T& node) { - EXPECT_EQ(NULL, find_node(node.name())); + EXPECT_EQ(find_node(node.name()), (void*)NULL); graph_->add(node.node()); node_map_[node.name()] = node.node(); return *this; @@ -104,8 +104,8 @@ public: vector<string> tokens_from, tokens_to; string_split(tokens_from, from, "::"); string_split(tokens_to, to, "::"); - EXPECT_EQ(2, tokens_from.size()); - EXPECT_EQ(2, tokens_to.size()); + EXPECT_EQ(tokens_from.size(), 2); + EXPECT_EQ(tokens_to.size(), 2); ShaderNode *node_from = find_node(tokens_from[0]), *node_to = find_node(tokens_to[0]); EXPECT_NE((void*)NULL, node_from); |