Merge lp:geis/2.x into lp:geis

[Stephen M. Webb]

Two more function groups: Geis configuration and Geis attributes.

[Mohamed IKBEL Boulabiar (boulabiar)]

in libutouch-geis/geis.c I have just found this line commented
/* status = GEIS_STATUS_SUCCESS; */
and as said in IRC about GEIS_STATUS_NO_SUPPORTED in the comments.

It Looks good. Nice work !

review: Approve

[Chase Douglas (chasedouglas)]

I'm not sure what Ikbel is getting at, but I also find GEIS_STATUS_NO_SUPPORTED to be odd. Shouldn't it be GEIS_STATUS_NOT_SUPPORTED? Or GEIS_STATUS_NO_SUPPORT?

Otherwise, looks good. I'll approve, but under the condition that GEIS_STATUS_NO_SUPPORTED is transmutated into something better :).

review: Approve

[lp:geis/2.x]

105. By Stephen M. Webb on 2010-11-28

Silence some compile-time warnings.

106. By Stephen M. Webb on 2010-11-29

Added GEIS Subscritpion construction and accessors.

107. By Stephen M. Webb on 2010-11-29

Fixed typo in Doxygen documentation.

=== modified file 'ChangeLog'
--- ChangeLog	2010-11-24 17:19:26 +0000
+++ ChangeLog	2010-11-26 20:47:53 +0000
@@ -1,3 +1,41 @@
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added Geis Attr functions.
+
+  * libutouch-geis/geis_attr.c: new file
+  * libutouch-geis/geis_attr.h: new file
+  * testsuite/libutouch-geis/check_attr.c: new unit test suite
+  * include/geis/geis.h (GeisAttr): new type
+    (geis_attr_name): new function
+    (geis_attr_type): new function
+    (geis_attr_value_to_boolean): new function
+    (geis_attr_value_to_float): new function
+    (geis_attr_value_to_integer): new function
+    (geis_attr_value_to_string): new function
+  * libutouch-geis/Makefile.am: added new files
+  * libutouch-geis/libutouch-geis.ver: added new symbols
+  * testsuite/libutouch-geis/Makefile.am: added new test suite
+  * testsuite/libutouch-geis/check_error_reporting.c: renamed test suite
+  * testsuite/libutouch-geis/check_geis2_internals.c: added new test suite
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added Geis configuration functions.
+
+  * include/geis/geis.h (geis_get_config): new function
+    (geis_set_config): new function
+  * libutouch-geis/geis.c: added stubs for new functions
+  * libutouch-geis/libutouch-geis.ver: added symbols for new functions
+  * testsuite/geis2/check_config.c: new test suite for new functions
+  * testsuite/geis2/Makefile.am: added above new file
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added silent rules to build.
+
+  * configure.ac (AM_INIT_AUTOMAKE): required minimum version 1.11
+    (AM_SILENT_RULES): new macros to set silent build rules on by default
+
 2010-11-24  Stephen M. Webb  <[e-mail]>
 
   Fixed a "make distcheck" problem.

=== modified file 'configure.ac'
--- configure.ac	2010-11-24 16:59:34 +0000
+++ configure.ac	2010-11-26 20:47:53 +0000
@@ -26,7 +26,8 @@
 AC_CONFIG_HEADERS([geis_config.h])
 AC_CONFIG_AUX_DIR([config.aux])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([gnu -Wall])
+AM_INIT_AUTOMAKE([1.11 gnu -Wall color-tests])
+AM_SILENT_RULES([yes])
 
 # Checks for programs.
 AM_PROG_CC_C_O

=== modified file 'include/geis/geis.h'
--- include/geis/geis.h	2010-11-23 23:33:37 +0000
+++ include/geis/geis.h	2010-11-26 20:47:53 +0000
@@ -267,7 +267,7 @@
 /* @} */
 
 /**
- * @defgroup geis_config Configuration and Control
+ * @defgroup geis_config Configuration and Control (GEIS v1.0)
  * @{
  */
 
@@ -327,6 +327,60 @@
 
 /* @} */
 
