6 files changed, 25 insertions, 31 deletions
diff --git a/test/media_device/media_device_acquire.cpp b/test/media_device/media_device_acquire.cpp
index d1e3d744..371e30e9 100644
--- a/test/media_device/media_device_acquire.cpp
+++ b/test/media_device/media_device_acquire.cpp
@@ -30,4 +30,4 @@ class MediaDeviceAcquire : public MediaDeviceTest
 	}
 };
 
-TEST_REGISTER(MediaDeviceAcquire);
+TEST_REGISTER(MediaDeviceAcquire)
diff --git a/test/media_device/media_device_link_test.cpp b/test/media_device/media_device_link_test.cpp
index fe7542bb..31528000 100644
--- a/test/media_device/media_device_link_test.cpp
+++ b/test/media_device/media_device_link_test.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2019, Google Inc.
  *
- * media_device_link_test.cpp - Tests link handling on VIMC media device
+ * Tests link handling on VIMC media device
  */
 
 #include <iostream>
@@ -56,7 +56,7 @@ class MediaDeviceLinkTest : public MediaDeviceTest
 
 		/*
 		 * Test if link can be consistently retrieved through the
-		 * different methods the media device offers.
+		 * different functions the media device offers.
 		 */
 		string linkName("'Debayer A':[1] -> 'Scaler':[0]'");
 		MediaLink *link = media_->link("Debayer A", 1, "Scaler", 0);
@@ -219,4 +219,4 @@ class MediaDeviceLinkTest : public MediaDeviceTest
 	}
 };
 
-TEST_REGISTER(MediaDeviceLinkTest);
+TEST_REGISTER(MediaDeviceLinkTest)
diff --git a/test/media_device/media_device_print_test.cpp b/test/media_device/media_device_print_test.cpp
index 5018906c..63aeed48 100644
--- a/test/media_device/media_device_print_test.cpp
+++ b/test/media_device/media_device_print_test.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2018-2019, Google Inc.
  *
- * media_device_print_test.cpp - Print out media devices
+ * Print out media devices
  */
 
 #include <iostream>
@@ -10,7 +10,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "media_device.h"
+#include "libcamera/internal/media_device.h"
 
 #include "test.h"
 
@@ -25,10 +25,6 @@ using namespace std;
  */
 class MediaDevicePrintTest : public Test
 {
-public:
-	MediaDevicePrintTest() {}
-	~MediaDevicePrintTest() {}
-
 protected:
 	int init() { return 0; }
 	int run();
@@ -151,4 +147,4 @@ int MediaDevicePrintTest::run()
 	return ret;
 }
 
-TEST_REGISTER(MediaDevicePrintTest);
+TEST_REGISTER(MediaDevicePrintTest)
diff --git a/test/media_device/media_device_test.cpp b/test/media_device/media_device_test.cpp
index 1397d123..3e41d0f0 100644
--- a/test/media_device/media_device_test.cpp
+++ b/test/media_device/media_device_test.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2019, Google Inc.
  *
- * media_device_test.cpp - libcamera media device test base class
+ * libcamera media device test base class
  */
 
 #include <iostream>
diff --git a/test/media_device/media_device_test.h b/test/media_device/media_device_test.h
index cdbd1484..5223b760 100644
--- a/test/media_device/media_device_test.h
+++ b/test/media_device/media_device_test.h
@@ -2,20 +2,18 @@
 /*
  * Copyright (C) 2019, Google Inc.
  *
- * media_device_test.h - libcamera media device test base class
+ * libcamera media device test base class
  */
-#ifndef __LIBCAMERA_MEDIADEVICE_TEST_H__
-#define __LIBCAMERA_MEDIADEVICE_TEST_H__
+
+#pragma once
 
 #include <memory>
 
-#include "device_enumerator.h"
-#include "media_device.h"
+#include "libcamera/internal/device_enumerator.h"
+#include "libcamera/internal/media_device.h"
 
 #include "test.h"
 
-using namespace libcamera;
-
 class MediaDeviceTest : public Test
 {
 public:
@@ -25,10 +23,8 @@ public:
 protected:
 	int init();
 
-	std::shared_ptr<MediaDevice> media_;
+	std::shared_ptr<libcamera::MediaDevice> media_;
 
 private:
-	std::unique_ptr<DeviceEnumerator> enumerator_;
+	std::unique_ptr<libcamera::DeviceEnumerator> enumerator_;
 };
-
-#endif /* __LIBCAMERA_MEDIADEVICE_TEST_H__ */
diff --git a/test/media_device/meson.build b/test/media_device/meson.build
index 6a0e4684..84966c97 100644
--- a/test/media_device/meson.build
+++ b/test/media_device/meson.build
@@ -1,22 +1,24 @@
+# SPDX-License-Identifier: CC0-1.0
+
 lib_mdev_test_sources = files([
     'media_device_test.cpp',
 ])
 
 media_device_tests = [
-    ['media_device_acquire',            'media_device_acquire.cpp'],
-    ['media_device_print_test',         'media_device_print_test.cpp'],
-    ['media_device_link_test',          'media_device_link_test.cpp'],
+    {'name': 'media_device_acquire', 'sources': ['media_device_acquire.cpp']},
+    {'name': 'media_device_print_test', 'sources': ['media_device_print_test.cpp']},
+    {'name': 'media_device_link_test', 'sources': ['media_device_link_test.cpp']},
 ]
 
 lib_mdev_test = static_library('lib_mdev_test', lib_mdev_test_sources,
-                               dependencies : libcamera_dep,
+                               dependencies : libcamera_private,
                                include_directories : test_includes_internal)
 
-foreach t : media_device_tests
-    exe = executable(t[0], t[1],
-                     dependencies : libcamera_dep,
+foreach test : media_device_tests
+    exe = executable(test['name'], test['sources'],
+                     dependencies : libcamera_private,
                      link_with : [test_libraries, lib_mdev_test],
                      include_directories : test_includes_internal)
 
-    test(t[0], exe, suite : 'media_device', is_parallel : false)
+    test(test['name'], exe, suite : 'media_device', is_parallel : false)
 endforeach