On Mon, 2010-12-20, Danny Trebbien wrote: > [[[ > Add a public API function, svn_subst_translate_string2(), an extension of > svn_subst_translate_string(), that has two additional output parameters for > determining whether re-encoding and/or line ending translation were performed. [...]
Thanks, Danny. Committed revision 1051322. The main patch looks great. In the test file, I made the minimum changes necessary to comply with the C'89 language (no // comments, no declarations after code), and committed it. However I suggest many further changes to the test code, mainly making it data-driven (use a table of inputs and expected outputs) and use helpers such as SVN_TEST_STRING_ASSERT() to maximize readability. To this end, I suggest the version attached here. Do you want to check this for me, to see if it still does what you wanted it to, and let me know if I should commit it. Thanks again. - Julian
/* * subst_translate-test.c -- test the svn_subst_translate* functions * * ==================================================================== * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. * ==================================================================== */ #include "../svn_test.h" #include "svn_types.h" #include "svn_string.h" #include "svn_subst.h" /* Test inputs and expected output for svn_subst_translate_string2(). */ struct translate_string2_data_t { const char *source; const char *expected_str; svn_boolean_t translated_to_utf8; svn_boolean_t translated_line_endings; }; static svn_error_t * test_svn_subst_translate_string2(apr_pool_t *pool) { static const struct translate_string2_data_t tests[] = { /* No reencoding, no translation of line endings */ { "abcdefz", "abcdefz", FALSE, FALSE }, /* No reencoding, translation of line endings */ { " \r\n\r\n \r\n \r\n", " \n\n \n \n", FALSE, TRUE }, /* Reencoding, no translation of line endings */ { "\xc7\xa9\xf4\xdf", "\xc3\x87\xc2\xa9\xc3\xb4\xc3\x9f", TRUE, FALSE }, /* Reencoding, translation of line endings */ { "\xc7\xa9\xf4\xdf\r\n", "\xc3\x87\xc2\xa9\xc3\xb4\xc3\x9f\n", TRUE, TRUE }, { NULL, NULL, FALSE, FALSE } }; const struct translate_string2_data_t *t; for (t = tests; t->source != NULL; t++) { svn_string_t *source_string = svn_string_create(t->source, pool); svn_string_t *new_value = NULL; svn_boolean_t translated_line_endings = ! t->translated_line_endings; svn_boolean_t translated_to_utf8; SVN_ERR(svn_subst_translate_string2(&new_value, NULL, &translated_line_endings, source_string, "ISO-8859-1", pool, pool)); SVN_TEST_STRING_ASSERT(new_value->data, t->expected_str); SVN_TEST_ASSERT(translated_line_endings == t->translated_line_endings); new_value = NULL; translated_to_utf8 = ! t->translated_to_utf8; translated_line_endings = ! t->translated_line_endings; SVN_ERR(svn_subst_translate_string2(&new_value, &translated_to_utf8, &translated_line_endings, source_string, "ISO-8859-1", pool, pool)); SVN_TEST_STRING_ASSERT(new_value->data, t->expected_str); SVN_TEST_ASSERT(translated_to_utf8 == t->translated_to_utf8); SVN_TEST_ASSERT(translated_line_endings == t->translated_line_endings); } return SVN_NO_ERROR; } /*static svn_error_t * test_svn_subst_copy_and_translate4(apr_pool_t *pool) { return SVN_NO_ERROR; } static svn_error_t * test_svn_subst_stream_translated(apr_pool_t *pool) { return SVN_NO_ERROR; }*/ /* Test inputs and expected output for svn_subst_translate_cstring2(). */ struct translate_cstring2_data_t { const char *source; const char *eol_str; svn_boolean_t repair; const char *expected_str; }; static svn_error_t * test_svn_subst_translate_cstring2(apr_pool_t *pool) { static const struct translate_cstring2_data_t tests[] = { /* Test the unusual case where EOL_STR is an empty string. */ { " \r \n\r\n \n\n\n", "", TRUE, " " }, /* Test the unusual case where EOL_STR is not a standard EOL string. */ { " \r \n\r\n \n\n\n", "z", TRUE, " z zz zzz" }, { " \n \n ", "buzz", FALSE, " buzz buzz " }, { " \r\n \n", "buzz", TRUE , " buzz buzz"}, { NULL, NULL, FALSE, NULL } }; const struct translate_cstring2_data_t *t; for (t = tests; t->source != NULL; t++) { const char *result = NULL; SVN_ERR(svn_subst_translate_cstring2(t->source, &result, t->eol_str, t->repair, NULL, FALSE, pool)); SVN_TEST_STRING_ASSERT(result, t->expected_str); } return SVN_NO_ERROR; } struct svn_test_descriptor_t test_funcs[] = { SVN_TEST_NULL, SVN_TEST_PASS2(test_svn_subst_translate_string2, "test svn_subst_translate_string2()"), SVN_TEST_PASS2(test_svn_subst_translate_cstring2, "test svn_subst_translate_cstring2()"), SVN_TEST_NULL };