+/**
+ * @defgroup geis2_config Configuration (GEIS v2.0)
+ * @{
+ */
+
+#define GEIS_CONFIGURATION_FD "org.libgeis.configuration.fd"
+
+/**
+ * Gets a feature configuration value.
+ *
+ * @param[in]  geis                     An opaque GEIS API object.
+ * @param[in]  configuration_item_name  Selects the configuration value to return.
+ * @param[out] configuration_item_value Points to a buffer to contain the output
+ *                                      value.  The actual type of this buffer
+ *                                      depends on the
+ *                                      @p configuration_value_name.
+ *
+ * @retval GEIS_STATUS_BAD_ARGUMENT  an invalid argument value was passed
+ * @retval GEIS_STATUS_NO_SUPPORTED  the configuration value is not supported
+ * @retval GEIS_STATUS_SUCCESS       normal successful completion
+ */
+GEIS_API GeisStatus geis_get_configuration(Geis        geis, 
+                                           GeisString  configuration_item_name,
+                                           void       *configuration_item_value);
+
+/**
+ * Sets a feature configuration value.
+ *
+ * @param[in]  geis                 An opaque GEIS API object.
+ * @param[in]  configuration_value  Selects the configuration value to return.
+ * @param[in]  configuration_item_name  Selects the configuration value to return.
+ * @param[in] configuration_item_value Points to a buffer to contain the output
+ *                                     configuration value.  The actual type of
+ *                                     this buffer depends on the
+ *                                     @p configuration_value_name.
+ *
+ * @retval GEIS_STATUS_BAD_ARGUMENT  an invalid argument value was passed
+ * @retval GEIS_STATUS_NO_SUPPORTED  the configuration value is not supported
+ * @retval GEIS_STATUS_SUCCESS       normal successful completion
+ */
+GEIS_API GeisStatus geis_set_configuration(Geis        geis,
+                                           GeisString  configuration_item_name, 
+                                           void       *configuration_item_value);
+
+/* @} */
+
+/**
+ * @defgroup geis2_attrs Attributes
+ *
+ * Attributes are named values associated with various GEIS entities, including
+ * input devices, gesture types, and gesture events.
+ *
+ * @{
+ */
 typedef enum GeisAttrType
 {
   GEIS_ATTR_TYPE_UNKNOWN,
@@ -337,6 +391,58 @@
 } GeisAttrType;
 
 /**
+ * An opaque type that encapsulates a GEIS attribute.
+ *
+ * GeisAttr objects may not be created or destroyed by the application, they may
+ * only have their data examined or extracted.
+ */
+typedef struct _GeisAttr *GeisAttr;
+
+/**
+ * Gets the name of an attribute.
+ *
+ * @param[in] attr  Identifies the attribute.
+ */
+GEIS_API GeisString geis_attr_name(GeisAttr attr);
+
+/**
+ * Gets the type of an attribute value.
+ *
+ * @param[in] attr  Identifies the attribute.
+ */
+GEIS_API GeisAttrType geis_attr_type(GeisAttr attr);
+
+/**
+ * Gets the value of an attribute as a GeisBoolean.
+ *
+ * @param[in] attr  Identifies the attribute.
+ */
+GEIS_API GeisBoolean geis_attr_value_to_boolean(GeisAttr attr);
+
+/**
+ * Gets the value of an attribute as a GeisFloat.
+ *
+ * @param[in] attr  Identifies the attribute.
+ */
+GEIS_API GeisFloat geis_attr_value_to_float(GeisAttr attr);
+
+/**
+ * Gets the value of an attribute as a GeisInteger.
+ *
+ * @param[in] attr  Identifies the attribute.
+ */
+GEIS_API GeisInteger geis_attr_value_to_integer(GeisAttr attr);
+
+/**geis_attr_value_to_integer
+ * Gets the value of an attribute as a GeisString.
+ *
+ * @param[in] attr  Identifies the attribute.
+ */
+GEIS_API GeisString geis_attr_value_to_string(GeisAttr attr);
+
+/* @} */
+
+/**
  * @defgroup geis_input Input Devices
  * @{
  */

=== modified file 'libutouch-geis/Makefile.am'
--- libutouch-geis/Makefile.am	2010-11-23 23:33:37 +0000
+++ libutouch-geis/Makefile.am	2010-11-26 20:47:53 +0000
@@ -23,6 +23,7 @@
 lib_LTLIBRARIES = libutouch-geis.la
 
 libutouch_geis_la_SOURCES = \
+	geis_attr.h     geis_attr.c \
 	geis_error.h    geis_error.c \
 	geis_logging.h  geis_logging.c \
 	geis_private.h  geis.c
