summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2014-08-13 14:16:17 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2014-08-13 14:16:17 +0200
commit972bc48715450e61ae79c705b95ddabcc2b1bbc9 (patch)
tree4e26ee2930777744ef5a647f68a2b5aa117ff488 /test
parent04767fda6abe4bc71bbf061122ad723cc8addcc1 (diff)
downloadlibuca-972bc48715450e61ae79c705b95ddabcc2b1bbc9.tar.gz
libuca-972bc48715450e61ae79c705b95ddabcc2b1bbc9.tar.bz2
libuca-972bc48715450e61ae79c705b95ddabcc2b1bbc9.tar.xz
libuca-972bc48715450e61ae79c705b95ddabcc2b1bbc9.zip
Fix re-setting a unit on the same camera class
Diffstat (limited to 'test')
-rw-r--r--test/test-mock.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/test/test-mock.c b/test/test-mock.c
index de1e18d..d1dcf3a 100644
--- a/test/test-mock.c
+++ b/test/test-mock.c
@@ -224,11 +224,7 @@ test_signal (Fixture *fixture, gconstpointer data)
static void
test_overwriting_units (Fixture *fixture, gconstpointer data)
{
- UcaUnit unit;
-
- uca_camera_register_unit (fixture->camera, "frames-per-second", UCA_UNIT_PIXEL);
- unit = uca_camera_get_unit (fixture->camera, "frames-per-second");
- g_assert (unit != UCA_UNIT_PIXEL);
+ uca_camera_register_unit (fixture->camera, "sensor-width", UCA_UNIT_PIXEL);
}
int main (int argc, char *argv[])
@@ -249,6 +245,7 @@ int main (int argc, char *argv[])
g_test_add ("/properties/binnings", Fixture, NULL, fixture_setup, test_binnings_properties, fixture_teardown);
g_test_add ("/properties/frames-per-second", Fixture, NULL, fixture_setup, test_fps_property, fixture_teardown);
g_test_add ("/properties/units", Fixture, NULL, fixture_setup, test_property_units, fixture_teardown);
+ g_test_add ("/properties/units/overwrite", Fixture, NULL, fixture_setup, test_overwriting_units, fixture_teardown);
g_test_add ("/signal", Fixture, NULL, fixture_setup, test_signal, fixture_teardown);
return g_test_run ();