|
From: Kouhei S. <nul...@cl...> - 2014-01-26 08:03:38
|
Kouhei Sutou 2014-01-26 17:03:15 +0900 (Sun, 26 Jan 2014) New Revision: deb7c66c1593cbec43c43297ac06a11975aa2fa2 https://github.com/clear-code/cutter/commit/deb7c66c1593cbec43c43297ac06a11975aa2fa2 Message: Add missing "_buffer" to function names cut_test_context_set_jump -> cut_test_context_set_jump_buffer +++++++ cut_test_context_get_jump -> cut_test_context_get_jump_buffer +++++++ Modified files: cutter/cut-assertions-helper.h cutter/cut-public.h cutter/cut-test-case.c cutter/cut-test-context.c cutter/cut-test-iterator.c cutter/cut-test.c Modified: cutter/cut-assertions-helper.h (+6 -6) =================================================================== --- cutter/cut-assertions-helper.h 2014-01-26 00:21:06 +0900 (f6e231f) +++ cutter/cut-assertions-helper.h 2014-01-26 17:03:15 +0900 (6e994f1) @@ -1,6 +1,6 @@ /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2007-2010 Kouhei Sutou <ko...@cl...> + * Copyright (C) 2007-2014 Kouhei Sutou <ko...@cl...> * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -34,14 +34,14 @@ extern "C" { \ cut_test_context_start_user_message_jump(cut_get_current_test_context()); \ cut_previous_jump_buffer = \ - cut_test_context_get_jump(cut_get_current_test_context()); \ - cut_test_context_set_jump(cut_get_current_test_context(), \ - &cut_jump_buffer); \ + cut_test_context_get_jump_buffer(cut_get_current_test_context()); \ + cut_test_context_set_jump_buffer(cut_get_current_test_context(), \ + &cut_jump_buffer); \ if (setjmp(cut_jump_buffer) == 0) { \ assertion; \ } \ - cut_test_context_set_jump(cut_get_current_test_context(), \ - cut_previous_jump_buffer); \ + cut_test_context_set_jump_buffer(cut_get_current_test_context(), \ + cut_previous_jump_buffer); \ cut_test_context_finish_user_message_jump(cut_get_current_test_context()); \ \ do { \ Modified: cutter/cut-public.h (+5 -3) =================================================================== --- cutter/cut-public.h 2014-01-26 00:21:06 +0900 (6df15d7) +++ cutter/cut-public.h 2014-01-26 17:03:15 +0900 (f0d196c) @@ -1,6 +1,6 @@ /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2007-2011 Kouhei Sutou <ko...@cl...> + * Copyright (C) 2007-2014 Kouhei Sutou <ko...@cl...> * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -108,9 +108,11 @@ void cut_test_context_finish_user_message_jump (CutTestContext *context); cut_boolean cut_test_context_in_user_message_jump (CutTestContext *context); -void cut_test_context_set_jump (CutTestContext *context, +void cut_test_context_set_jump_buffer + (CutTestContext *context, jmp_buf *buffer); -jmp_buf *cut_test_context_get_jump (CutTestContext *context); +jmp_buf *cut_test_context_get_jump_buffer + (CutTestContext *context); void cut_test_context_long_jump (CutTestContext *context); const void *cut_test_context_take (CutTestContext *context, Modified: cutter/cut-test-case.c (+5 -5) =================================================================== --- cutter/cut-test-case.c 2014-01-26 00:21:06 +0900 (8c4fc1e) +++ cutter/cut-test-case.c 2014-01-26 17:03:15 +0900 (f115a21) @@ -1,6 +1,6 @@ /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2007-2011 Kouhei Sutou <ko...@cl...> + * Copyright (C) 2007-2014 Kouhei Sutou <ko...@cl...> * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -373,7 +373,7 @@ cut_test_case_run_setup (CutTestCase *test_case, CutTestContext *test_context) if (priv->setup) { jmp_buf jump_buffer; - cut_test_context_set_jump(test_context, &jump_buffer); + cut_test_context_set_jump_buffer(test_context, &jump_buffer); if (setjmp(jump_buffer) == 0) { priv->setup(); } @@ -389,7 +389,7 @@ cut_test_case_run_teardown (CutTestCase *test_case, CutTestContext *test_context if (priv->teardown) { jmp_buf jump_buffer; - cut_test_context_set_jump(test_context, &jump_buffer); + cut_test_context_set_jump_buffer(test_context, &jump_buffer); if (setjmp(jump_buffer) == 0) { priv->teardown(); } @@ -479,7 +479,7 @@ cut_test_case_run_startup (CutTestCase *test_case, CutTestContext *test_context) if (priv->startup) { jmp_buf jump_buffer; - cut_test_context_set_jump(test_context, &jump_buffer); + cut_test_context_set_jump_buffer(test_context, &jump_buffer); if (setjmp(jump_buffer) == 0) { priv->startup(); } @@ -495,7 +495,7 @@ cut_test_case_run_shutdown (CutTestCase *test_case, CutTestContext *test_context if (priv->shutdown) { jmp_buf jump_buffer; - cut_test_context_set_jump(test_context, &jump_buffer); + cut_test_context_set_jump_buffer(test_context, &jump_buffer); if (setjmp(jump_buffer) == 0) { priv->shutdown(); } Modified: cutter/cut-test-context.c (+3 -3) =================================================================== --- cutter/cut-test-context.c 2014-01-26 00:21:06 +0900 (3da898a) +++ cutter/cut-test-context.c 2014-01-26 17:03:15 +0900 (d06200c) @@ -1,6 +1,6 @@ /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2007-2013 Kouhei Sutou <ko...@cl...> + * Copyright (C) 2007-2014 Kouhei Sutou <ko...@cl...> * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -823,7 +823,7 @@ cut_test_context_get_n_data (CutTestContext *context) } void -cut_test_context_set_jump (CutTestContext *context, jmp_buf *buffer) +cut_test_context_set_jump_buffer (CutTestContext *context, jmp_buf *buffer) { CutTestContextPrivate *priv = CUT_TEST_CONTEXT_GET_PRIVATE(context); @@ -831,7 +831,7 @@ cut_test_context_set_jump (CutTestContext *context, jmp_buf *buffer) } jmp_buf * -cut_test_context_get_jump (CutTestContext *context) +cut_test_context_get_jump_buffer (CutTestContext *context) { return CUT_TEST_CONTEXT_GET_PRIVATE(context)->jump_buffer; } Modified: cutter/cut-test-iterator.c (+2 -2) =================================================================== --- cutter/cut-test-iterator.c 2014-01-26 00:21:06 +0900 (f1200bc) +++ cutter/cut-test-iterator.c 2014-01-26 17:03:15 +0900 (aa73aa5) @@ -1,6 +1,6 @@ /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2008-2009 Kouhei Sutou <ko...@co...> + * Copyright (C) 2008-2014 Kouhei Sutou <ko...@cl...> * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -526,7 +526,7 @@ run (CutTest *test, CutTestContext *test_context, CutRunContext *run_context) cut_test_context_set_test_iterator(test_context, test_iterator); if (priv->data_setup_function) { - cut_test_context_set_jump(test_context, &jump_buffer); + cut_test_context_set_jump_buffer(test_context, &jump_buffer); if (setjmp(jump_buffer) == 0) { priv->data_setup_function(); } Modified: cutter/cut-test.c (+2 -2) =================================================================== --- cutter/cut-test.c 2014-01-26 00:21:06 +0900 (09e6ef6) +++ cutter/cut-test.c 2014-01-26 17:03:15 +0900 (a8468da) @@ -1,6 +1,6 @@ /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2007-2012 Kouhei Sutou <ko...@cl...> + * Copyright (C) 2007-2014 Kouhei Sutou <ko...@cl...> * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -459,7 +459,7 @@ run (CutTest *test, CutTestContext *test_context, CutRunContext *run_context) case 0: g_signal_emit_by_name(test, "start", test_context); - cut_test_context_set_jump(test_context, &jump_buffer); + cut_test_context_set_jump_buffer(test_context, &jump_buffer); if (setjmp(jump_buffer) == 0) { if (priv->timer) { g_timer_start(priv->timer); |