[cutter-commit 00031] SF.net SVN: cutter: [33] trunk

[<ik...@us...>]

Revision: 33
          http://cutter.svn.sourceforge.net/cutter/?rev=33&view=rev
Author:   ikezoe
Date:     2007-10-30 23:39:03 -0700 (Tue, 30 Oct 2007)

Log Message:
-----------
2007-10-31  Hiroyuki Ikezoe  <poi...@ik...>

	* cutter/cut-test-container.c: Run cut_test_run() if test object is
	CutTest.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/cutter/cut-test-container.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-10-31 06:33:27 UTC (rev 32)
+++ trunk/ChangeLog	2007-10-31 06:39:03 UTC (rev 33)
@@ -1,5 +1,10 @@
 2007-10-31  Hiroyuki Ikezoe  <poi...@ik...>
 
+	* cutter/cut-test-container.c: Run cut_test_run() if test object is
+	CutTest.
+
+2007-10-31  Hiroyuki Ikezoe  <poi...@ik...>
+
 	* cutter/cut-test.[c|h]: Added CutTest object.
 
 2007-10-31  Hiroyuki Ikezoe  <poi...@ik...>

Modified: trunk/cutter/cut-test-container.c
===================================================================
--- trunk/cutter/cut-test-container.c	2007-10-31 06:33:27 UTC (rev 32)
+++ trunk/cutter/cut-test-container.c	2007-10-31 06:39:03 UTC (rev 33)
@@ -29,6 +29,8 @@
 
 #include "cut-test-container.h"
 
+#include "cut-test.h"
+
 #define CUT_TEST_CONTAINER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CUT_TYPE_TEST_CONTAINER, CutTestContainerPrivate))
 
 typedef struct _CutTestContainerPrivate	CutTestContainerPrivate;
@@ -119,12 +121,20 @@
 cut_test_container_run_tests (CutTestContainer *container)
 {
     GList *list;
+    gboolean ret;
     CutTestContainerPrivate *priv = CUT_TEST_CONTAINER_GET_PRIVATE(container);
 
     for (list = priv->tests; list; list = g_list_next(list)) {
-        if (list->data && CUT_IS_TEST_CONTAINER(list->data)) {
+        if (!list->data)
+            continue;
+        if (CUT_IS_TEST_CONTAINER(list->data)) {
             CutTestContainer *child = CUT_TEST_CONTAINER(list->data);
-            gboolean ret = cut_test_container_run_tests(child);
+            ret = cut_test_container_run_tests(child);
+        } else if (CUT_IS_TEST(list->data)) {
+            CutTest *test = CUT_TEST(list->data);
+            ret = cut_test_run(test);
+        } else {
+            g_warning ("This object is not test or test container!");
         }
     }
 


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