From 42e3c64fa57039d7673c61f909b5fd40a437bdfd Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Thu, 19 Apr 2012 16:45:11 +0200
Subject: Export base properties and string array

The benefits are two-fold: Camera implementations "know" which base properties
exist without looking into the implementation source. Moreover, they can re-use
the property strings rather than stating them over and over again. These change
should reduce potential c&p errors.
---
 test/CMakeLists.txt | 14 ++++++++------
 test/test-all.c     |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7d438b6..7380179 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -43,12 +43,14 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../src/cameras
     )
 
-add_executable(test-mock test-mock.c)
-target_link_libraries(test-mock
-    uca-gobject 
-    ${GLIB2_LIBRARIES}
-    ${GOBJECT2_LIBRARIES}
-    )
+if (HAVE_MOCK_CAMERA)
+    add_executable(test-mock test-mock.c)
+    target_link_libraries(test-mock
+        uca-gobject 
+        ${GLIB2_LIBRARIES}
+        ${GOBJECT2_LIBRARIES}
+        )
+endif()
 
 add_executable(test-all test-all.c)
 target_link_libraries(test-all
diff --git a/test/test-all.c b/test/test-all.c
index 941c0cd..37af97d 100644
--- a/test/test-all.c
+++ b/test/test-all.c
@@ -75,7 +75,7 @@ static void test_recording_async(Fixture *fixture, gconstpointer data)
 
     gfloat max_frame_rate = 1.0f;
     g_object_get(G_OBJECT(camera),
-            "max-frame-rate", &max_frame_rate,
+            "sensor-max-frame-rate", &max_frame_rate,
             NULL);
     g_assert(max_frame_rate != 0.0f);
 
-- 
cgit v1.2.3