@@ -38,10 +39,11 @@
 libutouch_geis_la_LDFLAGS = \
 	-Wl,-z,defs -Wl,--as-needed \
 	-version-info 2:0:1 \
-	-Wl,--version-script=$(version_script)
+	-Wl,--version-script=$(version_script) \
+	-lm
 
 libutouch_geis_la_LIBADD = \
-	$(top_builddir)/libutouch-geis-xcb/libutouch-geis.la
+	$(top_builddir)/libutouch-geis-xcb/libutouch-geis.la 
 
 EXTRA_DIST = $(version_script)
 

=== modified file 'libutouch-geis/geis.c'
--- libutouch-geis/geis.c	2010-11-23 23:33:37 +0000
+++ libutouch-geis/geis.c	2010-11-26 20:47:53 +0000
@@ -24,6 +24,7 @@
 #include "geis_error.h"
 #include "geis_logging.h"
 #include <stdarg.h>
+#include <string.h>
 
 
 
@@ -101,4 +102,33 @@
 }
 
 
+/**
+ * Gets a named configuration item.
+ */
+GeisStatus
+geis_get_configuration(Geis        geis, 
+                       GeisString  configuration_item_name,
+                       void       *configuration_item_value)
+{
+  GeisStatus status = GEIS_STATUS_NOT_SUPPORTED;
+
+  if (0 == strcmp(configuration_item_name, GEIS_CONFIGURATION_FD))
+  {
+    /* status = GEIS_STATUS_SUCCESS; */
+  };
+
+  return status;
+}
+
+
+/**
+ * Sets a named configuration item.
+ */
+GeisStatus
+geis_set_configuration(Geis        geis,
+                       GeisString  configuration_item_name,
+                       void       *configuration_item_value)
+{
+  return GEIS_STATUS_UNKNOWN_ERROR;
+}
 

