archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

ClangFormat: apply to source, most of intern

Browse Source 
Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat
This commit is contained in:
Campbell Barton
2019-04-17 06:17:24 +02:00
parent b3dabc200a
commit e12c08e8d1
4481 changed files with 1230080 additions and 1155401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

250
intern/cycles/test/util_path_test.cpp
View File

@@ -25,377 +25,377 @@ CCL_NAMESPACE_BEGIN
#ifndef _WIN32
TEST(util_path_filename, simple_unix)
{
string str = path_filename("/tmp/foo.txt");
EXPECT_EQ(str, "foo.txt");
string str = path_filename("/tmp/foo.txt");
EXPECT_EQ(str, "foo.txt");
}
TEST(util_path_filename, root_unix)
{
string str = path_filename("/");
EXPECT_EQ(str, "/");
string str = path_filename("/");
EXPECT_EQ(str, "/");
}
TEST(util_path_filename, last_slash_unix)
{
string str = path_filename("/tmp/foo.txt/");
EXPECT_EQ(str, ".");
string str = path_filename("/tmp/foo.txt/");
EXPECT_EQ(str, ".");
}
TEST(util_path_filename, alternate_slash_unix)
{
string str = path_filename("/tmp\\foo.txt");
EXPECT_EQ(str, "tmp\\foo.txt");
string str = path_filename("/tmp\\foo.txt");
EXPECT_EQ(str, "tmp\\foo.txt");
}
#endif /* !_WIN32 */
#endif /* !_WIN32 */
TEST(util_path_filename, file_only)
{
string str = path_filename("foo.txt");
EXPECT_EQ(str, "foo.txt");
string str = path_filename("foo.txt");
EXPECT_EQ(str, "foo.txt");
}
TEST(util_path_filename, empty)
{
string str = path_filename("");
EXPECT_EQ(str, "");
string str = path_filename("");
EXPECT_EQ(str, "");
}
#ifdef _WIN32
TEST(util_path_filename, simple_windows)
{
string str = path_filename("C:\\tmp\\foo.txt");
EXPECT_EQ(str, "foo.txt");
string str = path_filename("C:\\tmp\\foo.txt");
EXPECT_EQ(str, "foo.txt");
}
TEST(util_path_filename, root_windows)
{
string str = path_filename("C:\\");
EXPECT_EQ(str, "\\");
string str = path_filename("C:\\");
EXPECT_EQ(str, "\\");
}
TEST(util_path_filename, last_slash_windows)
{
string str = path_filename("C:\\tmp\\foo.txt\\");
EXPECT_EQ(str, ".");
string str = path_filename("C:\\tmp\\foo.txt\\");
EXPECT_EQ(str, ".");
}
TEST(util_path_filename, alternate_slash_windows)
{
string str = path_filename("C:\\tmp/foo.txt");
EXPECT_EQ(str, "foo.txt");
string str = path_filename("C:\\tmp/foo.txt");
EXPECT_EQ(str, "foo.txt");
}
#endif /* _WIN32 */
#endif /* _WIN32 */
/* ******** Tests for path_dirname() ******** */
#ifndef _WIN32
TEST(util_path_dirname, simple_unix)
{
string str = path_dirname("/tmp/foo.txt");
EXPECT_EQ(str, "/tmp");
string str = path_dirname("/tmp/foo.txt");
EXPECT_EQ(str, "/tmp");
}
TEST(util_path_dirname, root_unix)
{
string str = path_dirname("/");
EXPECT_EQ(str, "");
string str = path_dirname("/");
EXPECT_EQ(str, "");
}
TEST(util_path_dirname, last_slash_unix)
{
string str = path_dirname("/tmp/foo.txt/");
EXPECT_EQ(str, "/tmp/foo.txt");
string str = path_dirname("/tmp/foo.txt/");
EXPECT_EQ(str, "/tmp/foo.txt");
}
TEST(util_path_dirname, alternate_slash_unix)
{
string str = path_dirname("/tmp\\foo.txt");
EXPECT_EQ(str, "/");
string str = path_dirname("/tmp\\foo.txt");
EXPECT_EQ(str, "/");
}
#endif /* !_WIN32 */
#endif /* !_WIN32 */
TEST(util_path_dirname, file_only)
{
string str = path_dirname("foo.txt");
EXPECT_EQ(str, "");
string str = path_dirname("foo.txt");
EXPECT_EQ(str, "");
}
TEST(util_path_dirname, empty)
{
string str = path_dirname("");
EXPECT_EQ(str, "");
string str = path_dirname("");
EXPECT_EQ(str, "");
}
#ifdef _WIN32
TEST(util_path_dirname, simple_windows)
{
string str = path_dirname("C:\\tmp\\foo.txt");
EXPECT_EQ(str, "C:\\tmp");
string str = path_dirname("C:\\tmp\\foo.txt");
EXPECT_EQ(str, "C:\\tmp");
}
TEST(util_path_dirname, root_windows)
{
string str = path_dirname("C:\\");
EXPECT_EQ(str, "C:");
string str = path_dirname("C:\\");
EXPECT_EQ(str, "C:");
}
TEST(util_path_dirname, last_slash_windows)
{
string str = path_dirname("C:\\tmp\\foo.txt\\");
EXPECT_EQ(str, "C:\\tmp\\foo.txt");
string str = path_dirname("C:\\tmp\\foo.txt\\");
EXPECT_EQ(str, "C:\\tmp\\foo.txt");
}
TEST(util_path_dirname, alternate_slash_windows)
{
string str = path_dirname("C:\\tmp/foo.txt");
EXPECT_EQ(str, "C:\\tmp");
string str = path_dirname("C:\\tmp/foo.txt");
EXPECT_EQ(str, "C:\\tmp");
}
#endif /* _WIN32 */
#endif /* _WIN32 */
/* ******** Tests for path_join() ******** */
TEST(util_path_join, empty_both)
{
string str = path_join("", "");
EXPECT_EQ(str, "");
string str = path_join("", "");
EXPECT_EQ(str, "");
}
TEST(util_path_join, empty_directory)
{
string str = path_join("", "foo.txt");
EXPECT_EQ(str, "foo.txt");
string str = path_join("", "foo.txt");
EXPECT_EQ(str, "foo.txt");
}
TEST(util_path_join, empty_filename)
{
string str = path_join("foo", "");
EXPECT_EQ(str, "foo");
string str = path_join("foo", "");
EXPECT_EQ(str, "foo");
}
#ifndef _WIN32
TEST(util_path_join, simple_unix)
{
string str = path_join("foo", "bar");
EXPECT_EQ(str, "foo/bar");
string str = path_join("foo", "bar");
EXPECT_EQ(str, "foo/bar");
}
TEST(util_path_join, directory_slash_unix)
{
string str = path_join("foo/", "bar");
EXPECT_EQ(str, "foo/bar");
string str = path_join("foo/", "bar");
EXPECT_EQ(str, "foo/bar");
}
TEST(util_path_join, filename_slash_unix)
{
string str = path_join("foo", "/bar");
EXPECT_EQ(str, "foo/bar");
string str = path_join("foo", "/bar");
EXPECT_EQ(str, "foo/bar");
}
TEST(util_path_join, both_slash_unix)
{
string str = path_join("foo/", "/bar");
EXPECT_EQ(str, "foo//bar");
string str = path_join("foo/", "/bar");
EXPECT_EQ(str, "foo//bar");
}
TEST(util_path_join, directory_alternate_slash_unix)
{
string str = path_join("foo\\", "bar");
EXPECT_EQ(str, "foo\\/bar");
string str = path_join("foo\\", "bar");
EXPECT_EQ(str, "foo\\/bar");
}
TEST(util_path_join, filename_alternate_slash_unix)
{
string str = path_join("foo", "\\bar");
EXPECT_EQ(str, "foo/\\bar");
string str = path_join("foo", "\\bar");
EXPECT_EQ(str, "foo/\\bar");
}
TEST(util_path_join, both_alternate_slash_unix)
{
string str = path_join("foo", "\\bar");
EXPECT_EQ(str, "foo/\\bar");
string str = path_join("foo", "\\bar");
EXPECT_EQ(str, "foo/\\bar");
}
TEST(util_path_join, empty_dir_filename_slash_unix)
{
string str = path_join("", "/foo.txt");
EXPECT_EQ(str, "/foo.txt");
string str = path_join("", "/foo.txt");
EXPECT_EQ(str, "/foo.txt");
}
TEST(util_path_join, empty_dir_filename_alternate_slash_unix)
{
string str = path_join("", "\\foo.txt");
EXPECT_EQ(str, "\\foo.txt");
string str = path_join("", "\\foo.txt");
EXPECT_EQ(str, "\\foo.txt");
}
TEST(util_path_join, empty_filename_dir_slash_unix)
{
string str = path_join("foo/", "");
EXPECT_EQ(str, "foo/");
string str = path_join("foo/", "");
EXPECT_EQ(str, "foo/");
}
TEST(util_path_join, empty_filename_dir_alternate_slash_unix)
{
string str = path_join("foo\\", "");
EXPECT_EQ(str, "foo\\");
string str = path_join("foo\\", "");
EXPECT_EQ(str, "foo\\");
}
#else /* !_WIN32 */
TEST(util_path_join, simple_windows)
{
string str = path_join("foo", "bar");
EXPECT_EQ(str, "foo\\bar");
string str = path_join("foo", "bar");
EXPECT_EQ(str, "foo\\bar");
}
TEST(util_path_join, directory_slash_windows)
{
string str = path_join("foo\\", "bar");
EXPECT_EQ(str, "foo\\bar");
string str = path_join("foo\\", "bar");
EXPECT_EQ(str, "foo\\bar");
}
TEST(util_path_join, filename_slash_windows)
{
string str = path_join("foo", "\\bar");
EXPECT_EQ(str, "foo\\bar");
string str = path_join("foo", "\\bar");
EXPECT_EQ(str, "foo\\bar");
}
TEST(util_path_join, both_slash_windows)
{
string str = path_join("foo\\", "\\bar");
EXPECT_EQ(str, "foo\\\\bar");
string str = path_join("foo\\", "\\bar");
EXPECT_EQ(str, "foo\\\\bar");
}
TEST(util_path_join, directory_alternate_slash_windows)
{
string str = path_join("foo/", "bar");
EXPECT_EQ(str, "foo/bar");
string str = path_join("foo/", "bar");
EXPECT_EQ(str, "foo/bar");
}
TEST(util_path_join, filename_alternate_slash_windows)
{
string str = path_join("foo", "/bar");
EXPECT_EQ(str, "foo/bar");
string str = path_join("foo", "/bar");
EXPECT_EQ(str, "foo/bar");
}
TEST(util_path_join, both_alternate_slash_windows)
{
string str = path_join("foo/", "/bar");
EXPECT_EQ(str, "foo//bar");
string str = path_join("foo/", "/bar");
EXPECT_EQ(str, "foo//bar");
}
TEST(util_path_join, empty_dir_filename_slash_windows)
{
string str = path_join("", "\\foo.txt");
EXPECT_EQ(str, "\\foo.txt");
string str = path_join("", "\\foo.txt");
EXPECT_EQ(str, "\\foo.txt");
}
TEST(util_path_join, empty_dir_filename_alternate_slash_windows)
{
string str = path_join("", "/foo.txt");
EXPECT_EQ(str, "/foo.txt");
string str = path_join("", "/foo.txt");
EXPECT_EQ(str, "/foo.txt");
}
TEST(util_path_join, empty_filename_dir_slash_windows)
{
string str = path_join("foo\\", "");
EXPECT_EQ(str, "foo\\");
string str = path_join("foo\\", "");
EXPECT_EQ(str, "foo\\");
}
TEST(util_path_join, empty_filename_dir_alternate_slash_windows)
{
string str = path_join("foo/", "");
EXPECT_EQ(str, "foo/");
string str = path_join("foo/", "");
EXPECT_EQ(str, "foo/");
}
#endif /* !_WIN32 */
#endif /* !_WIN32 */
/* ******** Tests for path_escape() ******** */
TEST(util_path_escape, no_escape_chars)
{
string str = path_escape("/tmp/foo/bar");
EXPECT_EQ(str, "/tmp/foo/bar");
string str = path_escape("/tmp/foo/bar");
EXPECT_EQ(str, "/tmp/foo/bar");
}
TEST(util_path_escape, simple)
{
string str = path_escape("/tmp/foo bar");
EXPECT_EQ(str, "/tmp/foo\\ bar");
string str = path_escape("/tmp/foo bar");
EXPECT_EQ(str, "/tmp/foo\\ bar");
}
TEST(util_path_escape, simple_end)
{
string str = path_escape("/tmp/foo/bar ");
EXPECT_EQ(str, "/tmp/foo/bar\\ ");
string str = path_escape("/tmp/foo/bar ");
EXPECT_EQ(str, "/tmp/foo/bar\\ ");
}
TEST(util_path_escape, multiple)
{
string str = path_escape("/tmp/foo bar");
EXPECT_EQ(str, "/tmp/foo\\ \\ bar");
string str = path_escape("/tmp/foo bar");
EXPECT_EQ(str, "/tmp/foo\\ \\ bar");
}
TEST(util_path_escape, simple_multiple_end)
{
string str = path_escape("/tmp/foo/bar ");
EXPECT_EQ(str, "/tmp/foo/bar\\ \\ ");
string str = path_escape("/tmp/foo/bar ");
EXPECT_EQ(str, "/tmp/foo/bar\\ \\ ");
}
/* ******** Tests for path_is_relative() ******** */
TEST(util_path_is_relative, filename)
{
bool is_relative = path_is_relative("foo.txt");
EXPECT_TRUE(is_relative);
bool is_relative = path_is_relative("foo.txt");
EXPECT_TRUE(is_relative);
}
#ifndef _WIN32
TEST(util_path_is_relative, absolute_unix)
{
bool is_relative = path_is_relative("/tmp/foo.txt");
EXPECT_FALSE(is_relative);
bool is_relative = path_is_relative("/tmp/foo.txt");
EXPECT_FALSE(is_relative);
}
TEST(util_path_is_relative, relative_dir_unix)
{
bool is_relative = path_is_relative("tmp/foo.txt");
EXPECT_TRUE(is_relative);
bool is_relative = path_is_relative("tmp/foo.txt");
EXPECT_TRUE(is_relative);
}
TEST(util_path_is_relative, absolute_windir_on_unix)
{
bool is_relative = path_is_relative("C:\\tmp\\foo.txt");
EXPECT_TRUE(is_relative);
bool is_relative = path_is_relative("C:\\tmp\\foo.txt");
EXPECT_TRUE(is_relative);
}
TEST(util_path_is_relative, relative_windir_on_unix)
{
bool is_relative = path_is_relative("tmp\\foo.txt");
EXPECT_TRUE(is_relative);
bool is_relative = path_is_relative("tmp\\foo.txt");
EXPECT_TRUE(is_relative);
}
#endif /* !_WIN32 */
#endif /* !_WIN32 */
#ifdef _WIN32
TEST(util_path_is_relative, absolute_windows)
{
bool is_relative = path_is_relative("C:\\tmp\\foo.txt");
EXPECT_FALSE(is_relative);
bool is_relative = path_is_relative("C:\\tmp\\foo.txt");
EXPECT_FALSE(is_relative);
}
TEST(util_path_is_relative, relative_dir_windows)
{
bool is_relative = path_is_relative("tmp\\foo.txt");
EXPECT_TRUE(is_relative);
bool is_relative = path_is_relative("tmp\\foo.txt");
EXPECT_TRUE(is_relative);
}
TEST(util_path_is_relative, absolute_unixdir_on_windows)
{
bool is_relative = path_is_relative("/tmp/foo.txt");
EXPECT_TRUE(is_relative);
bool is_relative = path_is_relative("/tmp/foo.txt");
EXPECT_TRUE(is_relative);
}
TEST(util_path_is_relative, relative_unixdir_on_windows)
{
bool is_relative = path_is_relative("tmp/foo.txt");
EXPECT_TRUE(is_relative);
bool is_relative = path_is_relative("tmp/foo.txt");
EXPECT_TRUE(is_relative);
}
#endif /* _WIN32 */
#endif /* _WIN32 */
CCL_NAMESPACE_END