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 2014/03/27 18:04:37 UTC
svn commit: r1582401 - in /subversion/trunk/subversion/tests:
libsvn_fs_x/string-table-test.c libsvn_subr/packed-data-test.c
libsvn_subr/string-test.c
Author: stefan2
Date: Thu Mar 27 17:04:36 2014
New Revision: 1582401
URL: http://svn.apache.org/r1582401
Log:
More constant definition cleanup in our test code.
* subversion/tests/libsvn_fs_x/string-table-test.c
(large_string_table_body,
many_strings_table_body): Use APR macros to define 64 bit constants.
* subversion/tests/libsvn_subr/packed-data-test.c
(test_uint_stream): Same. Also use APR constants of min/max values.
* subversion/tests/libsvn_subr/string-test.c
(test24,
test_base36): Ditto.
Modified:
subversion/trunk/subversion/tests/libsvn_fs_x/string-table-test.c
subversion/trunk/subversion/tests/libsvn_subr/packed-data-test.c
subversion/trunk/subversion/tests/libsvn_subr/string-test.c
Modified: subversion/trunk/subversion/tests/libsvn_fs_x/string-table-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_x/string-table-test.c?rev=1582401&r1=1582400&r2=1582401&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_x/string-table-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_x/string-table-test.c Thu Mar 27 17:04:36 2014
@@ -171,8 +171,11 @@ large_string_table_body(svn_boolean_t do
builder = svn_fs_x__string_table_builder_create(pool);
for (i = 0; i < COUNT; ++i)
{
- strings[i] = generate_string(0x1234567876543210ull * (i + 1), 73000 + 1000 * i, pool);
- indexes[i] = svn_fs_x__string_table_builder_add(builder, strings[i]->data, strings[i]->len);
+ strings[i] = generate_string(APR_UINT64_C(0x1234567876543210) * (i + 1),
+ 73000 + 1000 * i, pool);
+ indexes[i] = svn_fs_x__string_table_builder_add(builder,
+ strings[i]->data,
+ strings[i]->len);
}
table = svn_fs_x__string_table_create(builder, pool);
@@ -210,7 +213,7 @@ many_strings_table_body(svn_boolean_t do
builder = svn_fs_x__string_table_builder_create(pool);
for (i = 0; i < COUNT; ++i)
{
- strings[i] = generate_string(0x1234567876543210ull * (i + 1),
+ strings[i] = generate_string(APR_UINT64_C(0x1234567876543210) * (i + 1),
(i * i) % 23000, pool);
indexes[i] = svn_fs_x__string_table_builder_add(builder,
strings[i]->data,
Modified: subversion/trunk/subversion/tests/libsvn_subr/packed-data-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/packed-data-test.c?rev=1582401&r1=1582400&r2=1582401&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/packed-data-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/packed-data-test.c Thu Mar 27 17:04:36 2014
@@ -117,14 +117,14 @@ test_uint_stream(apr_pool_t *pool)
enum { COUNT = 8 };
const apr_uint64_t values[COUNT] =
{
- 0xffffffffffffffffull,
+ APR_UINT64_MAX,
0,
- 0xffffffffffffffffull,
- 0x8000000000000000ull,
+ APR_UINT64_MAX,
+ APR_UINT64_C(0x8000000000000000),
0,
- 0x7fffffffffffffffull,
- 0x1234567890abcdefull,
- 0x0fedcba987654321ull,
+ APR_UINT64_C(0x7fffffffffffffff),
+ APR_UINT64_C(0x1234567890abcdef),
+ APR_UINT64_C(0x0fedcba987654321),
};
SVN_ERR(verify_uint_stream(values, COUNT, FALSE, 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=1582401&r1=1582400&r2=1582401&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/string-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/string-test.c Thu Mar 27 17:04:36 2014
@@ -521,19 +521,19 @@ test24(apr_pool_t *pool)
SVN_TEST_ASSERT(length == 1);
SVN_TEST_STRING_ASSERT(buffer, "0");
- length = svn__i64toa(buffer, 0x8000000000000000ll);
+ length = svn__i64toa(buffer, APR_INT64_MIN);
SVN_TEST_ASSERT(length == 20);
SVN_TEST_STRING_ASSERT(buffer, "-9223372036854775808");
- length = svn__i64toa(buffer, 0x7fffffffffffffffll);
+ length = svn__i64toa(buffer, APR_INT64_MAX);
SVN_TEST_ASSERT(length == 19);
SVN_TEST_STRING_ASSERT(buffer, "9223372036854775807");
- length = svn__ui64toa(buffer, 0ull);
+ length = svn__ui64toa(buffer, 0u);
SVN_TEST_ASSERT(length == 1);
SVN_TEST_STRING_ASSERT(buffer, "0");
- length = svn__ui64toa(buffer, 0xffffffffffffffffull);
+ length = svn__ui64toa(buffer, APR_UINT64_MAX);
SVN_TEST_ASSERT(length == 20);
SVN_TEST_STRING_ASSERT(buffer, "18446744073709551615");
@@ -567,10 +567,10 @@ static svn_error_t *
test_base36(apr_pool_t *pool)
{
SVN_ERR(sub_test_base36(0, "0"));
- SVN_ERR(sub_test_base36(1234567890ull, "kf12oi"));
- SVN_ERR(sub_test_base36(0x7fffffffffffffffull, "1y2p0ij32e8e7"));
- SVN_ERR(sub_test_base36(0x8000000000000000ull, "1y2p0ij32e8e8"));
- SVN_ERR(sub_test_base36(0xffffffffffffffffull, "3w5e11264sgsf"));
+ SVN_ERR(sub_test_base36(APR_UINT64_C(1234567890), "kf12oi"));
+ SVN_ERR(sub_test_base36(APR_UINT64_C(0x7fffffffffffffff), "1y2p0ij32e8e7"));
+ SVN_ERR(sub_test_base36(APR_UINT64_C(0x8000000000000000), "1y2p0ij32e8e8"));
+ SVN_ERR(sub_test_base36(APR_UINT64_MAX, "3w5e11264sgsf"));
return SVN_NO_ERROR;
}