=== added file 'libutouch-geis/geis_attr.c'
--- libutouch-geis/geis_attr.c	1970-01-01 00:00:00 +0000
+++ libutouch-geis/geis_attr.c	2010-11-26 20:47:53 +0000
@@ -0,0 +1,324 @@
+/**
+ * @file geis_attr.c
+ * @brief internal uTouch GeisAttr facilities
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+#include "geis_attr.h"
+
+#include "geis_logging.h"
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+struct _GeisAttr
+{
+  GeisString   attr_name;
+  GeisAttrType attr_type;
+  union
+  {
+    GeisBoolean  b_value;
+    GeisFloat    f_value;
+    GeisInteger  i_value;
+    GeisString   s_value;
+    void        *v_value;
+  };
+};
+
+
+struct _GeisAttrBag
+{
+  GeisAttr *attr_store;
+  GeisSize  attr_store_size;
+  GeisSize  attr_count;
+};
+
+static const float attr_bag_growth_constant = 1.5f;
+
+
+GeisAttrBag
+geis_attr_bag_new(GeisSize size_hint)
+{
+  GeisAttrBag bag = calloc(1, sizeof(struct _GeisAttrBag));
+  if (!bag)
+  {
+    geis_error("failed to allocate attr bag");
+  }
+  else
+  {
+    GeisSize min_size = size_hint > 2 ? size_hint : 2;
+    bag->attr_count = 0;
+    bag->attr_store_size = min_size;
+    bag->attr_store = calloc(bag->attr_store_size, sizeof(GeisAttr));
+    if (!bag->attr_store)
+    {
+      geis_error("failed to allocate attr bag store");
+      free(bag);
+      bag = NULL;
+    }
+  }
+
+  return bag;
+}
+
+
+void
+geis_attr_bag_delete(GeisAttrBag bag)
+{
+  GeisSize i;
+  for (i = 0; i < bag->attr_count; ++i)
+  {
+    geis_attr_delete(bag->attr_store[i]);
+  }
+  free(bag);
+}
+
+
+GeisSize
+geis_attr_bag_count(GeisAttrBag bag)
+{
+  return bag->attr_count;
+}
+
+
+GeisStatus
+geis_attr_bag_insert(GeisAttrBag bag, GeisAttr attr)
+{
+  GeisStatus status = GEIS_STATUS_UNKNOWN_ERROR;
+  if (bag->attr_count >= bag->attr_store_size)
+  {
+    GeisSize new_store_size = ceilf(bag->attr_store_size
+                                  * attr_bag_growth_constant);
+    GeisAttr *new_store = realloc(bag->attr_store, new_store_size);
+    if (!new_store)
+    {
+      geis_error("failed to reallocate attr bag");
+      goto error_exit;
+    }
+    bag->attr_store = new_store;
+    bag->attr_store_size = new_store_size;
+  }
+  bag->attr_store[bag->attr_count++] = attr;
+  status = GEIS_STATUS_SUCCESS;
+
+error_exit:
+  return status;
+}
+
+
+GeisAttr
+geis_attr_bag_find(GeisAttrBag bag, GeisString attr_name)
+{
+  GeisAttr attr = NULL;
+  GeisSize i;
+  for (i = 0; i < bag->attr_count; ++i)
+  {
+    if (0 == strcmp(bag->attr_store[i]->attr_name, attr_name))
+    {
+      attr = bag->attr_store[i];
+      break;
+    }
+  }
+  return attr;
+}
+
+
+GeisAttr
+geis_attr_new(GeisString attr_name, GeisAttrType attr_type, void* attr_value)
+{
+  GeisAttr attr = calloc(1, sizeof(struct _GeisAttr));
+  if (!attr)
+  {
+    geis_error("failed to allocate attr");
+  }
+  else
+  {
+    attr->attr_name = strdup(attr_name);
+    attr->attr_type = attr_type;
+    switch (attr_type)
+    {
+      case GEIS_ATTR_TYPE_BOOLEAN:
+	attr->b_value = *(GeisBoolean*)attr_value;
+	break;
+
+      case GEIS_ATTR_TYPE_FLOAT:
+	attr->f_value = *(GeisFloat*)attr_value;
+	break;
+
+      case GEIS_ATTR_TYPE_INTEGER:
+	attr->i_value = *(GeisInteger*)attr_value;
+	break;
+
+      case GEIS_ATTR_TYPE_STRING:
+	attr->s_value = (GeisString)attr_value;
+	break;
+
+      default:
+	attr->v_value = attr_value;
+    }
+  }
+  return attr;
+}
+
+
+void
+geis_attr_delete(GeisAttr attr)
+{
+  free((void *)attr->attr_name);
+  free(attr);
+}
+
+
+GeisString
+geis_attr_name(GeisAttr attr)
+{
+  return attr->attr_name;
+}
+
+
+GeisAttrType
+geis_attr_type(GeisAttr attr)
+{
+  return attr->attr_type;
+}
+
+
+GeisBoolean
+geis_attr_value_to_boolean(GeisAttr attr)
+{
+  GeisBoolean b_value = GEIS_FALSE;
+  switch (attr->attr_type)
+  {
+    case GEIS_ATTR_TYPE_BOOLEAN:
+      b_value = attr->b_value;
+      break;
+
+    case GEIS_ATTR_TYPE_FLOAT:
+      b_value = attr->f_value != 0.0f;
+      break;
+
+    case GEIS_ATTR_TYPE_INTEGER:
+      b_value = attr->i_value != 0;
+      break;
+
+    case GEIS_ATTR_TYPE_STRING:
+      b_value = (0 == strlen(attr->s_value)
+              || 0 == strcmp(attr->s_value, "false"));
+      break;
+
+    default:
+      break;
+  }
+  return b_value;
+}
+
+
+GeisFloat
+geis_attr_value_to_float(GeisAttr attr)
+{
+  GeisFloat f_value = 0.0f;
+  switch (attr->attr_type)
+  {
+    case GEIS_ATTR_TYPE_BOOLEAN:
+      f_value = attr->b_value ? 1.0f : 0.0f;
+      break;
+
+    case GEIS_ATTR_TYPE_FLOAT:
+      f_value = attr->f_value;
+      break;
+
+    case GEIS_ATTR_TYPE_INTEGER:
+      f_value = attr->i_value;
+      break;
+
+    case GEIS_ATTR_TYPE_STRING:
+      sscanf(attr->s_value, "%f", &f_value);
+      break;
+
+    default:
+      break;
+  }
+  return f_value;
+}
+
+
+GeisInteger
+geis_attr_value_to_integer(GeisAttr attr)
+{
+  GeisInteger i_value = 0;
+  switch (attr->attr_type)
+  {
+    case GEIS_ATTR_TYPE_BOOLEAN:
+      i_value = attr->b_value ? 1 : 0;
+      break;
+
+    case GEIS_ATTR_TYPE_FLOAT:
+      i_value = attr->f_value;
+      break;
+
+    case GEIS_ATTR_TYPE_INTEGER:
+      i_value = attr->i_value;
+      break;
+
+    case GEIS_ATTR_TYPE_STRING:
+      sscanf(attr->s_value, "%d", &i_value);
+      break;
+
+    default:
+      break;
+  }
+  return i_value;
+}
+
+
+GeisString
+geis_attr_value_to_string(GeisAttr attr)
+{
+  GeisString s_value = "";
+  static char buf[32];
+  switch (attr->attr_type)
+  {
+    case GEIS_ATTR_TYPE_BOOLEAN:
+      sprintf(buf, "%s", attr->b_value ? "true" : "false"); /* i18n */
+      s_value = buf;
+      break;
+
+    case GEIS_ATTR_TYPE_FLOAT:
+      sprintf(buf, "%f", attr->f_value);
+      s_value = buf;
+      break;
+
+    case GEIS_ATTR_TYPE_INTEGER:
+      sprintf(buf, "%d", attr->i_value);
+      s_value = buf;
+      break;
+
+    case GEIS_ATTR_TYPE_STRING:
+      s_value = attr->s_value;
+      break;
+
+    default:
+      sprintf(buf, "%p", attr->v_value);
+      s_value = buf;
+      break;
+  }
+  return s_value;
+}
+
+

