Merge remote branch 'origin/master' into dexela

Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
	src/uca-camera.c

1 files changed, 0 insertions, 214 deletions

diff --git a/test/test-all.c b/test/test-all.c
deleted file mode 100644
index 9526d4f..0000000
--- a/test/test-all.c
+++ /dev/null
@@ -1,214 +0,0 @@
-
-#include <glib.h>
-#include "uca-camera.h"
-#include "cameras/uca-mock-camera.h"
-
-typedef struct {
-    UcaCamera *camera;
-} Fixture;
-
-typedef void (*UcaFixtureFunc) (Fixture *fixture, gconstpointer data);
-
-static void fixture_setup(Fixture *fixture, gconstpointer data)
-{
-    const gchar *type = (gchar *) data;
-    GError *error = NULL;
-    fixture->camera = uca_camera_new(type, &error);
-    g_assert_no_error(error);
-    g_assert(fixture->camera);
-}
-
-static void fixture_teardown(Fixture *fixture, gconstpointer data)
-{
-    g_object_unref(fixture->camera);
-}
-
-static void on_property_change(gpointer instance, GParamSpec *pspec, gpointer user_data)
-{
-    gboolean *success = (gboolean *) user_data;
-    *success = TRUE;
-}
-
-static void test_factory()
-{
-    GError *error = NULL;
-    UcaCamera *camera = uca_camera_new("fox994m3a0yxmy", &error);
-    g_assert_error(error, UCA_CAMERA_ERROR, UCA_CAMERA_ERROR_NOT_FOUND);
-    g_assert(camera == NULL);
-}
-
-static void test_recording(Fixture *fixture, gconstpointer data)
-{
-    GError *error = NULL;
-    UcaCamera *camera = UCA_CAMERA(fixture->camera);
-
-    uca_camera_stop_recording(camera, &error);
-    g_assert_error(error, UCA_CAMERA_ERROR, UCA_CAMERA_ERROR_NOT_RECORDING);
-    g_error_free(error);
-
-    error = NULL;
-    gboolean success = FALSE;
-    g_signal_connect(G_OBJECT(camera), "notify::is-recording", 
-            (GCallback) on_property_change, &success);
-    uca_camera_start_recording(camera, &error);
-    g_assert_no_error(error);
-    g_assert(success == TRUE);
-
-    success = FALSE;
-    uca_camera_stop_recording(camera, &error);
-    g_assert_no_error(error);
-    g_assert(success == TRUE);
-}
-
-static void grab_func(gpointer data, gpointer user_data)
-{
-    gboolean *success = (gboolean *) user_data;
-    *success = TRUE;
-}
-
-static void test_recording_async(Fixture *fixture, gconstpointer data)
-{
-    UcaCamera *camera = UCA_CAMERA(fixture->camera);
-
-    gboolean success = FALSE;
-    uca_camera_set_grab_func(camera, grab_func, &success);
-
-    gfloat max_frame_rate = 1.0f;
-    g_object_get(G_OBJECT(camera),
-            "sensor-max-frame-rate", &max_frame_rate,
-            NULL);
-    g_assert(max_frame_rate != 0.0f);
-
-    g_object_set(G_OBJECT(camera),
-            "transfer-asynchronously", TRUE,
-            NULL);
-
-    GError *error = NULL;
-    uca_camera_start_recording(camera, &error);
-    g_assert_no_error(error);
-
-    const gulong sleep_time = G_USEC_PER_SEC / ((gulong) (max_frame_rate / 2.0f));
-    g_usleep(sleep_time);
-
-    uca_camera_stop_recording(camera, &error);
-    g_assert_no_error(error);
-    g_assert(success == TRUE);
-}
-
-static void test_recording_grab(Fixture *fixture, gconstpointer data)
-{
-    UcaCamera *camera = UCA_CAMERA(fixture->camera);
-    GError *error = NULL;
-    gpointer frame = NULL;
-
-    uca_camera_start_recording(camera, &error);
-    g_assert_no_error(error);
-
-    uca_camera_grab(camera, &frame, &error);
-    g_assert_no_error(error);
-    g_assert(frame != NULL);
-
-    uca_camera_stop_recording(camera, &error);
-    g_assert_no_error(error);
-}
-
-static void test_recording_property(Fixture *fixture, gconstpointer data)
-{
-    UcaCamera *camera = UCA_CAMERA(fixture->camera);
-
-    gboolean is_recording = FALSE;
-    uca_camera_start_recording(camera, NULL);
-    g_object_get(G_OBJECT(camera),
-            "is-recording", &is_recording,
-            NULL);
-    g_assert(is_recording == TRUE);
-
-    uca_camera_stop_recording(camera, NULL);
-    g_object_get(G_OBJECT(camera),
-            "is-recording", &is_recording,
-            NULL);
-    g_assert(is_recording == FALSE);
-}
-
-static void test_base_properties(Fixture *fixture, gconstpointer data)
-{
-    UcaCamera *camera = UCA_CAMERA(fixture->camera);
-    guint n_properties = 0;
-    GParamSpec **properties = g_object_class_list_properties(G_OBJECT_GET_CLASS(camera), &n_properties);
-    GValue val = {0};
-
-    for (guint i = 0; i < n_properties; i++) {
-        g_value_init(&val, properties[i]->value_type);
-        g_object_get_property(G_OBJECT(camera), properties[i]->name, &val);
-        g_value_unset(&val);
-    }
-
-    g_free(properties);
-}
-
-static void test_binnings_properties(Fixture *fixture, gconstpointer data)
-{
-    UcaCamera *camera = UCA_CAMERA(fixture->camera);
-
-    GValueArray *array = NULL;
-    g_object_get(G_OBJECT(camera),
-            "sensor-horizontal-binnings", &array,
-            NULL);
-
-    GValue *value = g_value_array_get_nth(array, 0);
-    g_assert(value != NULL);
-    g_assert(g_value_get_uint(value) == 1);
-}
-
-
-int main(int argc, char *argv[])
-{
-    g_type_init();
-    g_test_init(&argc, &argv, NULL);
-    g_test_bug_base("http://ufo.kit.edu/ufo/ticket");
-
-    g_test_add_func("/factory", test_factory);
-
-    gchar **types = NULL;
-    types = argc > 1 ? argv + 1 : uca_camera_get_types();
-
-    /*
-     * paths and test_funcs MUST correspond!
-     */
-    static const gchar *paths[] = {
-        "/recording",
-        "/recording/grab",
-        "/recording/asynchronous",
-        "/properties/base",
-        "/properties/recording",
-        "/properties/binnings",
-        NULL
-    };
-
-    static UcaFixtureFunc test_funcs[] = {
-        test_recording,
-        test_recording_grab,
-        test_recording_async,
-        test_base_properties,
-        test_recording_property,
-        test_binnings_properties,
-    };
-
-    for (guint i = 0; i < g_strv_length(types); i++) {
-        guint j = 0;
-
-        while (paths[j] != NULL) {
-            gchar *new_path = g_strdup_printf("/%s%s", types[i], paths[j]);
-            g_test_add(new_path, Fixture, types[i], fixture_setup, test_funcs[j], fixture_teardown);
-            g_free(new_path);
-            j++;
-        }
-    }
-
-    gint result = g_test_run();
-
-    if (argc == 1)
-        g_strfreev(types);
-
-    return result;
-}