[cutter-commit 02101] SF.net SVN: cutter: [2104] cutter/trunk

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

Revision: 2104
          http://cutter.svn.sourceforge.net/cutter/?rev=2104&view=rev
Author:   ktou
Date:     2008-06-23 17:06:24 -0700 (Mon, 23 Jun 2008)

Log Message:
-----------
* cutter/cut-test-context.h (cut_test_context_build_fixture_path):
  move to ...
* cutter/cut-public.h: ... here.

* cutter/cut-assertions-helper.h (cut_build_fixture_path): add.

Modified Paths:
--------------
    cutter/trunk/ChangeLog
    cutter/trunk/cutter/cut-assertions-helper.h
    cutter/trunk/cutter/cut-public.h
    cutter/trunk/cutter/cut-test-context.h
    cutter/trunk/cutter/cut-utils.c

Modified: cutter/trunk/ChangeLog
===================================================================
--- cutter/trunk/ChangeLog	2008-06-23 23:15:14 UTC (rev 2103)
+++ cutter/trunk/ChangeLog	2008-06-24 00:06:24 UTC (rev 2104)
@@ -1,5 +1,11 @@
 2008-06-24  Kouhei Sutou  <ko...@co...>
 
+	* cutter/cut-test-context.h (cut_test_context_build_fixture_path):
+	move to ...
+	* cutter/cut-public.h: ... here.
+
+	* cutter/cut-assertions-helper.h (cut_build_fixture_path): add.
+
 	* configure.ac, test/fixtures/**/Makefile.am: add Makefile.am.
 
 2008-06-23  Kouhei Sutou  <ko...@co...>

Modified: cutter/trunk/cutter/cut-assertions-helper.h
===================================================================
--- cutter/trunk/cutter/cut-assertions-helper.h	2008-06-23 23:15:14 UTC (rev 2103)
+++ cutter/trunk/cutter/cut-assertions-helper.h	2008-06-24 00:06:24 UTC (rev 2104)
@@ -64,6 +64,10 @@
         path, ## __VA_ARGS__, NULL);            \
 } while (0)
 
+#define cut_build_fixture_path(path, ...)                               \
+    cut_test_context_build_fixture_path(get_current_test_context(),     \
+                                        path, ## __VA_ARGS__, NULL)
+
 #define cut_get_fixture_data_string(path, ...)                          \
     cut_utils_get_fixture_data_string(get_current_test_context(),       \
                                       __PRETTY_FUNCTION__,              \

Modified: cutter/trunk/cutter/cut-public.h
===================================================================
--- cutter/trunk/cutter/cut-public.h	2008-06-23 23:15:14 UTC (rev 2103)
+++ cutter/trunk/cutter/cut-public.h	2008-06-24 00:06:24 UTC (rev 2104)
@@ -90,6 +90,10 @@
 int   cut_utils_regex_match                 (const char *pattern,
                                              const char *string);
 
+char *cut_test_context_build_fixture_path   (CutTestContext *context,
+                                             const char     *path,
+                                             ...) CUT_GNUC_NULL_TERMINATED;
+
 const char *cut_utils_get_fixture_data_string(CutTestContext *context,
                                               const char *function,
                                               const char *file,

Modified: cutter/trunk/cutter/cut-test-context.h
===================================================================
--- cutter/trunk/cutter/cut-test-context.h	2008-06-23 23:15:14 UTC (rev 2103)
+++ cutter/trunk/cutter/cut-test-context.h	2008-06-24 00:06:24 UTC (rev 2104)
@@ -92,10 +92,6 @@
                                                GString        *string,
                                                guint           indent);
 
-gchar        *cut_test_context_build_fixture_path
-                                              (CutTestContext *context,
-                                               const gchar    *path,
-                                               ...) G_GNUC_NULL_TERMINATED;
 gchar        *cut_test_context_build_fixture_pathv
                                               (CutTestContext *context,
                                                const gchar    *path,

Modified: cutter/trunk/cutter/cut-utils.c
===================================================================
--- cutter/trunk/cutter/cut-utils.c	2008-06-23 23:15:14 UTC (rev 2103)
+++ cutter/trunk/cutter/cut-utils.c	2008-06-24 00:06:24 UTC (rev 2104)
@@ -194,12 +194,12 @@
 }
 
 const gchar *
-cut_utils_get_fixture_data_string(CutTestContext *context,
-                                  const char *function,
-                                  const char *file,
-                                  unsigned int line,
-                                  const char *path,
-                                  ...)
+cut_utils_get_fixture_data_string (CutTestContext *context,
+                                   const char *function,
+                                   const char *file,
+                                   unsigned int line,
+                                   const char *path,
+                                   ...)
 {
     GError *error = NULL;
     const gchar *data;


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