Skip to content
Snippets Groups Projects
Commit 78895d0a authored by Martin Christoph Hierholzer's avatar Martin Christoph Hierholzer
Browse files

fixed a remaining NULL pointer passed instead of a pointer to EqFct

parent 56686dfb
No related branches found
No related tags found
No related merge requests found
...@@ -28,6 +28,8 @@ typedef boost::mpl::list<int32_t, uint32_t, ...@@ -28,6 +28,8 @@ typedef boost::mpl::list<int32_t, uint32_t,
int8_t, uint8_t, int8_t, uint8_t,
float, double> simple_test_types; float, double> simple_test_types;
EqFct myEqFct("MY_EQ_FCT");
// class which exposes the protected member functions for testing // class which exposes the protected member functions for testing
class TestableDoocsPVFactory: public DoocsPVFactory{ class TestableDoocsPVFactory: public DoocsPVFactory{
public: public:
...@@ -83,7 +85,6 @@ BOOST_AUTO_TEST_CASE( testCreateScalars ) { ...@@ -83,7 +85,6 @@ BOOST_AUTO_TEST_CASE( testCreateScalars ) {
new ControlSystemSynchronizationUtility(csManager)); new ControlSystemSynchronizationUtility(csManager));
EqFct myEqFct("MY_EQ_FCT");
DoocsPVFactory factory(&myEqFct, syncUtil); DoocsPVFactory factory(&myEqFct, syncUtil);
// We insert check points with integers so we know where the algorithm kicks out in case of an error. // We insert check points with integers so we know where the algorithm kicks out in case of an error.
...@@ -134,7 +135,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( testCreateArray, T, simple_test_types ){ ...@@ -134,7 +135,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( testCreateArray, T, simple_test_types ){
shared_ptr<ControlSystemSynchronizationUtility> syncUtil( shared_ptr<ControlSystemSynchronizationUtility> syncUtil(
new ControlSystemSynchronizationUtility(csManager)); new ControlSystemSynchronizationUtility(csManager));
EqFct myEqFct("MY_EQ_FCT");
DoocsPVFactory factory(&myEqFct, syncUtil); DoocsPVFactory factory(&myEqFct, syncUtil);
// have the variable created and check that it is the right type // have the variable created and check that it is the right type
...@@ -164,7 +164,7 @@ BOOST_AUTO_TEST_CASE( testErrorHandling ){ ...@@ -164,7 +164,7 @@ BOOST_AUTO_TEST_CASE( testErrorHandling ){
shared_ptr<ControlSystemSynchronizationUtility> syncUtil( shared_ptr<ControlSystemSynchronizationUtility> syncUtil(
new ControlSystemSynchronizationUtility(csManager)); new ControlSystemSynchronizationUtility(csManager));
TestableDoocsPVFactory testableFactory(NULL /*eqFct*/, syncUtil); TestableDoocsPVFactory testableFactory(&myEqFct, syncUtil);
ProcessVariable::SharedPtr processScalar = ProcessVariable::SharedPtr processScalar =
csManager->getProcessArray<int64_t>("toDeviceInt"); csManager->getProcessArray<int64_t>("toDeviceInt");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment