E CVS: libs/eet cedric

[Enlightenment CVS]

Enlightenment CVS committal

Author  : cedric
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/tests


Modified Files:
        eet_suite.c 


Log Message:
Fix wrongly stored image when compressed size is bigger than uncompressed. Fix 
bug #523.


===================================================================
RCS file: /cvs/e/e17/libs/eet/src/tests/eet_suite.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- eet_suite.c 27 Jun 2008 15:26:53 -0000      1.4
+++ eet_suite.c 24 Jul 2008 13:25:18 -0000      1.5
@@ -220,6 +220,8 @@
    void *transfert;
    int size;
 
+   eet_init();
+
    _eet_test_basic_set(&etbt, 0);
 
    eet_test_setup_eddc(&eddc);
@@ -243,6 +245,8 @@
    free(result);
 
    eet_data_descriptor_free(edd);
+
+   eet_shutdown();
 }
 END_TEST
 
@@ -468,6 +472,8 @@
    int size;
    int test;
 
+   eet_init();
+
    _eet_test_ex_set(&etbt, 0);
    etbt.list = eet_list_prepend(etbt.list, _eet_test_ex_set(NULL, 1));
    etbt.hash = eet_hash_add(etbt.hash, EET_TEST_KEY1, _eet_test_ex_set(NULL, 
2));
@@ -499,6 +505,8 @@
    fail_if(test != 0);
    eet_hash_foreach(result->ihash, func7, &test);
    fail_if(test != 0);
+
+   eet_shutdown();
 }
 END_TEST
 
@@ -533,6 +541,8 @@
 
    int i;
 
+   eet_init();
+
    _eet_test_ex_set(&etbt, 0);
    etbt.list = eet_list_prepend(etbt.list, _eet_test_ex_set(NULL, 1));
    etbt.list = eet_list_prepend(etbt.list, _eet_test_ex_set(NULL, 1));
@@ -582,6 +592,8 @@
    fail_if(test != 0);
    eet_hash_foreach(result->ihash, func7, &test);
    fail_if(test != 0);
+
+   eet_shutdown();
 }
 END_TEST
 
@@ -593,6 +605,8 @@
    char *file = strdup("/tmp/eet_suite_testXXXXXX");
    int size;
 
+   eet_init();
+
    mktemp(file);
 
    fail_if(eet_mode_get(NULL) != EET_FILE_MODE_INVALID);
@@ -637,6 +651,8 @@
    eet_close(ef);
 
    fail_if(unlink(file) != 0);
+
+   eet_shutdown();
 }
 END_TEST
 
@@ -663,6 +679,8 @@
 
    int i;
 
+   eet_init();
+
    _eet_test_ex_set(&etbt, 0);
    etbt.list = eet_list_prepend(etbt.list, _eet_test_ex_set(NULL, 1));
    etbt.list = eet_list_prepend(etbt.list, _eet_test_ex_set(NULL, 1));
@@ -771,6 +789,8 @@
    eet_close(ef);
 
    fail_if(unlink(file) != 0);
+
+   eet_shutdown();
 }
 END_TEST
 
@@ -795,6 +815,8 @@
 
    int i;
 
+   eet_init();
+
    _eet_test_ex_set(&etbt, 0);
    etbt.list = eet_list_prepend(etbt.list, _eet_test_ex_set(NULL, 1));
    etbt.list = eet_list_prepend(etbt.list, _eet_test_ex_set(NULL, 1));
@@ -857,6 +879,8 @@
    fail_if(test != 0);
 
    fail_if(unlink(file) != 0);
+
+   eet_shutdown();
 }
 END_TEST
 
@@ -1062,6 +1086,63 @@
    free(data);
 
    eet_close(ef);
+
+   eet_shutdown();
+}
+END_TEST
+
+#define IM0 0x00112233
+#define IM1 0x44556677
+#define IM2 0x8899aabb
+#define IM3 0xccddeeff
+
+START_TEST(eet_small_image)
+{
+   char *file = strdup("/tmp/eet_suite_testXXXXXX");
+   unsigned int image[4];
+   unsigned int *data;
+   Eet_File *ef;
+   int w;
+   int h;
+   int alpha;
+   int compression;
+   int quality;
+   int lossy;
+   int result;
+
+   image[0] = IM0;
+   image[1] = IM1;
+   image[2] = IM2;
+   image[3] = IM3;
+
+   eet_init();
+
+   mktemp(file);
+
+   ef = eet_open(file, EET_FILE_MODE_WRITE);
+   fail_if(!ef);
+
+   result = eet_data_image_write(ef, "/images/test", image, 2, 2, 1, 9, 100, 
0);
+   fail_if(result == 0);
+
+   eet_close(ef);
+
+   ef = eet_open(file, EET_FILE_MODE_READ);
+   fail_if(!ef);
+
+   data = (unsigned int*) eet_data_image_read(ef, "/images/test", &w, &h, 
&alpha, &compression, &quality, &lossy);
+   fail_if(data == NULL);
+
+   eet_close(ef);
+
+   fail_if(data[0] != IM0);
+   fail_if(data[1] != IM1);
+   fail_if(data[2] != IM2);
+   fail_if(data[3] != IM3);
+
+   free(data);
+
+   eet_shutdown();
 }
 END_TEST
 
@@ -1091,6 +1172,7 @@
 
    tc = tcase_create("Eet Image");
    tcase_add_test(tc, eet_image);
+   tcase_add_test(tc, eet_small_image);
    suite_add_tcase(s, tc);
 
    return s;



-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs