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

[ju...@apache.org]

Author: julianfoad
Date: Wed Nov  3 12:53:31 2010
New Revision: 1030439

URL: http://svn.apache.org/viewvc?rev=1030439&view=rev
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
  (wc_wc_copies): Add two more sub-tests, testing copies onto schedule-
    delete paths, which result in replacements.

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=1030439&r1=1030438&r2=1030439&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Wed Nov  3 12:53:31 2010
@@ -451,6 +451,11 @@ wc_wc_copies(wc_baton_t *b)
   SVN_ERR(wc_copy(b, source_base_file, source_copied_file));
   SVN_ERR(wc_copy(b, source_base_dir, source_copied_dir));
 
+  /* Delete some nodes so that we can test copying onto these paths */
+
+  SVN_ERR(wc_delete(b, "A/D/gamma"));
+  SVN_ERR(wc_delete(b, "A/D/G"));
+
   /* Test copying various things */
 
   {
@@ -517,6 +522,26 @@ wc_wc_copies(wc_baton_t *b)
             { 4, "E-copied/beta",   "normal",   NO_COPY_FROM }
           } },
 
+        /* dir onto a schedule-delete file */
+        { source_base_dir, "A/D/gamma", {
+            { 0, "",                "normal",   1, "A/D/gamma" },
+            { 3, "",                "normal",   1, source_base_dir },
+            { 3, "alpha",           "normal",   NO_COPY_FROM },
+            { 3, "beta",            "normal",   NO_COPY_FROM }
+          } },
+
+        /* file onto a schedule-delete dir */
+        { source_base_file, "A/D/G", {
+            { 0, "",                "normal",   1, "A/D/G" },
+            { 0, "pi",              "normal",   1, "A/D/G/pi" },
+            { 0, "rho",             "normal",   1, "A/D/G/rho" },
+            { 0, "tau",             "normal",   1, "A/D/G/tau" },
+            { 3, "",                "normal",   1, source_base_file },
+            { 3, "pi",              "base-deleted",   NO_COPY_FROM },
+            { 3, "rho",             "base-deleted",   NO_COPY_FROM },
+            { 3, "tau",             "base-deleted",   NO_COPY_FROM }
+          } },
+
         { 0 }
       };
     struct subtest_t *subtest;
@@ -650,6 +675,20 @@ test_deletes(const svn_test_opts_t *opts
   return SVN_NO_ERROR;
 }
 
+static svn_error_t *
+test_adds(const svn_test_opts_t *opts, apr_pool_t *pool)
+{
+  wc_baton_t b;
+
+  b.pool = pool;
+  SVN_ERR(svn_test__create_repos_and_wc(&b.repos_url, &b.wc_abspath,
+                                        "adds", opts, pool));
+  SVN_ERR(svn_wc_context_create(&b.wc_ctx, NULL, pool, pool));
+
+
+  return SVN_NO_ERROR;
+}
+
 
 static svn_error_t *
 test_delete_of_copies(const svn_test_opts_t *opts, apr_pool_t *pool)
@@ -824,5 +863,8 @@ struct svn_test_descriptor_t test_funcs[
     SVN_TEST_OPTS_WIMP(test_delete_with_base,
                        "test_delete_with_base",
                        "needs op_depth"),
+    SVN_TEST_OPTS_WIMP(test_adds,
+                       "adds",
+                       "needs op_depth"),
     SVN_TEST_NULL
   };