svn commit: r1409875 - in /subversion/trunk: build.conf subversion/tests/libsvn_client/client-test.c subversion/tests/libsvn_wc/ subversion/tests/libsvn_wc/externals-test.c

[ne...@apache.org]

Author: neels
Date: Thu Nov 15 16:44:52 2012
New Revision: 1409875

URL: http://svn.apache.org/viewvc?rev=1409875&view=rev
Log:
Move the single test in libsvn_wc/externals-test.c over to
libsvn_client/client-test.c (and simplify).

* subversion/tests/libsvn_wc/externals-test.c,
* build.conf:
   Remove externals-test.c

* subversion/tests/libsvn_client/client-test.c
  (test_externals_parse_erratic, test_funcs): New test.

Suggested by: rhuijben

Removed:
    subversion/trunk/subversion/tests/libsvn_wc/externals-test.c
Modified:
    subversion/trunk/build.conf
    subversion/trunk/subversion/tests/libsvn_client/client-test.c
    subversion/trunk/subversion/tests/libsvn_wc/   (props changed)

Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1409875&r1=1409874&r2=1409875&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Thu Nov 15 16:44:52 2012
@@ -1022,14 +1022,6 @@ sources = wc-queries-test.c
 install = test
 libs = libsvn_test libsvn_subr apriconv apr sqlite
 
-[externals-test]
-description = Test externals
-type = exe
-path = subversion/tests/libsvn_wc
-sources = externals-test.c utils.c
-install = test
-libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
-
 # ----------------------------------------------------------------------------
 # These are not unit tests at all, they are small programs that exercise
 # parts of the libsvn_delta API from the command line.  They are stuck here
@@ -1191,7 +1183,7 @@ libs = __ALL__
        diff diff3 diff4 fsfs-reorg svn-bench
        client-test
        conflict-data-test db-test pristine-store-test entries-compat-test
-       op-depth-test dirent_uri-test wc-queries-test externals-test
+       op-depth-test dirent_uri-test wc-queries-test
        auth-test
        parse-diff-test
        svn-rep-sharing-stats svn-populate-node-origins-index

Modified: subversion/trunk/subversion/tests/libsvn_client/client-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/client-test.c?rev=1409875&r1=1409874&r2=1409875&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/client-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/client-test.c Thu Nov 15 16:44:52 2012
@@ -801,6 +801,29 @@ test_externals_parse(const svn_test_opts
 
 }
 
+static svn_error_t *
+test_externals_parse_erratic(apr_pool_t *pool)
+{
+  svn_error_t *err;
+  apr_array_header_t *list = NULL;
+
+  err = svn_wc_parse_externals_description3(
+          &list, "parent_dir",
+          "^/valid/but/should/not/be/on/record wc_target\n"
+           "because_this_is_an_error",
+          FALSE, pool);
+
+  /* DESC above has an error, so expect one. */
+  SVN_TEST_ASSERT(err != NULL);
+  svn_error_clear(err);
+
+  /* svn_wc_parse_externals_description3() should not
+     touch LIST when DESC had an error.*/
+  SVN_TEST_ASSERT(list == NULL);
+
+  return SVN_NO_ERROR;
+}
+
 
 
 
@@ -821,5 +844,6 @@ struct svn_test_descriptor_t test_funcs[
 #endif
     SVN_TEST_OPTS_PASS(test_youngest_common_ancestor, "test youngest_common_ancestor"),
     SVN_TEST_OPTS_PASS(test_externals_parse, "test svn_wc_parse_externals_description3"),
+    SVN_TEST_PASS2(test_externals_parse_erratic, "parse erratic externals definition"),
     SVN_TEST_NULL
   };

Propchange: subversion/trunk/subversion/tests/libsvn_wc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 15 16:44:52 2012
@@ -11,4 +11,3 @@ tree-conflict-data-test
 wc-incomplete-tester
 wc-lock-tester
 wc-queries-test
-externals-test