=== added file 'libutouch-geis/geis_attr.h'
--- libutouch-geis/geis_attr.h	1970-01-01 00:00:00 +0000
+++ libutouch-geis/geis_attr.h	2010-11-26 20:47:53 +0000
@@ -0,0 +1,65 @@
+/**
+ * @file geis_attr.h
+ * @brief internal uTouch GeisAttr facilities
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+#ifndef GEIS_ATTR_H_
+#define GEIS_ATTR_H_
+
+#include <geis/geis.h>
+
+
+typedef struct _GeisAttrBag *GeisAttrBag;
+
+
+/**
+ * Creates a new Geis Attribute container.
+ */
+GeisAttrBag geis_attr_bag_new(GeisSize size_hint);
+
+/**
+ * Destroys a Geis Attribute container.
+ */
+void geis_attr_bag_delete(GeisAttrBag bag);
+
+/**
+ * Tells how any entires in a Geis Attribute container.
+ */
+GeisSize geis_attr_bag_count(GeisAttrBag bag);
+
+/**
+ * Inserts an attribute in an attribute container.
+ */
+GeisStatus geis_attr_bag_insert(GeisAttrBag bag, GeisAttr attr);
+
+/**
+ * Looks for an attribute in an attribute container.
+ */
+GeisAttr geis_attr_bag_find(GeisAttrBag bag, GeisString attr_name);
+
+/**
+ * Creates a Geis Attribute object.
+ */
+GeisAttr geis_attr_new(GeisString attr_name, GeisAttrType attr_type, void* attr_value);
+
+/**
+ * Destroys a Geis Attribute object.
+ */
+void geis_attr_delete(GeisAttr attr);
+
+#endif /* GEIS_ATTR_H_ */

