From: <kt...@us...> - 2009-09-28 13:10:05
|
Revision: 3182 http://cutter.svn.sourceforge.net/cutter/?rev=3182&view=rev Author: ktou Date: 2009-09-28 13:09:51 +0000 (Mon, 28 Sep 2009) Log Message: ----------- * cutter/cut-assertions-helper.c, test/cutter/test-cut-assertions.c: cut_assert_equal_boolean() and cut_assert_not_equal_boolean() uses cut_set_expected() and cut_set_actual() instead of cut_append_diff(). Modified Paths: -------------- cutter/trunk/ChangeLog cutter/trunk/cutter/cut-assertions-helper.c cutter/trunk/test/cutter/test-cut-assertions.c Modified: cutter/trunk/ChangeLog =================================================================== --- cutter/trunk/ChangeLog 2009-09-28 13:06:55 UTC (rev 3181) +++ cutter/trunk/ChangeLog 2009-09-28 13:09:51 UTC (rev 3182) @@ -1,5 +1,10 @@ 2009-09-28 Kouhei Sutou <ko...@co...> + * cutter/cut-assertions-helper.c, + test/cutter/test-cut-assertions.c: cut_assert_equal_boolean() and + cut_assert_not_equal_boolean() uses cut_set_expected() and + cut_set_actual() instead of cut_append_diff(). + * cutter/cut-differ-colorize.c (diff_line): show in one line if any replaced character exists. Modified: cutter/trunk/cutter/cut-assertions-helper.c =================================================================== --- cutter/trunk/cutter/cut-assertions-helper.c 2009-09-28 13:06:55 UTC (rev 3181) +++ cutter/trunk/cutter/cut-assertions-helper.c 2009-09-28 13:09:51 UTC (rev 3182) @@ -79,13 +79,11 @@ if ((expected && actual) || (!expected && !actual)) { cut_test_pass(); } else { - cut_test_fail(cut_take_printf("<%s == %s>\n" - "expected: <%s>\n" - " actual: <%s>", + cut_set_expected(expected ? "true" : "false"); + cut_set_actual(actual ? "true" : "false"); + cut_test_fail(cut_take_printf("<%s == %s>", expression_expected, - expression_actual, - expected ? "true" : "false", - actual ? "true" : "false")); + expression_actual)); } } @@ -96,13 +94,11 @@ const char *expression_actual) { if ((expected && actual) || (!expected && !actual)) { - cut_test_fail(cut_take_printf("<%s != %s>\n" - "expected: <%s>\n" - " actual: <%s>", + cut_set_expected(expected ? "true" : "false"); + cut_set_actual(actual ? "true" : "false"); + cut_test_fail(cut_take_printf("<%s != %s>", expression_expected, - expression_actual, - expected ? "true" : "false", - actual ? "true" : "false")); + expression_actual)); } else { cut_test_pass(); } Modified: cutter/trunk/test/cutter/test-cut-assertions.c =================================================================== --- cutter/trunk/test/cutter/test-cut-assertions.c 2009-09-28 13:06:55 UTC (rev 3181) +++ cutter/trunk/test/cutter/test-cut-assertions.c 2009-09-28 13:09:51 UTC (rev 3182) @@ -183,10 +183,8 @@ cut_assert_test_result_summary(run_context, 1, 3, 0, 1, 0, 0, 0, 0); cut_assert_test_result(run_context, 0, CUT_TEST_RESULT_FAILURE, "cut_assert_equal_boolean()", NULL, - "<CUT_TRUE == CUT_FALSE>\n" - "expected: <true>\n" - " actual: <false>", - NULL, NULL, + "<CUT_TRUE == CUT_FALSE>", + "true", "false", FAIL_LOCATION, "stub_equal_boolean", NULL); } @@ -209,10 +207,8 @@ cut_assert_test_result_summary(run_context, 1, 3, 0, 1, 0, 0, 0, 0); cut_assert_test_result(run_context, 0, CUT_TEST_RESULT_FAILURE, "cut_assert_not_equal_boolean()", NULL, - "<CUT_TRUE != 100>\n" - "expected: <true>\n" - " actual: <true>", - NULL, NULL, + "<CUT_TRUE != 100>", + "true", "true", FAIL_LOCATION, "stub_not_equal_boolean", NULL); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |