You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/11/23 02:13:17 UTC
svn commit: r1544728 - in /subversion/trunk/subversion/tests/libsvn_subr:
mergeinfo-test.c string-test.c
Author: stefan2
Date: Sat Nov 23 01:13:16 2013
New Revision: 1544728
URL: http://svn.apache.org/r1544728
Log:
Eliminate shared global variables (not constants) in our C tests by
simply declaring them locally in each tests that needs them.
* subversion/tests/libsvn_subr/string-test.c
(a, b, c): drop these global variables
(test1,
test2,
test3,
test4,
test5,
test6,
test7,
test8,
test9,
test_find_char_backward,
test13,
test14,
test15,
test16,
test17,
test_first_non_whitespace,
test21,
test_stringbuf_unequal,
test_stringbuf_insert,
test_stringbuf_remove,
test_stringbuf_replace): declare variables locally
* subversion/tests/libsvn_subr/mergeinfo-test.c
(info1, info2): drop these global variables
(test_parse_combine_rangeinfo,
test_parse_broken_mergeinfo,,
test_mergeinfo_intersect,
test_merge_mergeinfo,
test_rangelist_to_string,
test_mergeinfo_to_string): declare variables locally
Modified:
subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/trunk/subversion/tests/libsvn_subr/string-test.c
Modified: subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=1544728&r1=1544727&r2=1544728&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c Sat Nov 23 01:13:16 2013
@@ -115,10 +115,6 @@ verify_mergeinfo_parse(const char *input
}
-/* Some of our own global variables (for simplicity), which map paths
- -> merge ranges. */
-static apr_hash_t *info1, *info2;
-
#define NBR_MERGEINFO_VALS 24
/* Valid mergeinfo values. */
@@ -269,6 +265,7 @@ test_parse_combine_rangeinfo(apr_pool_t
{
apr_array_header_t *result;
svn_merge_range_t *resultrange;
+ apr_hash_t *info1;
SVN_ERR(svn_mergeinfo_parse(&info1, single_mergeinfo, pool));
@@ -347,6 +344,7 @@ test_parse_broken_mergeinfo(apr_pool_t *
{
int i;
svn_error_t *err;
+ apr_hash_t *info1;
/* Trigger some error(s) with mal-formed input. */
for (i = 0; i < NBR_BROKEN_MERGEINFO_VALS; i++)
@@ -566,6 +564,7 @@ test_mergeinfo_intersect(apr_pool_t *poo
{ {0, 1, TRUE}, {2, 4, TRUE}, {11, 12, TRUE} };
svn_rangelist_t *rangelist;
apr_hash_t *intersection;
+ apr_hash_t *info1, *info2;
SVN_ERR(svn_mergeinfo_parse(&info1, "/trunk: 1-6,12-16\n/foo: 31", pool));
SVN_ERR(svn_mergeinfo_parse(&info2, "/trunk: 1,3-4,7,9,11-12", pool));
@@ -702,6 +701,7 @@ test_merge_mergeinfo(apr_pool_t *pool)
{
int j;
svn_string_t *info2_starting, *info2_ending;
+ apr_hash_t *info1, *info2;
SVN_ERR(svn_mergeinfo_parse(&info1, mergeinfo[i].mergeinfo1, pool));
SVN_ERR(svn_mergeinfo_parse(&info2, mergeinfo[i].mergeinfo2, pool));
@@ -1110,6 +1110,7 @@ test_rangelist_to_string(apr_pool_t *poo
svn_rangelist_t *result;
svn_string_t *output;
svn_string_t *expected = svn_string_create("3,5,7-11,13-14", pool);
+ apr_hash_t *info1;
SVN_ERR(svn_mergeinfo_parse(&info1, mergeinfo1, pool));
@@ -1130,6 +1131,7 @@ test_mergeinfo_to_string(apr_pool_t *poo
{
svn_string_t *output;
svn_string_t *expected;
+ apr_hash_t *info1, *info2;
expected = svn_string_create("/fred:8-10\n/trunk:3,5,7-11,13-14", pool);
SVN_ERR(svn_mergeinfo_parse(&info1, mergeinfo1, pool));
Modified: subversion/trunk/subversion/tests/libsvn_subr/string-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/string-test.c?rev=1544728&r1=1544727&r2=1544728&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/string-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/string-test.c Sat Nov 23 01:13:16 2013
@@ -59,7 +59,6 @@ fail(apr_pool_t *pool, const char *fmt,
/* Some of our own global variables, for simplicity. Yes,
simplicity. */
-svn_stringbuf_t *a = NULL, *b = NULL, *c = NULL;
const char *phrase_1 = "hello, ";
const char *phrase_2 = "a longish phrase of sorts, longer than 16 anyway";
@@ -69,7 +68,7 @@ const char *phrase_2 = "a longish phrase
static svn_error_t *
test1(apr_pool_t *pool)
{
- a = svn_stringbuf_create(phrase_1, pool);
+ svn_stringbuf_t *a = svn_stringbuf_create(phrase_1, pool);
/* Test that length, data, and null-termination are correct. */
if ((a->len == strlen(phrase_1)) && ((strcmp(a->data, phrase_1)) == 0))
@@ -82,7 +81,7 @@ test1(apr_pool_t *pool)
static svn_error_t *
test2(apr_pool_t *pool)
{
- b = svn_stringbuf_ncreate(phrase_2, 16, pool);
+ svn_stringbuf_t *b = svn_stringbuf_ncreate(phrase_2, 16, pool);
/* Test that length, data, and null-termination are correct. */
if ((b->len == 16) && ((strncmp(b->data, phrase_2, 16)) == 0))
@@ -98,8 +97,8 @@ test3(apr_pool_t *pool)
char *tmp;
size_t old_len;
- a = svn_stringbuf_create(phrase_1, pool);
- b = svn_stringbuf_ncreate(phrase_2, 16, pool);
+ svn_stringbuf_t *a = svn_stringbuf_create(phrase_1, pool);
+ svn_stringbuf_t *b = svn_stringbuf_ncreate(phrase_2, 16, pool);
tmp = apr_palloc(pool, (a->len + b->len + 1));
strcpy(tmp, a->data);
@@ -118,7 +117,7 @@ test3(apr_pool_t *pool)
static svn_error_t *
test4(apr_pool_t *pool)
{
- a = svn_stringbuf_create(phrase_1, pool);
+ svn_stringbuf_t *a = svn_stringbuf_create(phrase_1, pool);
svn_stringbuf_appendcstr(a, "new bytes to append");
/* Test that length, data, and null-termination are correct. */
@@ -133,7 +132,7 @@ test4(apr_pool_t *pool)
static svn_error_t *
test5(apr_pool_t *pool)
{
- a = svn_stringbuf_create(phrase_1, pool);
+ svn_stringbuf_t *a = svn_stringbuf_create(phrase_1, pool);
svn_stringbuf_appendbytes(a, "new bytes to append", 9);
/* Test that length, data, and null-termination are correct. */
@@ -148,9 +147,9 @@ test5(apr_pool_t *pool)
static svn_error_t *
test6(apr_pool_t *pool)
{
- a = svn_stringbuf_create(phrase_1, pool);
- b = svn_stringbuf_create(phrase_2, pool);
- c = svn_stringbuf_dup(a, pool);
+ svn_stringbuf_t *a = svn_stringbuf_create(phrase_1, pool);
+ svn_stringbuf_t *b = svn_stringbuf_create(phrase_2, pool);
+ svn_stringbuf_t *c = svn_stringbuf_dup(a, pool);
/* Test that length, data, and null-termination are correct. */
if ((svn_stringbuf_compare(a, c)) && (! svn_stringbuf_compare(b, c)))
@@ -166,7 +165,7 @@ test7(apr_pool_t *pool)
char *tmp;
size_t tmp_len;
- c = svn_stringbuf_create(phrase_2, pool);
+ svn_stringbuf_t *c = svn_stringbuf_create(phrase_2, pool);
tmp_len = c->len;
tmp = apr_palloc(pool, c->len + 1);
@@ -186,7 +185,7 @@ test7(apr_pool_t *pool)
static svn_error_t *
test8(apr_pool_t *pool)
{
- c = svn_stringbuf_create(phrase_2, pool);
+ svn_stringbuf_t *c = svn_stringbuf_create(phrase_2, pool);
svn_stringbuf_setempty(c);
@@ -200,7 +199,7 @@ test8(apr_pool_t *pool)
static svn_error_t *
test9(apr_pool_t *pool)
{
- a = svn_stringbuf_create(phrase_1, pool);
+ svn_stringbuf_t *a = svn_stringbuf_create(phrase_1, pool);
svn_stringbuf_fillchar(a, '#');
@@ -380,7 +379,7 @@ test_find_char_backward(const char* data
{
apr_size_t i;
- a = svn_stringbuf_create(data, pool);
+ svn_stringbuf_t *a = svn_stringbuf_create(data, pool);
i = svn_stringbuf_find_char_backward(a, ch);
if (i == pos)
@@ -392,7 +391,7 @@ test_find_char_backward(const char* data
static svn_error_t *
test13(apr_pool_t *pool)
{
- a = svn_stringbuf_create("test, test", pool);
+ svn_stringbuf_t *a = svn_stringbuf_create("test, test", pool);
return test_find_char_backward(a->data, a->len, ',', 4, pool);
}
@@ -400,7 +399,7 @@ test13(apr_pool_t *pool)
static svn_error_t *
test14(apr_pool_t *pool)
{
- a = svn_stringbuf_create(",test test", pool);
+ svn_stringbuf_t *a = svn_stringbuf_create(",test test", pool);
return test_find_char_backward(a->data, a->len, ',', 0, pool);
}
@@ -408,7 +407,7 @@ test14(apr_pool_t *pool)
static svn_error_t *
test15(apr_pool_t *pool)
{
- a = svn_stringbuf_create("testing,", pool);
+ svn_stringbuf_t *a = svn_stringbuf_create("testing,", pool);
return test_find_char_backward(a->data,
a->len,
@@ -420,7 +419,7 @@ test15(apr_pool_t *pool)
static svn_error_t *
test16(apr_pool_t *pool)
{
- a = svn_stringbuf_create_empty(pool);
+ svn_stringbuf_t *a = svn_stringbuf_create_empty(pool);
return test_find_char_backward(a->data, a->len, ',', 0, pool);
}
@@ -428,7 +427,7 @@ test16(apr_pool_t *pool)
static svn_error_t *
test17(apr_pool_t *pool)
{
- a = svn_stringbuf_create("test test test", pool);
+ svn_stringbuf_t *a = svn_stringbuf_create("test test test", pool);
return test_find_char_backward(a->data,
a->len,
@@ -444,7 +443,7 @@ test_first_non_whitespace(const char *st
{
apr_size_t i;
- a = svn_stringbuf_create(str, pool);
+ svn_stringbuf_t *a = svn_stringbuf_create(str, pool);
i = svn_stringbuf_first_non_whitespace(a);
@@ -475,8 +474,8 @@ test20(apr_pool_t *pool)
static svn_error_t *
test21(apr_pool_t *pool)
{
- a = svn_stringbuf_create(" \ttest\t\t \t ", pool);
- b = svn_stringbuf_create("test", pool);
+ svn_stringbuf_t *a = svn_stringbuf_create(" \ttest\t\t \t ", pool);
+ svn_stringbuf_t *b = svn_stringbuf_create("test", pool);
svn_stringbuf_strip_whitespace(a);
@@ -491,8 +490,8 @@ test_stringbuf_unequal(const char* str1,
const char* str2,
apr_pool_t *pool)
{
- a = svn_stringbuf_create(str1, pool);
- b = svn_stringbuf_create(str2, pool);
+ svn_stringbuf_t *a = svn_stringbuf_create(str1, pool);
+ svn_stringbuf_t *b = svn_stringbuf_create(str2, pool);
if (svn_stringbuf_compare(a, b))
return fail(pool, "test failed");
@@ -590,7 +589,7 @@ expect_stringbuf_equal(const svn_stringb
static svn_error_t *
test_stringbuf_insert(apr_pool_t *pool)
{
- a = svn_stringbuf_create("st , ", pool);
+ svn_stringbuf_t *a = svn_stringbuf_create("st , ", pool);
svn_stringbuf_insert(a, 0, "teflon", 2);
SVN_TEST_STRING_ASSERT(a->data, "test , ");
@@ -611,7 +610,7 @@ test_stringbuf_insert(apr_pool_t *pool)
static svn_error_t *
test_stringbuf_remove(apr_pool_t *pool)
{
- a = svn_stringbuf_create("test hello, world!", pool);
+ svn_stringbuf_t *a = svn_stringbuf_create("test hello, world!", pool);
svn_stringbuf_remove(a, 0, 2);
SVN_TEST_STRING_ASSERT(a->data, "st hello, world!");
@@ -629,7 +628,7 @@ test_stringbuf_remove(apr_pool_t *pool)
static svn_error_t *
test_stringbuf_replace(apr_pool_t *pool)
{
- a = svn_stringbuf_create("odd with some world?", pool);
+ svn_stringbuf_t *a = svn_stringbuf_create("odd with some world?", pool);
svn_stringbuf_replace(a, 0, 3, "tester", 4);
SVN_TEST_STRING_ASSERT(a->data, "test with some world?");