[cutter-commit 03161] SF.net SVN: cutter:[3167] cutter/trunk

[<kt...@us...>]

Revision: 3167
          http://cutter.svn.sourceforge.net/cutter/?rev=3167&view=rev
Author:   ktou
Date:     2009-09-27 08:42:55 +0000 (Sun, 27 Sep 2009)

Log Message:
-----------
* cutter/gcut-assertions-helper.c,
  test/gcutter/test-gcut-assertions.c:
  gcut_assert_equal_flags() uses cut_set_expected() and
  cut_set_actual() instead of cut_append_diff().

Modified Paths:
--------------
    cutter/trunk/ChangeLog
    cutter/trunk/gcutter/gcut-assertions-helper.c
    cutter/trunk/test/gcutter/test-gcut-assertions.c

Modified: cutter/trunk/ChangeLog
===================================================================
--- cutter/trunk/ChangeLog	2009-09-27 08:34:40 UTC (rev 3166)
+++ cutter/trunk/ChangeLog	2009-09-27 08:42:55 UTC (rev 3167)
@@ -2,6 +2,11 @@
 
 	* cutter/gcut-assertions-helper.c,
 	test/gcutter/test-gcut-assertions.c:
+	gcut_assert_equal_flags() uses cut_set_expected() and
+	cut_set_actual() instead of cut_append_diff().
+
+	* cutter/gcut-assertions-helper.c,
+	test/gcutter/test-gcut-assertions.c:
 	gcut_assert_equal_enum() uses cut_set_expected() and
 	cut_set_actual() instead of cut_append_diff().
 

Modified: cutter/trunk/gcutter/gcut-assertions-helper.c
===================================================================
--- cutter/trunk/gcutter/gcut-assertions-helper.c	2009-09-27 08:34:40 UTC (rev 3166)
+++ cutter/trunk/gcutter/gcut-assertions-helper.c	2009-09-27 08:42:55 UTC (rev 3167)
@@ -428,22 +428,17 @@
     } else {
         const gchar *inspected_expected;
         const gchar *inspected_actual;
-        const gchar *message;
 
         inspected_expected =
             cut_take_string(gcut_flags_inspect(flags_type, expected));
         inspected_actual =
             cut_take_string(gcut_flags_inspect(flags_type, actual));
-        message = cut_take_printf("<%s == %s> (%s)\n"
-                                  "expected: <%s>\n"
-                                  "  actual: <%s>",
-                                  expression_expected,
-                                  expression_actual,
-                                  expression_flags_type,
-                                  inspected_expected,
-                                  inspected_actual);
-        message = cut_append_diff(message, inspected_expected, inspected_actual);
-        cut_test_fail(message);
+        cut_set_expected(inspected_expected);
+        cut_set_actual(inspected_actual);
+        cut_test_fail(cut_take_printf("<%s == %s> (%s)",
+                                      expression_expected,
+                                      expression_actual,
+                                      expression_flags_type));
     }
 }
 

Modified: cutter/trunk/test/gcutter/test-gcut-assertions.c
===================================================================
--- cutter/trunk/test/gcutter/test-gcut-assertions.c	2009-09-27 08:34:40 UTC (rev 3166)
+++ cutter/trunk/test/gcutter/test-gcut-assertions.c	2009-09-27 08:42:55 UTC (rev 3167)
@@ -806,14 +806,12 @@
     cut_assert_test_result(run_context, 0, CUT_TEST_RESULT_FAILURE,
                            "gcut_assert_equal_flags test",
                            NULL,
-                           "<(1 << 1) | (1 << 2) == (1 << 3)> (flags_type)\n"
-                           "expected: <#<CuttestAssertStubFlags: "
+                           "<(1 << 1) | (1 << 2) == (1 << 3)> (flags_type)",
+                           "#<CuttestAssertStubFlags: "
                            "second|third "
                            "(CUTTEST_ASSERT_STUB_SECOND:0x2)|"
-                           "(CUTTEST_ASSERT_STUB_THIRD:0x4)>>\n"
-                           "  actual: <#<CuttestAssertStubFlags: "
-                           "(unknown flags: 0x8)>>",
-                           NULL, NULL,
+                           "(CUTTEST_ASSERT_STUB_THIRD:0x4)>",
+                           "#<CuttestAssertStubFlags: (unknown flags: 0x8)>",
                            FAIL_LOCATION, "stub_equal_flags",
                            NULL);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.