Tidy some test code, prior to extending it.

* subversion/tests/libsvn_wc/conflict-data-test.c
  (ASSERT_INT_EQ, ASSERT_STR_EQ): New macros; the first one gives much more
    useful debug output when it fails than a simple assert(a == b) does.
  (compare_version, compare_conflict): Swap the 'actual' and 'expected'
    arguments to match the way SVN_TEST_STRING_ASSERT has them ('actual'
    first), so that error messages from SVN_TEST_STRING_ASSERT make sense.
    Use the new macros.
  (test_read_write_tree_conflicts): Adjust callers.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1477891 13f79535-47bb-0310-9956-ffa450edef68