[tests] Use reference instead of pointer

strongly-typed · salkinium · commit cfb63f1e6b14 · 2021-01-10T20:42:06.000+01:00
The warning

modm/src/modm/communication/xpcc/response_callback.hpp:70:13: warning: cast between incompatible pointer to member types from 'void (TestingComponent2::*)(const xpcc::Header&amp;)' to 'xpcc::ResponseCallback::Function' {aka 'void (xpcc::Communicatable::*)(const xpcc::Header&amp;, const unsigned char*)'} [-Wcast-function-type]

was already present.
diff --git a/test/modm/communication/xpcc/dispatcher_test.cpp b/test/modm/communication/xpcc/dispatcher_test.cpp
@@ -26,8 +26,8 @@ DispatcherTest::setUp()
 	dispatcher = new xpcc::Dispatcher(backend, postman);
 	timeline = new Timeline();
 
-	component1 = new TestingComponent1(*dispatcher, timeline);
-	component2 = new TestingComponent2(*dispatcher, timeline);
+	component1 = new TestingComponent1(*dispatcher, *timeline);
+	component2 = new TestingComponent2(*dispatcher, *timeline);
 
 	postman->component1 = component1;
 	postman->component2 = component2;
diff --git a/test/modm/communication/xpcc/testing_component_1.cpp b/test/modm/communication/xpcc/testing_component_1.cpp
@@ -14,7 +14,7 @@
 #include "testing_component_1.hpp"
 
 TestingComponent1::TestingComponent1(xpcc::Dispatcher &communication,
-		Timeline *timeline) :
+		Timeline &timeline) :
 	xpcc::AbstractComponent(1, communication),
 	timeline(timeline),
 	isDelayedResponseActive(false)
