[cutter-commit 04477] clear-code/cutter@847b2e2 [master] Revert adding cut_test_get_jump_buffer()

[Kouhei S. <nul...@cl...>]

Kouhei Sutou	2014-01-30 22:32:19 +0900 (Thu, 30 Jan 2014)

  New Revision: 847b2e2403592d9f74d88d2c1cade1b5e814ec0e
  https://github.com/clear-code/cutter/commit/847b2e2403592d9f74d88d2c1cade1b5e814ec0e

  Message:
    Revert adding cut_test_get_jump_buffer()
    
    It is a needless function. We can implement the same feature by
    cut_test_context_get_jump_buffer().

  Modified files:
    cppcutter/cppcut-test-methods.cpp
    cutter/cut-test.c
    cutter/cut-test.h

  Modified: cppcutter/cppcut-test-methods.cpp (+5 -3)
===================================================================
--- cppcutter/cppcut-test-methods.cpp    2014-01-30 22:28:39 +0900 (992e1f5)
+++ cppcutter/cppcut-test-methods.cpp    2014-01-30 22:32:19 +0900 (d9a34af)
@@ -47,12 +47,12 @@ struct CppCutTestTerminated {
 static const gchar *invoking_data_key = "cppcut-test-invoking";
 
 static void
-force_unwind_jump_buffers (CutTest *test)
+force_unwind_jump_buffers (CutTest *test, jmp_buf *base_jump_buffer)
 {
     CutTestContext *test_context = cut_get_current_test_context();
     while (cut_test_context_in_user_message_jump(test_context))
         cut_test_context_finish_user_message_jump(test_context);
-    cut_test_context_set_jump_buffer(test_context, cut_test_get_jump_buffer(test));
+    cut_test_context_set_jump_buffer(test_context, base_jump_buffer);
 }
 
 void
@@ -84,7 +84,9 @@ cut::test::invoke (CutTestClass *cut_test_class,
     bool is_terminated = false;
     const gchar *terminate_message = NULL;
     gboolean invoking = TRUE;
+    jmp_buf *base_jump_buffer;
 
+    base_jump_buffer = cut_test_context_get_jump_buffer(test_context);
     g_object_set_data(G_OBJECT(test), invoking_data_key, &invoking);
     try {
         cut_test_class->invoke(test, test_context, run_context);
@@ -109,7 +111,7 @@ cut::test::invoke (CutTestClass *cut_test_class,
     }
 
     if (terminate_message) {
-        force_unwind_jump_buffers(test);
+        force_unwind_jump_buffers(test, base_jump_buffer);
         cut_test_terminate(ERROR, terminate_message);
     }
 }

  Modified: cutter/cut-test.c (+0 -7)
===================================================================
--- cutter/cut-test.c    2014-01-30 22:28:39 +0900 (4621bc4)
+++ cutter/cut-test.c    2014-01-30 22:32:19 +0900 (d9ef5d9)
@@ -551,13 +551,6 @@ cut_test_is_own_jump_buffer (CutTest *test, jmp_buf *jump_buffer)
     return priv->jump_buffer == jump_buffer;
 }
 
-jmp_buf *
-cut_test_get_jump_buffer (CutTest *test)
-{
-    CutTestPrivate *priv = CUT_TEST_GET_PRIVATE(test);
-    return priv->jump_buffer;
-}
-
 const gchar *
 cut_test_get_name (CutTest *test)
 {

  Modified: cutter/cut-test.h (+0 -1)
===================================================================
--- cutter/cut-test.h    2014-01-30 22:28:39 +0900 (b1b6dc2)
+++ cutter/cut-test.h    2014-01-30 22:32:19 +0900 (32f311a)
@@ -118,7 +118,6 @@ void         cut_test_long_jump           (CutTest        *test,
                                            gint            value);
 gboolean     cut_test_is_own_jump_buffer  (CutTest        *test,
                                            jmp_buf        *jump_buffer);
-jmp_buf     *cut_test_get_jump_buffer     (CutTest        *test);
 
 const gchar *cut_test_get_name            (CutTest     *test);
 void         cut_test_set_name            (CutTest     *test,