Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
ControlSystemAdapter-DoocsAdapter
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ChimeraTK Mirror
ControlSystemAdapter-DoocsAdapter
Commits
78895d0a
Commit
78895d0a
authored
7 years ago
by
Martin Christoph Hierholzer
Browse files
Options
Downloads
Patches
Plain Diff
fixed a remaining NULL pointer passed instead of a pointer to EqFct
parent
56686dfb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/src/testDoocsPVFactory.cpp
+3
-3
3 additions, 3 deletions
tests/src/testDoocsPVFactory.cpp
with
3 additions
and
3 deletions
tests/src/testDoocsPVFactory.cpp
+
3
−
3
View file @
78895d0a
...
...
@@ -28,6 +28,8 @@ typedef boost::mpl::list<int32_t, uint32_t,
int8_t
,
uint8_t
,
float
,
double
>
simple_test_types
;
EqFct
myEqFct
(
"MY_EQ_FCT"
);
// class which exposes the protected member functions for testing
class
TestableDoocsPVFactory
:
public
DoocsPVFactory
{
public:
...
...
@@ -83,7 +85,6 @@ BOOST_AUTO_TEST_CASE( testCreateScalars ) {
new
ControlSystemSynchronizationUtility
(
csManager
));
EqFct
myEqFct
(
"MY_EQ_FCT"
);
DoocsPVFactory
factory
(
&
myEqFct
,
syncUtil
);
// 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 ){
shared_ptr
<
ControlSystemSynchronizationUtility
>
syncUtil
(
new
ControlSystemSynchronizationUtility
(
csManager
));
EqFct
myEqFct
(
"MY_EQ_FCT"
);
DoocsPVFactory
factory
(
&
myEqFct
,
syncUtil
);
// have the variable created and check that it is the right type
...
...
@@ -164,7 +164,7 @@ BOOST_AUTO_TEST_CASE( testErrorHandling ){
shared_ptr
<
ControlSystemSynchronizationUtility
>
syncUtil
(
new
ControlSystemSynchronizationUtility
(
csManager
));
TestableDoocsPVFactory
testableFactory
(
NULL
/*e
qFct
*/
,
syncUtil
);
TestableDoocsPVFactory
testableFactory
(
&
myE
qFct
,
syncUtil
);
ProcessVariable
::
SharedPtr
processScalar
=
csManager
->
getProcessArray
<
int64_t
>
(
"toDeviceInt"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment