Add test for guac_pool.

libguac/tests/Makefile.am

@@ -42,17 +42,20 @@ TESTS = test_libguac
 check_PROGRAMS = test_libguac
 
 noinst_HEADERS =          \
+	client/client_suite.h \
 	protocol/suite.h      \
-	client/client_suite.h
+	util/util_suite.h
 
 test_libguac_SOURCES =           \
     test_libguac.c               \
+	client/client_suite.c        \
+	client/buffer_pool.c         \
+	client/layer_pool.c          \
 	protocol/suite.c             \
 	protocol/instruction_read.c  \
 	protocol/instruction_write.c \
-	client/client_suite.c        \
+	util/util_suite.c            \
-	client/buffer_pool.c         \
+	util/guac_pool.c
-	client/layer_pool.c
 
 test_libguac_LDADD = $(top_builddir)/src/libguac.la @CUNIT_LIBS@
 

libguac/tests/test_libguac.c

@@ -39,6 +39,7 @@
 
 #include "protocol/suite.h"
 #include "client/client_suite.h"
+#include "util/util_suite.h"
 
 int main() {
 
@@ -49,6 +50,7 @@ int main() {
     /* Register suites */
     register_protocol_suite();
     register_client_suite();
+    register_util_suite();
 
     /* Run tests */
     CU_basic_set_mode(CU_BRM_VERBOSE);

libguac/tests/util/guac_pool.c

@@ -0,0 +1,105 @@
+
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is libguac.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael Jumper.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <CUnit/Basic.h>
+
+#include "pool.h"
+#include "util_suite.h"
+
+#define UNSEEN          0 
+#define SEEN_PHASE_1    1
+#define SEEN_PHASE_2    2
+
+#define POOL_SIZE 128
+
+void test_guac_pool() {
+
+    guac_pool* pool;
+
+    int i;
+    int seen[POOL_SIZE] = {0};
+    int value;
+
+    /* Get pool */
+    pool = guac_pool_alloc(POOL_SIZE);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(pool);
+
+    /* Fill pool */
+    for (i=0; i<POOL_SIZE; i++) {
+
+        /* Get value from pool */
+        value = guac_pool_next_int(pool);
+
+        /* Value should be within pool size */
+        CU_ASSERT(value >= 0);
+        CU_ASSERT(value <  POOL_SIZE);
+
+        /* This should be an integer we have not seen yet */
+        CU_ASSERT_EQUAL(UNSEEN, seen[value]);
+        seen[value] = SEEN_PHASE_1;
+
+        /* Return value to pool */
+        guac_pool_free_int(pool, value);
+
+    }
+
+    /* Now that pool is filled, we should get ONLY previously seen integers */
+    for (i=0; i<POOL_SIZE; i++) {
+
+        /* Get value from pool */
+        value = guac_pool_next_int(pool);
+
+        /* Value should be within pool size */
+        CU_ASSERT(value >= 0);
+        CU_ASSERT(value <  POOL_SIZE);
+
+        /* This should be an integer we have seen already */
+        CU_ASSERT_EQUAL(SEEN_PHASE_1, seen[value]);
+        seen[value] = SEEN_PHASE_2;
+
+    }
+
+    /* Pool is filled to minimum now. Next value should be size + 1. */
+    value = guac_pool_next_int(pool);
+
+    CU_ASSERT_EQUAL(POOL_SIZE+1, value);
+
+    /* Free pool */
+    guac_pool_free(pool);
+
+}
+

libguac/tests/util/util_suite.c

@@ -0,0 +1,71 @@
+
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is libguac.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael Jumper.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <CUnit/Basic.h>
+
+#include "util_suite.h"
+
+int util_suite_init() {
+    return 0;
+}
+
+int util_suite_cleanup() {
+    return 0;
+}
+
+int register_util_suite() {
+
+    /* Add util test suite */
+    CU_pSuite suite = CU_add_suite("util",
+            util_suite_init, util_suite_cleanup);
+    if (suite == NULL) {
+        CU_cleanup_registry();
+        return CU_get_error();
+    }
+
+    /* Add tests */
+    if (
+        CU_add_test(suite, "guac-pool", test_guac_pool) == NULL
+       ) {
+        CU_cleanup_registry();
+        return CU_get_error();
+    }
+
+    return 0;
+
+}
+

libguac/tests/util/util_suite.h

@@ -0,0 +1,46 @@
+
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is libguac.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael Jumper.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef _GUAC_TEST_UTIL_SUITE_H
+#define _GUAC_TEST_UTIL_SUITE_H
+
+int register_util_suite();
+
+void test_guac_pool();
+
+#endif
+