[libcamera-devel,5/6] test: Add Message test case

Message ID 20190710191708.13049-5-laurent.pinchart@ideasonboard.com
State Accepted
Headers show
Series
  • [libcamera-devel,1/6] libcamera: Add thread support
Related show

Commit Message

Laurent Pinchart July 10, 2019, 7:17 p.m. UTC
The Message class test creates a receiver inheriting from Object, moves
it to a different thread, sends a message to the receiver and verifies
that the message is delivered in the correct thread.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 test/meson.build |  1 +
 test/message.cpp | 88 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 test/message.cpp

Comments

Niklas Söderlund July 11, 2019, 5:48 a.m. UTC | #1
Hi Laurent,

Thanks for your test.

On 2019-07-10 22:17:07 +0300, Laurent Pinchart wrote:
> The Message class test creates a receiver inheriting from Object, moves
> it to a different thread, sends a message to the receiver and verifies
> that the message is delivered in the correct thread.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  test/meson.build |  1 +
>  test/message.cpp | 88 ++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 89 insertions(+)
>  create mode 100644 test/message.cpp
> 
> diff --git a/test/meson.build b/test/meson.build
> index bd0e0d98f0e7..1f87319aeb65 100644
> --- a/test/meson.build
> +++ b/test/meson.build
> @@ -21,6 +21,7 @@ public_tests = [
>  
>  internal_tests = [
>      ['camera-sensor',                   'camera-sensor.cpp'],
> +    ['message',                         'message.cpp'],
>      ['threads',                         'threads.cpp'],
>  ]
>  
> diff --git a/test/message.cpp b/test/message.cpp
> new file mode 100644
> index 000000000000..de98da3e8754
> --- /dev/null
> +++ b/test/message.cpp
> @@ -0,0 +1,88 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/*
> + * Copyright (C) 2019, Google Inc.
> + *
> + * message.cpp - Messages test
> + */
> +
> +#include <chrono>
> +#include <iostream>
> +#include <thread>
> +
> +#include "message.h"
> +#include "thread.h"
> +#include "test.h"
> +#include "utils.h"
> +
> +using namespace std;
> +using namespace libcamera;
> +
> +class MessageReceiver : public Object
> +{
> +public:
> +	enum Status {
> +		NoMessage,
> +		InvalidThread,
> +		MessageReceived,
> +	};
> +
> +	MessageReceiver()
> +		: status_(NoMessage)
> +	{
> +	}
> +
> +	Status status() const { return status_; }
> +	void reset() { status_ = NoMessage; }
> +
> +protected:
> +	void message(Message *msg)
> +	{
> +		if (thread() != Thread::current())
> +			status_ = InvalidThread;
> +		else
> +			status_ = MessageReceived;
> +	}
> +
> +private:
> +	Status status_;
> +};
> +
> +class MessageTest : public Test
> +{
> +protected:
> +	int run()
> +	{
> +		MessageReceiver receiver;
> +		receiver.moveToThread(&thread_);
> +
> +		thread_.start();
> +
> +		receiver.postMessage(utils::make_unique<Message>(Message::None));
> +
> +		this_thread::sleep_for(chrono::milliseconds(100));
> +
> +		switch (receiver.status()) {
> +		case MessageReceiver::NoMessage:
> +			cout << "No message received" << endl;
> +			return TestFail;
> +		case MessageReceiver::InvalidThread:
> +			cout << "Message received in incorrect thread" << endl;
> +			return TestFail;
> +		default:
> +			break;
> +		}
> +
> +		return TestPass;
> +	}
> +
> +	void cleanup()
> +	{
> +		thread_.exit(0);
> +		thread_.wait();
> +	}
> +
> +private:
> +	Thread thread_;
> +};
> +
> +TEST_REGISTER(MessageTest)
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch

diff --git a/test/meson.build b/test/meson.build
index bd0e0d98f0e7..1f87319aeb65 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -21,6 +21,7 @@  public_tests = [
 
 internal_tests = [
     ['camera-sensor',                   'camera-sensor.cpp'],
+    ['message',                         'message.cpp'],
     ['threads',                         'threads.cpp'],
 ]
 
diff --git a/test/message.cpp b/test/message.cpp
new file mode 100644
index 000000000000..de98da3e8754
--- /dev/null
+++ b/test/message.cpp
@@ -0,0 +1,88 @@ 
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2019, Google Inc.
+ *
+ * message.cpp - Messages test
+ */
+
+#include <chrono>
+#include <iostream>
+#include <thread>
+
+#include "message.h"
+#include "thread.h"
+#include "test.h"
+#include "utils.h"
+
+using namespace std;
+using namespace libcamera;
+
+class MessageReceiver : public Object
+{
+public:
+	enum Status {
+		NoMessage,
+		InvalidThread,
+		MessageReceived,
+	};
+
+	MessageReceiver()
+		: status_(NoMessage)
+	{
+	}
+
+	Status status() const { return status_; }
+	void reset() { status_ = NoMessage; }
+
+protected:
+	void message(Message *msg)
+	{
+		if (thread() != Thread::current())
+			status_ = InvalidThread;
+		else
+			status_ = MessageReceived;
+	}
+
+private:
+	Status status_;
+};
+
+class MessageTest : public Test
+{
+protected:
+	int run()
+	{
+		MessageReceiver receiver;
+		receiver.moveToThread(&thread_);
+
+		thread_.start();
+
+		receiver.postMessage(utils::make_unique<Message>(Message::None));
+
+		this_thread::sleep_for(chrono::milliseconds(100));
+
+		switch (receiver.status()) {
+		case MessageReceiver::NoMessage:
+			cout << "No message received" << endl;
+			return TestFail;
+		case MessageReceiver::InvalidThread:
+			cout << "Message received in incorrect thread" << endl;
+			return TestFail;
+		default:
+			break;
+		}
+
+		return TestPass;
+	}
+
+	void cleanup()
+	{
+		thread_.exit(0);
+		thread_.wait();
+	}
+
+private:
+	Thread thread_;
+};
+
+TEST_REGISTER(MessageTest)