E CVS: libs/ewl ningerso

[Enlightenment CVS]

Enlightenment CVS committal

Author  : ningerso
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src/bin/tests/object


Modified Files:
        ewl_object.c 


Log Message:
Cleanup temporary test widgets in each object test.
Add basic alignment and fill policy unit tests.

===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/object/ewl_object.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_object.c        9 Nov 2007 14:58:01 -0000       1.1
+++ ewl_object.c        10 Nov 2007 07:26:35 -0000      1.2
@@ -23,6 +23,8 @@
 static int maximum_size_test_set_get(char *buf, int len);
 static int minimum_size_test_set_request(char *buf, int len);
 static int maximum_size_test_set_request(char *buf, int len);
+static int fill_policy_test_set_get(char *buf, int len);
+static int alignment_test_set_get(char *buf, int len);
 
 static Ewl_Unit_Test object_unit_tests[] = {
                {"preferred inner size set/get", 
preferred_inner_size_test_set_get, -1, NULL},
@@ -31,6 +33,8 @@
                {"maximum size set/get", maximum_size_test_set_get, -1, NULL},
                {"minimum size set/request", minimum_size_test_set_request, -1, 
NULL},
                {"maximum size set/request", maximum_size_test_set_request, -1, 
NULL},
+               {"fill policy set/get", fill_policy_test_set_get, -1, NULL},
+               {"alignment set/get", alignment_test_set_get, -1, NULL},
                {NULL, NULL, -1, NULL}
        };
 
@@ -79,6 +83,8 @@
                snprintf(buf, len, "default preferred inner size %dx%d",
                        width, height);
 
+       ewl_widget_destroy(w);
+
        return ret;
 }
 
@@ -117,6 +123,8 @@
                snprintf(buf, len, "default preferred size %dx%d",
                        width, height);
 
+       ewl_widget_destroy(w);
+
        return ret;
 }
 
@@ -153,6 +161,8 @@
                snprintf(buf, len, "default minimum size %dx%d",
                        width, height);
 
+       ewl_widget_destroy(w);
+
        return ret;
 }
 
@@ -189,6 +199,8 @@
                snprintf(buf, len, "default maximum size %dx%d",
                        width, height);
 
+       ewl_widget_destroy(w);
+
        return ret;
 }
 
@@ -241,6 +253,8 @@
        else
                snprintf(buf, len, "same sizes wrong %dx%d", width, height);
 
+       ewl_widget_destroy(w);
+
        return ret;
 }
 
@@ -292,6 +306,74 @@
        }
        else
                snprintf(buf, len, "same sizes wrong %dx%d", width, height);
+
+       ewl_widget_destroy(w);
+
+       return ret;
+}
+
+static int
+fill_policy_test_set_get(char *buf, int len)
+{
+       Ewl_Widget *w;
+       unsigned int fill;
+       int ret = 0;
+
+       w = calloc(1, sizeof(Ewl_Widget));
+       ewl_widget_init(w);
+
+       /*
+        * Since fill all should simply be a mask of all other values, this
+        * tests each bit being set.
+        */
+       ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_ALL);
+       fill = ewl_object_fill_policy_get(EWL_OBJECT(w));
+
+       if ((fill & EWL_FLAG_FILL_HSHRINK) && (fill & EWL_FLAG_FILL_VSHRINK) &&
+           (fill & EWL_FLAG_FILL_HFILL) && (fill & EWL_FLAG_FILL_VFILL)) {
+               ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_NONE);
+               fill = ewl_object_fill_policy_get(EWL_OBJECT(w));
+               if (!fill)
+                       ret = 1;
+               else
+                       snprintf(buf, len, "fill none incorrect");
+       }
+       else
+               snprintf(buf, len, "fill all missing flags");
+
+       ewl_widget_destroy(w);
+
+       return ret;
+}
+
+static int
+alignment_test_set_get(char *buf, int len)
+{
+       Ewl_Widget *w;
+       unsigned int align;
+       int ret = 0;
+
+       w = calloc(1, sizeof(Ewl_Widget));
+       ewl_widget_init(w);
+
+       ewl_object_alignment_set(EWL_OBJECT(w), EWL_FLAG_ALIGN_LEFT |
+                       EWL_FLAG_ALIGN_RIGHT | EWL_FLAG_ALIGN_TOP |
+                       EWL_FLAG_ALIGN_BOTTOM);
+       align = ewl_object_alignment_get(EWL_OBJECT(w));
+
+       if ((align & EWL_FLAG_ALIGN_LEFT) && (align & EWL_FLAG_ALIGN_RIGHT) &&
+           (align & EWL_FLAG_ALIGN_TOP) && (align & EWL_FLAG_ALIGN_BOTTOM)) {
+               ewl_object_alignment_set(EWL_OBJECT(w), EWL_FLAG_ALIGN_CENTER);
+               align = ewl_object_alignment_get(EWL_OBJECT(w));
+               if (!align)
+                       ret = 1;
+               else
+                       snprintf(buf, len, "align none incorrect");
+       }
+       else
+               snprintf(buf, len, "alignment missing flags");
+
+       ewl_widget_destroy(w);
 
        return ret;
 }



-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs