svn commit: r1326673 - /subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c

[philip]

Author: philip
Date: Mon Apr 16 16:17:59 2012
New Revision: 1326673

URL: http://svn.apache.org/viewvc?rev=1326673&view=rev
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
  (test_scan_delete): Extend with another case.

Modified:
    subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c

Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1326673&r1=1326672&r2=1326673&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Mon Apr 16 
16:17:59 2012
@@ -4594,7 +4594,7 @@ test_scan_delete(const svn_test_opts_t *
   SVN_ERR(wc_update(&b, "", 1));
 
   SVN_ERR(wc_move(&b, "A2", "X"));
-  SVN_ERR(wc_delete(&b, "X/B"));
+  SVN_ERR(wc_move(&b, "X/B", "Z"));
   SVN_ERR(wc_move(&b, "A/B", "X/B"));
   SVN_ERR(wc_move(&b, "X/B/C", "Y"));
   SVN_ERR(wc_move(&b, "C2", "X/B/C"));
@@ -4610,11 +4610,12 @@ test_scan_delete(const svn_test_opts_t *
       {0, "C2",       "normal",       1, "C2"},
       {1, "A2",       "base-deleted", NO_COPY_FROM, "X"},
       {1, "A2/B",     "base-deleted", NO_COPY_FROM},
+      {1, "Z",        "normal",       1, "A2/B", MOVED_HERE},
       {1, "X",        "normal",       1, "A2", MOVED_HERE},
       {1, "X/B",      "normal",       1, "A2/B", MOVED_HERE},
       {2, "A/B",      "base-deleted", NO_COPY_FROM, "X/B"},
       {2, "A/B/C",    "base-deleted", NO_COPY_FROM},
-      {2, "X/B",      "normal",       1, "A/B", MOVED_HERE},
+      {2, "X/B",      "normal",       1, "A/B", FALSE, "Z", TRUE},
       {2, "X/B/C",    "normal",       1, "A/B/C", MOVED_HERE},
       {1, "Y",        "normal",       1, "A/B/C", MOVED_HERE},
       {1, "C2",       "base-deleted", NO_COPY_FROM, "X/B/C"},
@@ -4638,7 +4639,7 @@ test_scan_delete(const svn_test_opts_t *
   SVN_TEST_STRING_ASSERT(moved_to_abspath, wc_path(&b, "X/B"));
   SVN_TEST_STRING_ASSERT(moved_to_op_root_abspath, wc_path(&b, "X/B"));
 
-  /* XFAIL here as it gives moved-to X/Y/Z rather than Y. */
+  /* Not clear what this should give: Y or A/B/C or ... ? */
   SVN_ERR(svn_wc__db_scan_deletion(NULL, &moved_to_abspath,
                                    NULL, &moved_to_op_root_abspath,
                                    b.wc_ctx->db, wc_path(&b, "A/B/C"),
@@ -4646,6 +4647,21 @@ test_scan_delete(const svn_test_opts_t *
   SVN_TEST_STRING_ASSERT(moved_to_abspath, wc_path(&b, "Y"));
   SVN_TEST_STRING_ASSERT(moved_to_op_root_abspath, wc_path(&b, "Y"));
 
+  SVN_ERR(svn_wc__db_scan_deletion(NULL, &moved_to_abspath,
+                                   NULL, &moved_to_op_root_abspath,
+                                   b.wc_ctx->db, wc_path(&b, "A2"),
+                                   pool, pool));
+  SVN_TEST_STRING_ASSERT(moved_to_abspath, wc_path(&b, "X"));
+  SVN_TEST_STRING_ASSERT(moved_to_op_root_abspath, wc_path(&b, "X"));
+
+  /* Not clear what this should give: Z or X/B or ... ? */
+  SVN_ERR(svn_wc__db_scan_deletion(NULL, &moved_to_abspath,
+                                   NULL, &moved_to_op_root_abspath,
+                                   b.wc_ctx->db, wc_path(&b, "A2/B"),
+                                   pool, pool));
+  SVN_TEST_STRING_ASSERT(moved_to_abspath, wc_path(&b, "Z"));
+  SVN_TEST_STRING_ASSERT(moved_to_op_root_abspath, wc_path(&b, "Z"));
+
   return SVN_NO_ERROR;
 }