[Bf-blender-cvs] [e1e85454ea] master: Cycles: Cleanup, order of arguments to EXPECT_EQ
Sergey Sharybin
noreply at git.blender.org
Fri Feb 3 11:37:10 CET 2017
Commit: e1e85454eac03b752fc216cc6bba7816d66b6c84
Author: Sergey Sharybin
Date: Fri Feb 3 11:35:34 2017 +0100
Branches: master
https://developer.blender.org/rBe1e85454eac03b752fc216cc6bba7816d66b6c84
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.
===================================================================
M intern/cycles/test/render_graph_finalize_test.cpp
M intern/cycles/test/util_aligned_malloc_test.cpp
M intern/cycles/test/util_path_test.cpp
M intern/cycles/test/util_string_test.cpp
===================================================================
diff --git a/intern/cycles/test/render_graph_finalize_test.cpp b/intern/cycles/test/render_graph_finalize_test.cpp
index 32b4c7265e..3fc086cbc0 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);
diff --git a/intern/cycles/test/util_aligned_malloc_test.cpp b/intern/cycles/test/util_aligned_malloc_test.cpp
index 479070f051..9fb3aad0c3 100644
--- a/intern/cycles/test/util_aligned_malloc_test.cpp
+++ b/intern/cycles/test/util_aligned_malloc_test.cpp
@@ -18,7 +18,7 @@
#include "util/util_aligned_malloc.h"
-#define CHECK_ALIGNMENT(ptr, align) EXPECT_EQ(0, (size_t)ptr % align)
+#define CHECK_ALIGNMENT(ptr, align) EXPECT_EQ((size_t)ptr % align, 0)
CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/test/util_path_test.cpp b/intern/cycles/test/util_path_test.cpp
index 92be1dd4cb..c2f400c105 100644
--- a/intern/cycles/test/util_path_test.cpp
+++ b/intern/cycles/test/util_path_test.cpp
@@ -26,63 +26,63 @@ CCL_NAMESPACE_BEGIN
TEST(util_path_filename, simple_unix)
{
string str = path_filename("/tmp/foo.txt");
- EXPECT_EQ("foo.txt", str);
+ EXPECT_EQ(str, "foo.txt");
}
TEST(util_path_filename, root_unix)
{
string str = path_filename("/");
- EXPECT_EQ("/", str);
+ EXPECT_EQ(str, "/");
}
TEST(util_path_filename, last_slash_unix)
{
string str = path_filename("/tmp/foo.txt/");
- EXPECT_EQ(".", str);
+ EXPECT_EQ(str, ".");
}
TEST(util_path_filename, alternate_slash_unix)
{
string str = path_filename("/tmp\\foo.txt");
- EXPECT_EQ("tmp\\foo.txt", str);
+ EXPECT_EQ(str, "tmp\\foo.txt");
}
#endif /* !_WIN32 */
TEST(util_path_filename, file_only)
{
string str = path_filename("foo.txt");
- EXPECT_EQ("foo.txt", str);
+ EXPECT_EQ(str, "foo.txt");
}
TEST(util_path_filename, empty)
{
string str = path_filename("");
- EXPECT_EQ("", str);
+ EXPECT_EQ(str, "");
}
#ifdef _WIN32
TEST(util_path_filename, simple_windows)
{
string str = path_filename("C:\\tmp\\foo.txt");
- EXPECT_EQ("foo.txt", str);
+ EXPECT_EQ(str, "foo.txt");
}
TEST(util_path_filename, root_windows)
{
string str = path_filename("C:\\");
- EXPECT_EQ("\\", str);
+ EXPECT_EQ(str, "\\");
}
TEST(util_path_filename, last_slash_windows)
{
string str = path_filename("C:\\tmp\\foo.txt\\");
- EXPECT_EQ(".", str);
+ EXPECT_EQ(str, ".");
}
TEST(util_path_filename, alternate_slash_windows)
{
string str = path_filename("C:\\tmp/foo.txt");
- EXPECT_EQ("foo.txt", str);
+ EXPECT_EQ(str, "foo.txt");
}
#endif /* _WIN32 */
@@ -92,63 +92,63 @@ TEST(util_path_filename, alternate_slash_windows)
TEST(util_path_dirname, simple_unix)
{
string str = path_dirname("/tmp/foo.txt");
- EXPECT_EQ("/tmp", str);
+ EXPECT_EQ(str, "/tmp");
}
TEST(util_path_dirname, root_unix)
{
string str = path_dirname("/");
- EXPECT_EQ("", str);
+ EXPECT_EQ(str, "");
}
TEST(util_path_dirname, last_slash_unix)
{
string str = path_dirname("/tmp/foo.txt/");
- EXPECT_EQ("/tmp/foo.txt", str);
+ EXPECT_EQ(str, "/tmp/foo.txt");
}
TEST(util_path_dirname, alternate_slash_unix)
{
string str = path_dirname("/tmp\\foo.txt");
- EXPECT_EQ("/", str);
+ EXPECT_EQ(str, "/");
}
#endif /* !_WIN32 */
TEST(util_path_dirname, file_only)
{
string str = path_dirname("foo.txt");
- EXPECT_EQ("", str);
+ EXPECT_EQ(str, "");
}
TEST(util_path_dirname, empty)
{
string str = path_dirname("");
- EXPECT_EQ("", str);
+ EXPECT_EQ(str, "");
}
#ifdef _WIN32
TEST(util_path_dirname, simple_windows)
{
string str = path_dirname("C:\\tmp\\foo.txt");
- EXPECT_EQ("C:\\tmp", str);
+ EXPECT_EQ(str, "C:\\tmp");
}
TEST(util_path_dirname, root_windows)
{
string str = path_dirname("C:\\");
- EXPECT_EQ("C:", str);
+ EXPECT_EQ(str, "C:");
}
TEST(util_path_dirname, last_slash_windows)
{
string str = path_dirname("C:\\tmp\\foo.txt\\");
- EXPECT_EQ("C:\\tmp\\foo.txt", str);
+ EXPECT_EQ(str, "C:\\tmp\\foo.txt");
}
TEST(util_path_dirname, alternate_slash_windows)
{
string str = path_dirname("C:\\tmp/foo.txt");
- EXPECT_EQ("C:\\tmp", str);
+ EXPECT_EQ(str, "C:\\tmp");
}
#endif /* _WIN32 */
@@ -157,152 +157,152 @@ TEST(util_path_dirname, alternate_slash_windows)
TEST(util_path_join, empty_both)
{
string str = path_join("", "");
- EXPECT_EQ("", str);
+ EXPECT_EQ(str, "");
}
TEST(util_path_join, empty_directory)
{
string str = path_join("", "foo.txt");
- EXPECT_EQ("foo.txt", str);
+ EXPECT_EQ(str, "foo.txt");
}
TEST(util_path_join, empty_filename)
{
string str = path_join("foo", "");
- EXPECT_EQ("foo", str);
+ EXPECT_EQ(str, "foo");
}
#ifndef _WIN32
TEST(util_path_join, simple_unix)
{
string str = path_join("foo", "bar");
- EXPECT_EQ("foo/bar", str);
+ EXPECT_EQ(str, "foo/bar");
}
TEST(util_path_join, directory_slash_unix)
{
string str = path_join("foo/", "bar");
- EXPECT_EQ("foo/bar", str);
+ EXPECT_EQ(str, "foo/bar");
}
TEST(util_path_join, filename_slash_unix)
{
string str = path_join("foo", "/bar");
- EXPECT_EQ("foo/bar", str);
+ EXPECT_EQ(str, "foo/bar");
}
TEST(util_path_join, both_slash_unix)
{
string str = path_join("foo/", "/bar");
- EXPECT_EQ("foo//bar", str);
+ EXPECT_EQ(str, "foo//bar");
}
TEST(util_path_join, directory_alternate_slash_unix)
{
string str = path_join("foo\\", "bar");
- EXPECT_EQ("foo\\/bar", str);
+ EXPECT_EQ(str, "foo\\/bar");
}
TEST(util_path_join, filename_alternate_slash_unix)
{
string str = path_join("foo", "\\bar");
- EXPECT_EQ("foo/\\bar", str);
+ EXPECT_EQ(str, "foo/\\bar");
}
TEST(util_path_join, both_alternate_slash_unix)
{
string str = path_join("foo", "\\bar");
- EXPECT_EQ("foo/\\bar", str);
+ EXPECT_EQ(str, "foo/\\bar");
}
TEST(util_path_join, empty_dir_filename_slash_unix)
{
string str = path_join("", "/foo.txt");
- EXPECT_EQ("/foo.txt", str);
+ EXPECT_EQ(str, "/foo.txt");
}
TEST(util_path_join, empty_dir_filename_alternate_slash_unix)
{
string str = path_join("", "\\foo.txt");
- EXPECT_EQ("\\foo.txt", str);
+ EXPECT_EQ(str, "\\foo.txt");
}
TEST(util_path_join, empty_filename_dir_slash_unix)
{
string str = path_join("foo/", "");
- EXPECT_EQ("foo/", str);
+ EXPECT_EQ(str, "foo/");
}
TEST(util_path_join, empty_filename_dir_alternate_slash_unix)
{
string str = path_join("foo\\", "");
- EXPECT_EQ("foo\\", str);
+ EXPECT_EQ(str, "foo\\");
}
#else /* !_WIN32 */
TEST(util_path_join, simple_windows)
{
string str = path_join("foo", "bar");
- EXPECT_EQ("foo\\bar", str);
+ EXPECT_EQ(str, "foo\\bar");
}
TEST(util_path_join, directory_slash_windows)
{
string str = path_join("foo\\", "bar");
- EXPECT_EQ("foo\\bar", str);
+ EXPECT_EQ(str, "foo\\bar");
}
TEST(util_path_join, filename_slash_windows)
{
string str = path_join("foo", "\\bar");
- EXPECT_EQ("foo\\bar", str);
+ EXPECT_EQ(str, "foo\\bar");
}
TEST(util_path_join, both_slash_windows)
{
string str = path_join("foo\\", "\\bar");
- EXPECT_EQ("foo\\\\bar", str);
+ EXPECT_EQ(str, "foo\\\\bar");
}
TEST(util_path_join, directory_alternate_slash_windows)
{
string str = path_join("foo/", "bar");
- EXPECT_EQ("foo/bar", str);
+ EXPECT_EQ(str, "foo/bar");
}
TEST(util_path_join, filename_alternate_slash_windows)
{
string str = path_join("foo", "/bar");
- EXPECT_EQ("foo/bar", str);
+ EXPECT_EQ(str, "foo/bar");
}
TEST(util_path_join, both_alternate_slash_windows)
{
string str = path_join("foo/", "/bar");
- EXPECT_EQ("foo//bar", str);
+ EXPECT_EQ(str, "foo//bar");
}
TEST(util_path_join, empty_dir_filename_slash_windows)
{
string str = path_join("", "\\foo.txt");
- EXPECT_EQ("\\foo.txt", str);
+ EXPECT_EQ(str, "\\foo.txt");
}
TEST(util_path_join, empty_dir_filename_alternate_slash_windows)
{
string str = path_join("", "/foo.txt");
- EXPECT_EQ("/foo.txt", str);
+ EXPECT_EQ(str, "/foo.txt");
}
TEST(util_path_join, empty_filename_dir_slash_windows)
{
string str = path_join("foo\\", "");
- EXPECT_EQ("foo\\", str);
+ EXPECT_EQ(str, "foo\\");
}
TEST(util_path_join, empty_filename_dir_alternate_slash_windows)
{
string str = path_join("foo/", "");
- EXPECT_EQ("foo/", str);
+ EXPECT_EQ(str, "foo/");
}
#endif /* !_WIN32 */
@@ -311,31 +311,31 @@ TEST(util_path_join, empty_filename_dir_alternate_slash_windows)
TEST(util_path_escape, no_escape_chars)
{
string str = path_escape("/tmp/foo/bar");
- EXPECT_EQ("/tmp/foo/bar", str);
+ EXPECT_EQ(str, "/tmp/foo/bar");
}
TEST(util_path_escape, simple)
{
string str = path_escape("/tmp/foo bar");
- EXPECT_EQ("/tmp/foo\\ bar", str);
+ EXPECT_EQ(str, "/tmp/foo\\ bar");
}
TEST(util_path_escape, simple_end)
{
string str = path_escape("/tmp/foo/bar ");
- EXPECT_EQ("/tmp/foo/bar\\ ", str);
+ EXPECT_EQ(str, "/tmp/foo/bar\\ ");
}
TEST(util_path_escape, multiple)
{
string str = path_escape("/tmp/foo bar");
- EXPECT_EQ("/tmp/foo\\ \\ bar", str);
+ EXPECT_EQ(str, "/tmp/foo\\ \\ bar");
}
TEST(util_path_escape, simple_multiple_end)
{
string str = path_escape("/tmp/foo/bar ");
- EXPECT_EQ("/tmp/foo/bar\\ \\ ", str);
+ EXPECT_EQ(str, "/tmp/foo/bar\\ \\ ");
}
/* ******** Tests for path_is_relative() ******** */
diff --git a/intern/cycles/test/util_string_test.cpp b/intern/cycles/test/util_string_test.cpp
index e502a35704..22ec8e0ee8 100644
--- a/intern/cycles/test/util_string_test.cpp
+++ b/intern/cycles/test/util_string_test.cpp
@@ -25,25 +25,25 @@ CCL_NAMESPACE_BEGIN
TEST(util_string_printf, no_format)
{
string str = string_printf("foo bar");
- EXPECT_EQ(str, "foo bar");
+ EXPECT_EQ("foo bar", str);
}
T
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list