diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2017-10-16 12:16:13 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2017-10-16 12:22:35 +0300 |
commit | a78b3ee53aa53020b086a6df25c0e28491223dcc (patch) | |
tree | bd883e95580f5777f7eae7cac4e47f182ac9fc00 /intern/cycles/test/render_graph_finalize_test.cpp | |
parent | 4842cc017c3bb7df2070c2f96605190ff88e6a2e (diff) | |
parent | 49f4ac17bf704614de59a4db7a65c205c085d694 (diff) |
Merge remote-tracking branch 'origin/master' into openvdbopenvdb
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); |