You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/12/10 22:12:53 UTC
[lucy-commits] svn commit: r1212878 - in /incubator/lucy/trunk/charmonizer/src/Charmonizer:
Test.c Test.h Test/TestFuncMacro.c Test/TestIntegers.c
Test/TestVariadicMacros.c
Author: marvin
Date: Sat Dec 10 21:12:52 2011
New Revision: 1212878
URL: http://svn.apache.org/viewvc?rev=1212878&view=rev
Log:
Improve string equals test.
Shorten TEST_STR_EQ to STR_EQ. Use implicit global TestBatch instead of
explicit argument.
Modified:
incubator/lucy/trunk/charmonizer/src/Charmonizer/Test.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Test.h
incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c
incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Test.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Test.c?rev=1212878&r1=1212877&r2=1212878&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test.c Sat Dec 10 21:12:52 2011
@@ -128,8 +128,8 @@ chaz_Test_ok(chaz_TestBatch *batch, int
}
void
-chaz_Test_test_str_eq(chaz_TestBatch *batch, const char *got,
- const char *expected, const char *message) {
+chaz_Test_str_eq(chaz_TestBatch *batch, const char *got,
+ const char *expected, const char *message) {
va_list args;
/* Increment test number. */
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Test.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Test.h?rev=1212878&r1=1212877&r2=1212878&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test.h (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test.h Sat Dec 10 21:12:52 2011
@@ -109,9 +109,11 @@ chaz_Test_plan(chaz_TestBatch *batch);
void
chaz_Test_ok(chaz_TestBatch *batch, int expression, const char *message);
+#define CHAZ_TEST_STR_EQ(_got, _expected, _message) \
+ chaz_Test_str_eq(chaz_Test_current, (_got), (_expected), (_message))
void
-chaz_Test_test_str_eq(chaz_TestBatch *batch, const char *got,
- const char *expected, const char *message);
+chaz_Test_str_eq(chaz_TestBatch *batch, const char *got,
+ const char *expected, const char *message);
void
chaz_Test_pass(chaz_TestBatch *batch, const char *message);
@@ -141,6 +143,7 @@ extern chaz_TestBatch *chaz_Test_current
#define Test_start chaz_Test_start
#define Test_finish chaz_Test_finish
#define OK CHAZ_TEST_OK
+ #define STR_EQ CHAZ_TEST_STR_EQ
#define TestBatch_destroy_t chaz_TestBatch_destroy_t
#define TestBatch_test_func_t chaz_TestBatch_test_func_t
#define TestBatch_run_test_t chaz_TestBatch_run_test_t
@@ -149,8 +152,7 @@ extern chaz_TestBatch *chaz_Test_current
#define Test_new_batch chaz_Test_new_batch
#define Test_plan chaz_Test_plan
#define PLAN CHAZ_TEST_PLAN
- #define Test_test_str_eq chaz_Test_test_str_eq
- #define TEST_STR_EQ CHAZ_TEST_TEST_STR_EQ
+ #define Test_str_eq chaz_Test_str_eq
#define Test_pass chaz_Test_pass
#define PASS CHAZ_TEST_PASS
#define Test_fail chaz_Test_fail
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c?rev=1212878&r1=1212877&r2=1212878&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestFuncMacro.c Sat Dec 10 21:12:52 2011
@@ -30,22 +30,19 @@ static void
S_run_tests(TestBatch *batch) {
#ifdef HAS_FUNC_MACRO
- TEST_STR_EQ(batch, FUNC_MACRO, "S_run_tests",
- "FUNC_MACRO");
+ STR_EQ(FUNC_MACRO, "S_run_tests", "FUNC_MACRO");
#else
SKIP(batch, "no FUNC_MACRO");
#endif
#ifdef HAS_ISO_FUNC_MACRO
- TEST_STR_EQ(batch, __func__, "S_run_tests",
- "HAS_ISO_FUNC_MACRO");
+ STR_EQ(__func__, "S_run_tests", "HAS_ISO_FUNC_MACRO");
#else
SKIP(batch, "no ISO_FUNC_MACRO");
#endif
#ifdef HAS_GNUC_FUNC_MACRO
- TEST_STR_EQ(batch, __FUNCTION__, "S_run_tests",
- "HAS_GNUC_FUNC_MACRO");
+ STR_EQ(__FUNCTION__, "S_run_tests", "HAS_GNUC_FUNC_MACRO");
#else
SKIP(batch, "no GNUC_FUNC_MACRO");
#endif
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c?rev=1212878&r1=1212877&r2=1212878&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestIntegers.c Sat Dec 10 21:12:52 2011
@@ -112,9 +112,9 @@ S_run_tests(TestBatch *batch) {
OK((sizeof(int64_t) == 8), "int64_t is 8 bytes");
OK((sizeof(uint64_t) == 8), "uint64_t is 8 bytes");
sprintf(buf, "%"I64P, foo);
- TEST_STR_EQ(batch, buf, "-100", "I64P");
+ STR_EQ(buf, "-100", "I64P");
sprintf(buf, "%"U64P, bar);
- TEST_STR_EQ(batch, buf, "18000000000000000000", "U64P");
+ STR_EQ(buf, "18000000000000000000", "U64P");
}
#endif
}
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c?rev=1212878&r1=1212877&r2=1212878&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Test/TestVariadicMacros.c Sat Dec 10 21:12:52 2011
@@ -42,7 +42,7 @@ S_run_tests(TestBatch *batch) {
sprintf(buffer, fmt, __VA_ARGS__)
really_has_var_macs = true;
ISO_TEST(buf, "%s", "iso");
- TEST_STR_EQ(batch, buf, "iso", "ISO variadic macros work");
+ STR_EQ(buf, "iso", "ISO variadic macros work");
#else
SKIP(batch, "No ISO variadic macros");
#endif
@@ -52,7 +52,7 @@ S_run_tests(TestBatch *batch) {
sprintf(buffer, fmt, ##args )
really_has_var_macs = true;
GNU_TEST(buf, "%s", "gnu");
- TEST_STR_EQ(batch, buf, "gnu", "GNUC variadic macros work");
+ STR_EQ(buf, "gnu", "GNUC variadic macros work");
#else
SKIP(batch, "No GNUC variadic macros");
#endif