@@ -34,22 +34,22 @@ TestingComponent1::update()
 void
 TestingComponent1::actionNoParameter(const xpcc::ResponseHandle& handle)
 {
-	timeline->events.append(
+	timeline.events.append(
 			Timeline::Event(Timeline::Type::Action, 1, 0x10, handle.getDestination()));
 }
 
 void
 TestingComponent1::actionUint16(const xpcc::ResponseHandle& handle,
 		const uint16_t *parameter)
 {
-	timeline->events.append(
+	timeline.events.append(
 			Timeline::Event(Timeline::Type::Action, 1, 0x11, handle.getDestination(), parameter));
 }
 
 void
 TestingComponent1::actionDirectResponse(const xpcc::ResponseHandle& handle)
 {
-	timeline->events.append(
+	timeline.events.append(
 			Timeline::Event(Timeline::Type::Action, 1, 0x12, handle.getDestination()));
 
 	this->sendResponse(handle);
@@ -58,7 +58,7 @@ TestingComponent1::actionDirectResponse(const xpcc::ResponseHandle& handle)
 void
 TestingComponent1::actionDelayedResponse(const xpcc::ResponseHandle& handle)
 {
-	timeline->events.append(
+	timeline.events.append(
 			Timeline::Event(Timeline::Type::Action, 1, 0x13, handle.getDestination()));
 
 	this->delayedResponseHandle = handle;
@@ -69,7 +69,7 @@ void
 TestingComponent1::actionUint16CallAction(const xpcc::ResponseHandle& handle,
 			const uint16_t *parameter)
 {
-	timeline->events.append(
+	timeline.events.append(
 			Timeline::Event(Timeline::Type::Action, 1, 0x14, handle.getDestination(), parameter));
 
 	this->callAction(2, 0x11, *parameter);
@@ -79,14 +79,14 @@ TestingComponent1::actionUint16CallAction(const xpcc::ResponseHandle& handle,
 void
 TestingComponent1::eventNoParameter(const xpcc::Header& header)
 {
-	timeline->events.append(
+	timeline.events.append(
 			Timeline::Event(Timeline::Type::Event, 2, 0x20, header.source));
 }
 
 void
 TestingComponent1::eventUint32(const xpcc::Header& header,
 		const uint32_t *parameter)
 {
-	timeline->events.append(
+	timeline.events.append(
 			Timeline::Event(Timeline::Type::Event, 1, 0x21, header.source, parameter));
 }
diff --git a/test/modm/communication/xpcc/testing_component_1.hpp b/test/modm/communication/xpcc/testing_component_1.hpp
@@ -23,7 +23,7 @@
 class TestingComponent1 : public xpcc::AbstractComponent
 {
 public:
-	TestingComponent1(xpcc::Dispatcher &communication, Timeline *timeline);
+	TestingComponent1(xpcc::Dispatcher &communication, Timeline &timeline);
 
 	virtual ~TestingComponent1()
 		{};
@@ -71,7 +71,7 @@ class TestingComponent1 : public xpcc::AbstractComponent
 	eventUint32(const xpcc::Header& header, const uint32_t *parameter);
 
 private:
-	Timeline *timeline;
+	Timeline &timeline;
 
 	bool isDelayedResponseActive;
 	xpcc::ResponseHandle delayedResponseHandle;
diff --git a/test/modm/communication/xpcc/testing_component_2.cpp b/test/modm/communication/xpcc/testing_component_2.cpp
@@ -14,7 +14,7 @@
 #include "testing_component_2.hpp"
 
 TestingComponent2::TestingComponent2(xpcc::Dispatcher &communication,
-		Timeline *timeline) :
+		Timeline &timeline) :
 	xpcc::AbstractComponent(2, communication),
 	timeline(timeline)
 {
@@ -30,15 +30,15 @@ TestingComponent2::update()
 void
 TestingComponent2::actionNoParameter(const xpcc::ResponseHandle& handle)
 {
-	timeline->events.append(
+	timeline.events.append(
 			Timeline::Event(Timeline::Type::Action, 2, 0x10, handle.getDestination()));
 }
 
 void
 TestingComponent2::actionUint16(const xpcc::ResponseHandle& handle,
 		const uint16_t *parameter)
 {
-	timeline->events.append(
+	timeline.events.append(
 			Timeline::Event(Timeline::Type::Action, 2, 0x11, handle.getDestination(),
 					parameter));
 }
@@ -47,7 +47,7 @@ TestingComponent2::actionUint16(const xpcc::ResponseHandle& handle,
 void
 TestingComponent2::eventNoParameter(const xpcc::Header& header)
 {
-	timeline->events.append(
+	timeline.events.append(
 			Timeline::Event(Timeline::Type::Event, 2, 0x10, header.source));
 }
 
@@ -56,22 +56,22 @@ TestingComponent2::eventNoParameter(const xpcc::Header& header)
 void
 TestingComponent2::responseNoParameter(const xpcc::Header& header)
 {
-	timeline->events.append(
+	timeline.events.append(
 			Timeline::Event(Timeline::Type::Response, 2, 0x30, header.source));
 }
 
 void
 TestingComponent2::responseUint16(const xpcc::Header& header,
 		const uint16_t *parameter)
 {
-	timeline->events.append(
+	timeline.events.append(
 			Timeline::Event(Timeline::Type::Response, 2, 0x31, header.source, parameter));
 }
 
 void
 TestingComponent2::responseCallAction(const xpcc::Header& header)
 {
-	timeline->events.append(
+	timeline.events.append(
 			Timeline::Event(Timeline::Type::Response, 2, 0x32, header.source));
 
 	xpcc::ResponseCallback callback(this, &TestingComponent2::responseNoParameter);
diff --git a/test/modm/communication/xpcc/testing_component_2.hpp b/test/modm/communication/xpcc/testing_component_2.hpp
@@ -23,7 +23,7 @@
 class TestingComponent2 : public xpcc::AbstractComponent
 {
 public:
-	TestingComponent2(xpcc::Dispatcher &communication, Timeline *timeline);
+	TestingComponent2(xpcc::Dispatcher &communication, Timeline &timeline);
 
 	virtual ~TestingComponent2()
 		{};
@@ -62,7 +62,7 @@ class TestingComponent2 : public xpcc::AbstractComponent
 	responseCallAction(const xpcc::Header& header);
 
 private:
-	Timeline *timeline;
+	Timeline &timeline;
 };
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`#include "testing_component_1.hpp"`
`15`	`15`
`16`	`16`	`TestingComponent1::TestingComponent1(xpcc::Dispatcher &communication,`
`17`		`- Timeline *timeline) :`
	`17`	`+ Timeline &timeline) :`
`18`	`18`	`xpcc::AbstractComponent(1, communication),`
`19`	`19`	`timeline(timeline),`
`20`	`20`	`isDelayedResponseActive(false)`
`@@ -34,22 +34,22 @@ TestingComponent1::update()`
`34`	`34`	`void`
`35`	`35`	`TestingComponent1::actionNoParameter(const xpcc::ResponseHandle& handle)`
`36`	`36`	`{`
`37`		`- timeline->events.append(`
	`37`	`+ timeline.events.append(`
`38`	`38`	`Timeline::Event(Timeline::Type::Action, 1, 0x10, handle.getDestination()));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`void`
`42`	`42`	`TestingComponent1::actionUint16(const xpcc::ResponseHandle& handle,`
`43`	`43`	`const uint16_t *parameter)`
`44`	`44`	`{`
`45`		`- timeline->events.append(`
	`45`	`+ timeline.events.append(`
`46`	`46`	`Timeline::Event(Timeline::Type::Action, 1, 0x11, handle.getDestination(), parameter));`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`void`
`50`	`50`	`TestingComponent1::actionDirectResponse(const xpcc::ResponseHandle& handle)`
`51`	`51`	`{`
`52`		`- timeline->events.append(`
	`52`	`+ timeline.events.append(`
`53`	`53`	`Timeline::Event(Timeline::Type::Action, 1, 0x12, handle.getDestination()));`
`54`	`54`
`55`	`55`	`this->sendResponse(handle);`
`@@ -58,7 +58,7 @@ TestingComponent1::actionDirectResponse(const xpcc::ResponseHandle& handle)`
`58`	`58`	`void`
`59`	`59`	`TestingComponent1::actionDelayedResponse(const xpcc::ResponseHandle& handle)`
`60`	`60`	`{`
`61`		`- timeline->events.append(`
	`61`	`+ timeline.events.append(`
`62`	`62`	`Timeline::Event(Timeline::Type::Action, 1, 0x13, handle.getDestination()));`
`63`	`63`
`64`	`64`	`this->delayedResponseHandle = handle;`
`@@ -69,7 +69,7 @@ void`
`69`	`69`	`TestingComponent1::actionUint16CallAction(const xpcc::ResponseHandle& handle,`
`70`	`70`	`const uint16_t *parameter)`
`71`	`71`	`{`
`72`		`- timeline->events.append(`
	`72`	`+ timeline.events.append(`
`73`	`73`	`Timeline::Event(Timeline::Type::Action, 1, 0x14, handle.getDestination(), parameter));`
`74`	`74`
`75`	`75`	`this->callAction(2, 0x11, *parameter);`
`@@ -79,14 +79,14 @@ TestingComponent1::actionUint16CallAction(const xpcc::ResponseHandle& handle,`
`79`	`79`	`void`
`80`	`80`	`TestingComponent1::eventNoParameter(const xpcc::Header& header)`
`81`	`81`	`{`
`82`		`- timeline->events.append(`
	`82`	`+ timeline.events.append(`
`83`	`83`	`Timeline::Event(Timeline::Type::Event, 2, 0x20, header.source));`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`void`
`87`	`87`	`TestingComponent1::eventUint32(const xpcc::Header& header,`
`88`	`88`	`const uint32_t *parameter)`
`89`	`89`	`{`
`90`		`- timeline->events.append(`
	`90`	`+ timeline.events.append(`
`91`	`91`	`Timeline::Event(Timeline::Type::Event, 1, 0x21, header.source, parameter));`
`92`	`92`	`}`