=== modified file 'libutouch-geis/libutouch-geis.ver'
--- libutouch-geis/libutouch-geis.ver	2010-11-23 23:33:37 +0000
+++ libutouch-geis/libutouch-geis.ver	2010-11-26 20:47:53 +0000
@@ -13,11 +13,19 @@
 
 GEIS_2.0 {
   global:
+    geis_attr_name;
+    geis_attr_type;
+    geis_attr_value_to_boolean;
+    geis_attr_value_to_float;
+    geis_attr_value_to_integer;
+    geis_attr_value_to_string;
     geis_delete;
     geis_error_count;
     geis_error_code;
     geis_error_message;
+    geis_get_configuration;
     geis_new;
+    geis_set_configuration;
 
   local:
     *;

=== modified file 'testsuite/geis2/Makefile.am'
--- testsuite/geis2/Makefile.am	2010-11-23 14:59:40 +0000
+++ testsuite/geis2/Makefile.am	2010-11-26 20:47:53 +0000
@@ -14,6 +14,7 @@
 check_PROGRAMS = $(test_targets)
 
 check_geis2_api_SOURCES = \
+	check_config.c \
 	check_error_codes.c \
 	check_geis_new.c \
 	check_general_types.c \

=== added file 'testsuite/geis2/check_config.c'
--- testsuite/geis2/check_config.c	1970-01-01 00:00:00 +0000
+++ testsuite/geis2/check_config.c	2010-11-26 20:47:53 +0000
@@ -0,0 +1,61 @@
+/**
+ * unit tests for the geis_geis_config module
+ */
+#include <check.h>
+
+#include "geis/geis.h"
+
+/* fixtures */
+static Geis geis;
+
+/* fixture setup */
+static void
+construct_geis()
+{
+  geis = geis_new("geis-test-fixture", NULL);
+}
+
+/* fixture teardown */
+static void
+destroy_geis()
+{
+  geis_delete(geis);
+}
+
+START_TEST(get_success)
+{
+  int fd = -1;
+  GeisStatus status = geis_get_configuration(geis, GEIS_CONFIGURATION_FD, &fd);
+  fail_unless(status == GEIS_STATUS_SUCCESS,
+              "unexpected return status from geis_get_configuration()");
+  fail_unless(fd >= 0, "invalid Unix FD returned");
+}
+END_TEST
+
+
+/* verify table find operation (negative results) */
+START_TEST(get_fail)
+{
+  int fd = -1;
+  GeisStatus status = geis_get_configuration(geis, 1234, &fd);
+  fail_unless(status == GEIS_STATUS_NOT_SUPPORTED,
+              "unexpected return status from geis_get_configuration()");
+}
+END_TEST
+
+
+/* boilerplate */
+Suite *
+geis2_config_suite_new()
+{
+  Suite *s = suite_create("geis2_configuration");
+
+  TCase *usage = tcase_create("table-usage");
+  tcase_add_checked_fixture(usage, construct_geis, destroy_geis);
+  tcase_add_test(usage, get_success);
+  tcase_add_test(usage, get_fail);
+  suite_add_tcase(s, usage);
+
+  return s;
+}
+

=== modified file 'testsuite/geis2/check_geis2_api.c'
--- testsuite/geis2/check_geis2_api.c	2010-11-24 16:59:34 +0000
+++ testsuite/geis2/check_geis2_api.c	2010-11-26 20:47:53 +0000
@@ -8,6 +8,7 @@
 extern Suite *geis2_general_types_suite_new();
 extern Suite *geis2_error_codes_suite_new();
 extern Suite *geis2_geis_new_suite_new();
+extern Suite *geis2_config_suite_new();
 
 int
 main(int argc, char* argv[])
@@ -21,6 +22,7 @@
   srunner_add_suite(sr, geis2_general_types_suite_new());
   srunner_add_suite(sr, geis2_error_codes_suite_new());
   srunner_add_suite(sr, geis2_geis_new_suite_new());
+  srunner_add_suite(sr, geis2_config_suite_new());
 
   srunner_set_log(sr, "geis2_api.log");
   srunner_run_all(sr, CK_NORMAL);

=== modified file 'testsuite/libutouch-geis/Makefile.am'
--- testsuite/libutouch-geis/Makefile.am	2010-11-24 17:19:26 +0000
+++ testsuite/libutouch-geis/Makefile.am	2010-11-26 20:47:53 +0000
@@ -31,6 +31,7 @@
 check_PROGRAMS = $(test_targets)
 
 check_geis2_internals_SOURCES = \
+	check_attr.c \
 	check_error_reporting.c \
 	check_geis2_internals.c
 
@@ -45,7 +46,8 @@
 #
 check_geis2_internals_LDADD = \
 	$(top_builddir)/libutouch-geis/.libs/libutouch-geis.a \
-	$(CHECK_LIBS)
+	$(CHECK_LIBS) \
+	-lm
 
 MOSTLYCLEANFILES = \
 	geis2_internals.log \

=== added file 'testsuite/libutouch-geis/check_attr.c'
--- testsuite/libutouch-geis/check_attr.c	1970-01-01 00:00:00 +0000
+++ testsuite/libutouch-geis/check_attr.c	2010-11-26 20:47:53 +0000
@@ -0,0 +1,95 @@
+/**
+ * unit tests for the geis_attr_bag module
+ */
+#include <check.h>
+
+#include "libutouch-geis/geis_attr.h"
+
+
+/* fixtures */
+static GeisAttrBag g_attr_bag;
+static const GeisString test_attr_string = "zot!";
+
+/* fixture setup */
+static void
+construct_bag()
+{
+  g_attr_bag = geis_attr_bag_new(1);
+}
+
+/* fixture teardown */
+static void
+destroy_bag()
+{
+  geis_attr_bag_delete(g_attr_bag);
+}
+
+
+/* verify bag construction/destruction */
+START_TEST(construction)
+{
+  GeisAttrBag bag = geis_attr_bag_new(1);
+  fail_unless(bag != NULL, "failed to create attr bag");
+  geis_attr_bag_delete(bag);
+}
+END_TEST
+
+
+/* verify bag insertion */
+START_TEST(insertion)
+{
+  GeisAttr attr = geis_attr_new("test-attr",
+                                GEIS_ATTR_TYPE_STRING,
+                                (void*)test_attr_string);
+  geis_attr_bag_insert(g_attr_bag, attr);
+  fail_unless(geis_attr_bag_count(g_attr_bag) == 1,
+  	      "unexpected bag size after insertion");
+}
+END_TEST
+
+
+/* verify bag find operation (positive results) */
+START_TEST(find_success)
+{
+  GeisAttr dst_attr;
+  GeisAttr src_attr = geis_attr_new("test-attr",
+                                    GEIS_ATTR_TYPE_STRING,
+                                    (void*)test_attr_string);
+  geis_attr_bag_insert(g_attr_bag, src_attr);
+  dst_attr = geis_attr_bag_find(g_attr_bag, "test-attr");
+  fail_if(dst_attr == NULL, "expected instance not found");
+  fail_unless(0 == strcmp(geis_attr_value_to_string(dst_attr), test_attr_string),
+  	      "unexpected attribute value returned");
+}
+END_TEST
+
+
+/* verify bag find operation (negative results) */
+START_TEST(find_fail)
+{
+  GeisAttr attr = geis_attr_bag_find(g_attr_bag, "bogus");
+  fail_unless(attr == NULL, "unexpected instance found");
+}
+END_TEST
+
+
+/* boilerplate */
+Suite *
+make_attr_suite()
+{
+  Suite *s = suite_create("utouch-geis2-attrs");
+
+  TCase *create = tcase_create("attr-bag-creation");
+  tcase_add_test(create, construction);
+  suite_add_tcase(s, create);
+
+  TCase *usage = tcase_create("attr-bag-usage");
+  tcase_add_checked_fixture(usage, construct_bag, destroy_bag);
+  tcase_add_test(usage, insertion);
+  tcase_add_test(usage, find_success);
+  tcase_add_test(usage, find_fail);
+  suite_add_tcase(s, usage);
+
+  return s;
+}
+

=== modified file 'testsuite/libutouch-geis/check_error_reporting.c'
--- testsuite/libutouch-geis/check_error_reporting.c	2010-11-24 16:59:34 +0000
+++ testsuite/libutouch-geis/check_error_reporting.c	2010-11-26 20:47:53 +0000
@@ -28,7 +28,7 @@
 Suite *
 make_error_reporting_suite()
 {
-  Suite *s = suite_create("geis2-error-reporting");
+  Suite *s = suite_create("utouch-geis2-error-reporting");
 
   TCase *create = tcase_create("error-reporting");
   tcase_add_test(create, global_error_stack);

=== modified file 'testsuite/libutouch-geis/check_geis2_internals.c'
--- testsuite/libutouch-geis/check_geis2_internals.c	2010-11-24 16:59:34 +0000
+++ testsuite/libutouch-geis/check_geis2_internals.c	2010-11-26 20:47:53 +0000
@@ -4,6 +4,7 @@
 #include <check.h>
 
 extern Suite *make_error_reporting_suite();
+extern Suite *make_attr_suite();
 
 
 int
@@ -15,6 +16,7 @@
 
   SRunner *sr = srunner_create(s);
   srunner_add_suite(sr, make_error_reporting_suite());
+  srunner_add_suite(sr, make_attr_suite());
 
   srunner_set_log(sr, "geis2_internals.log");
   srunner_run_all(sr, CK_NORMAL);