Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
47e94c7f
Commit
47e94c7f
authored
Jan 18, 2018
by
Karl Palmen
Browse files
Fix a test and some more warnings re #12827
Signed-off-by:
Karl Palmen
<
karl.palmen@stfc.ac.uk
>
parent
7de342f2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Framework/Geometry/test/CSGObjectTest.h
View file @
47e94c7f
...
...
@@ -392,7 +392,7 @@ public:
void
checkTrackIntercept
(
Track
&
track
,
const
std
::
vector
<
Link
>
&
expectedResults
)
{
in
t
index
=
0
;
size_
t
index
=
0
;
for
(
Track
::
LType
::
const_iterator
it
=
track
.
cbegin
();
it
!=
track
.
cend
();
++
it
)
{
if
(
index
<
expectedResults
.
size
())
{
...
...
@@ -406,7 +406,7 @@ public:
}
++
index
;
}
TS_ASSERT_EQUALS
(
index
,
static_cast
<
int
>
(
expectedResults
.
size
())
)
;
TS_ASSERT_EQUALS
(
index
,
expectedResults
.
size
());
}
void
checkTrackIntercept
(
IObject_sptr
obj
,
Track
&
track
,
...
...
Framework/Geometry/test/MeshObjectTest.h
View file @
47e94c7f
...
...
@@ -339,7 +339,7 @@ public:
void
checkTrackIntercept
(
Track
&
track
,
const
std
::
vector
<
Link
>
&
expectedResults
)
{
in
t
index
=
0
;
size_
t
index
=
0
;
for
(
Track
::
LType
::
const_iterator
it
=
track
.
cbegin
();
it
!=
track
.
cend
();
++
it
)
{
if
(
index
<
expectedResults
.
size
())
{
...
...
@@ -353,7 +353,7 @@ public:
}
++
index
;
}
TS_ASSERT_EQUALS
(
index
,
static_cast
<
int
>
(
expectedResults
.
size
())
)
;
TS_ASSERT_EQUALS
(
index
,
expectedResults
.
size
());
}
void
checkTrackIntercept
(
IObject_sptr
obj
,
Track
&
track
,
...
...
@@ -706,6 +706,7 @@ public:
void
testFindPointInOctahedron
()
{
auto
geom_obj
=
createOctahedron
();
Kernel
::
V3D
pt
;
TS_ASSERT_EQUALS
(
geom_obj
->
getPointInObject
(
pt
),
1
);
TS_ASSERT_LESS_THAN_EQUALS
(
abs
(
pt
.
X
())
+
abs
(
pt
.
Y
())
+
abs
(
pt
.
Z
()),
1.0
)
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment