[cutter-commit 03159] SF.net SVN: cutter:[3165] cutter/trunk

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

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

Log Message:
-----------
* cutter/gcut-assertions-helper.c,
  test/gcutter/test-gcut-assertions.c:
  gcut_assert_equal_error() 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:29:01 UTC (rev 3164)
+++ cutter/trunk/ChangeLog	2009-09-27 08:32:10 UTC (rev 3165)
@@ -2,6 +2,11 @@
 
 	* cutter/gcut-assertions-helper.c,
 	test/gcutter/test-gcut-assertions.c:
+	gcut_assert_equal_error() 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_list_hash_table_string_string() 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:29:01 UTC (rev 3164)
+++ cutter/trunk/gcutter/gcut-assertions-helper.c	2009-09-27 08:32:10 UTC (rev 3165)
@@ -345,23 +345,11 @@
     if (gcut_error_equal(expected, actual)) {
         cut_test_pass();
     } else {
-        const gchar *inspected_expected;
-        const gchar *inspected_actual;
-        const gchar *message;
-
-        inspected_expected = cut_take_string(gcut_error_inspect(expected));
-        inspected_actual = cut_take_string(gcut_error_inspect(actual));
-        message = cut_take_printf("<%s == %s>\n"
-                                  "expected: <%s>\n"
-                                  "  actual: <%s>",
-                                  expression_expected,
-                                  expression_actual,
-                                  inspected_expected,
-                                  inspected_actual);
-        if (expected && actual)
-            message = cut_append_diff(message,
-                                      inspected_expected, inspected_actual);
-        cut_test_fail(message);
+        cut_set_expected(cut_take_string(gcut_error_inspect(expected)));
+        cut_set_actual(cut_take_string(gcut_error_inspect(actual)));
+        cut_test_fail(cut_take_printf("<%s == %s>",
+                                      expression_expected,
+                                      expression_actual));
     }
 }
 

Modified: cutter/trunk/test/gcutter/test-gcut-assertions.c
===================================================================
--- cutter/trunk/test/gcutter/test-gcut-assertions.c	2009-09-27 08:29:01 UTC (rev 3164)
+++ cutter/trunk/test/gcutter/test-gcut-assertions.c	2009-09-27 08:32:10 UTC (rev 3165)
@@ -737,16 +737,9 @@
     cut_assert_test_result(run_context, 0, CUT_TEST_RESULT_FAILURE,
                            "gcut_assert_equal_error test",
                            NULL,
-                           "<error1 == error2>\n"
-                           "expected: <g-file-error-quark:4: not found>\n"
-                           "  actual: <g-file-error-quark:4: no entry>\n"
-                           "\n"
-                           "diff:\n"
-                           "- g-file-error-quark:4: not found\n"
-                           "?                          ^^^^^^\n"
-                           "+ g-file-error-quark:4: no entry\n"
-                           "?                         +++ ^^",
-                           NULL, NULL,
+                           "<error1 == error2>",
+                           "g-file-error-quark:4: not found",
+                           "g-file-error-quark:4: no entry",
                            FAIL_LOCATION, "stub_equal_error",
                            NULL);
 }


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