You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ja...@apache.org on 2016/03/20 14:35:10 UTC
svn commit: r1735880 -
/subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c
Author: jamessan
Date: Sun Mar 20 13:35:09 2016
New Revision: 1735880
URL: http://svn.apache.org/viewvc?rev=1735880&view=rev
Log:
* subversion/tests/libsvn_diff/parse-diff-test.c
(test_parse_git_tree_and_text_diff, test_parse_git_diff): Assert on
{old,new}_{executable,symlink}_bit equality with expected value instead of
the reslut of the assignment of the expected value.
Found by: Coverity <https://scan.coverity.com/>
(CID: 1356909-1356916, 1356946-1356952)
Modified:
subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c
Modified: subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c?rev=1735880&r1=1735879&r2=1735880&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c Sun Mar 20 13:35:09 2016
@@ -471,10 +471,10 @@ test_parse_git_diff(apr_pool_t *pool)
SVN_TEST_STRING_ASSERT(patch->new_filename, "A/C/gamma");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_modified);
SVN_TEST_ASSERT(patch->hunks->nelts == 1);
- SVN_TEST_ASSERT(patch->old_executable_bit = svn_tristate_false);
- SVN_TEST_ASSERT(patch->new_executable_bit = svn_tristate_true);
- SVN_TEST_ASSERT(patch->old_symlink_bit = svn_tristate_false);
- SVN_TEST_ASSERT(patch->new_symlink_bit = svn_tristate_false);
+ SVN_TEST_ASSERT(patch->old_executable_bit == svn_tristate_false);
+ SVN_TEST_ASSERT(patch->new_executable_bit == svn_tristate_true);
+ SVN_TEST_ASSERT(patch->old_symlink_bit == svn_tristate_false);
+ SVN_TEST_ASSERT(patch->new_symlink_bit == svn_tristate_false);
hunk = APR_ARRAY_IDX(patch->hunks, 0, svn_diff_hunk_t *);
@@ -510,10 +510,10 @@ test_parse_git_diff(apr_pool_t *pool)
SVN_TEST_STRING_ASSERT(patch->new_filename, "new");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_added);
SVN_TEST_ASSERT(patch->hunks->nelts == 0);
- SVN_TEST_ASSERT(patch->old_executable_bit = svn_tristate_unknown);
- SVN_TEST_ASSERT(patch->new_executable_bit = svn_tristate_false);
- SVN_TEST_ASSERT(patch->old_symlink_bit = svn_tristate_unknown);
- SVN_TEST_ASSERT(patch->new_symlink_bit = svn_tristate_false);
+ SVN_TEST_ASSERT(patch->old_executable_bit == svn_tristate_unknown);
+ SVN_TEST_ASSERT(patch->new_executable_bit == svn_tristate_false);
+ SVN_TEST_ASSERT(patch->old_symlink_bit == svn_tristate_unknown);
+ SVN_TEST_ASSERT(patch->new_symlink_bit == svn_tristate_false);
SVN_ERR(svn_diff_close_patch_file(patch_file, pool));
@@ -539,10 +539,10 @@ test_parse_git_tree_and_text_diff(apr_po
SVN_TEST_ASSERT(patch);
SVN_TEST_STRING_ASSERT(patch->old_filename, "iota");
SVN_TEST_STRING_ASSERT(patch->new_filename, "iota.copied");
- SVN_TEST_ASSERT(patch->old_executable_bit = svn_tristate_false);
- SVN_TEST_ASSERT(patch->new_executable_bit = svn_tristate_true);
- SVN_TEST_ASSERT(patch->old_symlink_bit = svn_tristate_false);
- SVN_TEST_ASSERT(patch->new_symlink_bit = svn_tristate_false);
+ SVN_TEST_ASSERT(patch->old_executable_bit == svn_tristate_false);
+ SVN_TEST_ASSERT(patch->new_executable_bit == svn_tristate_true);
+ SVN_TEST_ASSERT(patch->old_symlink_bit == svn_tristate_false);
+ SVN_TEST_ASSERT(patch->new_symlink_bit == svn_tristate_false);
SVN_TEST_ASSERT(patch->operation == svn_diff_op_copied);
SVN_TEST_ASSERT(patch->hunks->nelts == 1);
@@ -565,10 +565,10 @@ test_parse_git_tree_and_text_diff(apr_po
SVN_TEST_ASSERT(patch);
SVN_TEST_STRING_ASSERT(patch->old_filename, "A/mu");
SVN_TEST_STRING_ASSERT(patch->new_filename, "A/mu.moved");
- SVN_TEST_ASSERT(patch->old_executable_bit = svn_tristate_false);
- SVN_TEST_ASSERT(patch->new_executable_bit = svn_tristate_true);
- SVN_TEST_ASSERT(patch->old_symlink_bit = svn_tristate_false);
- SVN_TEST_ASSERT(patch->new_symlink_bit = svn_tristate_false);
+ SVN_TEST_ASSERT(patch->old_executable_bit == svn_tristate_false);
+ SVN_TEST_ASSERT(patch->new_executable_bit == svn_tristate_true);
+ SVN_TEST_ASSERT(patch->old_symlink_bit == svn_tristate_false);
+ SVN_TEST_ASSERT(patch->new_symlink_bit == svn_tristate_false);
SVN_TEST_ASSERT(patch->operation == svn_diff_op_moved);
SVN_TEST_ASSERT(patch->hunks->nelts == 1);
@@ -612,10 +612,10 @@ test_parse_git_tree_and_text_diff(apr_po
SVN_TEST_STRING_ASSERT(patch->new_filename, "/dev/null");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_deleted);
SVN_TEST_ASSERT(patch->hunks->nelts == 1);
- SVN_TEST_ASSERT(patch->old_executable_bit = svn_tristate_true);
- SVN_TEST_ASSERT(patch->new_executable_bit = svn_tristate_unknown);
- SVN_TEST_ASSERT(patch->old_symlink_bit = svn_tristate_false);
- SVN_TEST_ASSERT(patch->new_symlink_bit = svn_tristate_unknown);
+ SVN_TEST_ASSERT(patch->old_executable_bit == svn_tristate_true);
+ SVN_TEST_ASSERT(patch->new_executable_bit == svn_tristate_unknown);
+ SVN_TEST_ASSERT(patch->old_symlink_bit == svn_tristate_false);
+ SVN_TEST_ASSERT(patch->new_symlink_bit == svn_tristate_unknown);
hunk = APR_ARRAY_IDX(patch->hunks, 0, svn_diff_hunk_t *);