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
69f314f1
Commit
69f314f1
authored
Feb 18, 2019
by
Antti Soininen
Browse files
Move MockRNG from several tests to its own file. Re #24636
parent
bd792f30
Changes
5
Hide whitespace changes
Inline
Side-by-side
Framework/Geometry/test/CSGObjectTest.h
View file @
69f314f1
...
...
@@ -14,57 +14,28 @@
#include
"MantidGeometry/Objects/ShapeFactory.h"
#include
"MantidGeometry/Objects/Track.h"
#include
"MantidGeometry/Rendering/GeometryHandler.h"
#include
"MantidGeometry/Rendering/ShapeInfo.h"
#include
"MantidGeometry/Surfaces/Cylinder.h"
#include
"MantidGeometry/Surfaces/Plane.h"
#include
"MantidGeometry/Surfaces/Sphere.h"
#include
"MantidGeometry/Surfaces/SurfaceFactory.h"
#include
"MantidKernel/Material.h"
#include
"MantidKernel/MersenneTwister.h"
#include
"MantidKernel/WarningSuppressions.h"
#include
"MantidKernel/make_unique.h"
#include
"MantidTestHelpers/ComponentCreationHelper.h"
#include
"MockRNG.h"
#include
<algorithm>
#include
<cmath>
#include
<ctime>
#include
<cxxtest/TestSuite.h>
#include
<ostream>
#include
<vector>
#include
"boost/make_shared.hpp"
#include
"boost/shared_ptr.hpp"
#include
<Poco/DOM/AutoPtr.h>
#include
<Poco/DOM/Document.h>
#include
<gmock/gmock.h>
using
namespace
Mantid
;
using
namespace
Geometry
;
using
Mantid
::
Kernel
::
V3D
;
using
detail
::
ShapeInfo
;
namespace
{
// -----------------------------------------------------------------------------
// Mock Random Number Generator
// -----------------------------------------------------------------------------
class
MockRNG
final
:
public
Mantid
::
Kernel
::
PseudoRandomNumberGenerator
{
public:
GNU_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD0
(
nextValue
,
double
());
MOCK_METHOD2
(
nextValue
,
double
(
double
,
double
));
MOCK_METHOD2
(
nextInt
,
int
(
int
,
int
));
MOCK_METHOD0
(
restart
,
void
());
MOCK_METHOD0
(
save
,
void
());
MOCK_METHOD0
(
restore
,
void
());
MOCK_METHOD1
(
setSeed
,
void
(
size_t
));
MOCK_METHOD2
(
setRange
,
void
(
const
double
,
const
double
));
MOCK_CONST_METHOD0
(
min
,
double
());
MOCK_CONST_METHOD0
(
max
,
double
());
GNU_DIAG_ON_SUGGEST_OVERRIDE
};
}
// namespace
class
CSGObjectTest
:
public
CxxTest
::
TestSuite
{
public:
...
...
Framework/Geometry/test/MeshObject2DTest.h
View file @
69f314f1
...
...
@@ -8,7 +8,6 @@
#define MANTID_GEOMETRY_MESHOBJECT2DTEST_H_
#include
<cxxtest/TestSuite.h>
#include
<gmock/gmock.h>
#include
"MantidGeometry/Objects/BoundingBox.h"
#include
"MantidGeometry/Objects/MeshObject2D.h"
...
...
@@ -16,9 +15,8 @@
#include
"MantidGeometry/Rendering/GeometryHandler.h"
#include
"MantidGeometry/Rendering/ShapeInfo.h"
#include
"MantidKernel/Material.h"
#include
"MantidKernel/PseudoRandomNumberGenerator.h"
#include
"MantidKernel/V3D.h"
#include
"MantidKernel/WarningSuppressions.h"
#include
"MockRNG.h"
#include
<cmath>
using
Mantid
::
Geometry
::
MeshObject2D
;
...
...
@@ -42,24 +40,6 @@ MeshObject2D makeTrapezoidMesh(const V3D &a, const V3D &b, const V3D &c,
triangles
.
insert
(
triangles
.
end
(),
{
2
,
3
,
0
});
return
MeshObject2D
(
triangles
,
vertices
,
Mantid
::
Kernel
::
Material
());
}
// -----------------------------------------------------------------------------
// Mock Random Number Generator
// -----------------------------------------------------------------------------
class
MockRNG
:
public
Mantid
::
Kernel
::
PseudoRandomNumberGenerator
{
public:
GNU_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD0
(
nextValue
,
double
());
MOCK_METHOD2
(
nextValue
,
double
(
double
,
double
));
MOCK_METHOD2
(
nextInt
,
int
(
int
,
int
));
MOCK_METHOD0
(
restart
,
void
());
MOCK_METHOD0
(
save
,
void
());
MOCK_METHOD0
(
restore
,
void
());
MOCK_METHOD1
(
setSeed
,
void
(
size_t
));
MOCK_METHOD2
(
setRange
,
void
(
const
double
,
const
double
));
MOCK_CONST_METHOD0
(
min
,
double
());
MOCK_CONST_METHOD0
(
max
,
double
());
GNU_DIAG_ON_SUGGEST_OVERRIDE
};
}
// namespace
class
MeshObject2DTest
:
public
CxxTest
::
TestSuite
{
...
...
Framework/Geometry/test/MeshObjectTest.h
View file @
69f314f1
...
...
@@ -15,48 +15,19 @@
#include
"MantidGeometry/Rendering/GeometryHandler.h"
#include
"MantidKernel/Material.h"
#include
"MantidKernel/MersenneTwister.h"
#include
"MantidKernel/WarningSuppressions.h"
#include
"MantidKernel/make_unique.h"
#include
"MantidTestHelpers/ComponentCreationHelper.h"
#include
"MockRNG.h"
#include
<algorithm>
#include
<cmath>
#include
<ctime>
#include
<cxxtest/TestSuite.h>
#include
<ostream>
#include
<vector>
#include
"boost/make_shared.hpp"
#include
"boost/shared_ptr.hpp"
#include
<Poco/DOM/AutoPtr.h>
#include
<Poco/DOM/Document.h>
#include
<gmock/gmock.h>
using
namespace
Mantid
;
using
namespace
Geometry
;
using
Mantid
::
Kernel
::
V3D
;
namespace
{
// -----------------------------------------------------------------------------
// Mock Random Number Generator
// -----------------------------------------------------------------------------
class
MockRNG
final
:
public
Mantid
::
Kernel
::
PseudoRandomNumberGenerator
{
public:
GNU_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD0
(
nextValue
,
double
());
MOCK_METHOD2
(
nextValue
,
double
(
double
,
double
));
MOCK_METHOD2
(
nextInt
,
int
(
int
,
int
));
MOCK_METHOD0
(
restart
,
void
());
MOCK_METHOD0
(
save
,
void
());
MOCK_METHOD0
(
restore
,
void
());
MOCK_METHOD1
(
setSeed
,
void
(
size_t
));
MOCK_METHOD2
(
setRange
,
void
(
const
double
,
const
double
));
MOCK_CONST_METHOD0
(
min
,
double
());
MOCK_CONST_METHOD0
(
max
,
double
());
GNU_DIAG_ON_SUGGEST_OVERRIDE
};
std
::
unique_ptr
<
MeshObject
>
createCube
(
const
double
size
,
const
V3D
&
centre
)
{
/**
* Create cube of side length size with specified centre,
...
...
Framework/Geometry/test/MockRNG.h
0 → 100644
View file @
69f314f1
// Mantid Repository : https://github.com/mantidproject/mantid
//
// Copyright © 2019 ISIS Rutherford Appleton Laboratory UKRI,
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_GEOMETRY_MOCKRNG_H_
#define MANTID_GEOMETRY_MOCKRNG_H_
#include
"MantidKernel/PseudoRandomNumberGenerator.h"
#include
"MantidKernel/WarningSuppressions.h"
#include
<gmock/gmock.h>
// -----------------------------------------------------------------------------
// Mock Random Number Generator
// -----------------------------------------------------------------------------
class
MockRNG
:
public
Mantid
::
Kernel
::
PseudoRandomNumberGenerator
{
public:
GNU_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD0
(
nextValue
,
double
());
MOCK_METHOD2
(
nextValue
,
double
(
double
,
double
));
MOCK_METHOD2
(
nextInt
,
int
(
int
,
int
));
MOCK_METHOD0
(
restart
,
void
());
MOCK_METHOD0
(
save
,
void
());
MOCK_METHOD0
(
restore
,
void
());
MOCK_METHOD1
(
setSeed
,
void
(
size_t
));
MOCK_METHOD2
(
setRange
,
void
(
const
double
,
const
double
));
MOCK_CONST_METHOD0
(
min
,
double
());
MOCK_CONST_METHOD0
(
max
,
double
());
GNU_DIAG_ON_SUGGEST_OVERRIDE
};
#endif
/* MANTID_GEOMETRY_MOCKRNG_H_ */
Framework/Geometry/test/SampleEnvironmentTest.h
View file @
69f314f1
...
...
@@ -14,34 +14,13 @@
#include
"MantidKernel/V3D.h"
#include
"MantidKernel/WarningSuppressions.h"
#include
"MantidTestHelpers/ComponentCreationHelper.h"
#include
"MockRNG.h"
#include
<boost/make_shared.hpp>
#include
<cxxtest/TestSuite.h>
#include
<gmock/gmock.h>
using
Mantid
::
Geometry
::
SampleEnvironment
;
namespace
{
// -----------------------------------------------------------------------------
// Mock Random Number Generator
// -----------------------------------------------------------------------------
class
MockRNG
final
:
public
Mantid
::
Kernel
::
PseudoRandomNumberGenerator
{
public:
GNU_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD0
(
nextValue
,
double
());
MOCK_METHOD2
(
nextValue
,
double
(
double
,
double
));
MOCK_METHOD2
(
nextInt
,
int
(
int
,
int
));
MOCK_METHOD0
(
restart
,
void
());
MOCK_METHOD0
(
save
,
void
());
MOCK_METHOD0
(
restore
,
void
());
MOCK_METHOD1
(
setSeed
,
void
(
size_t
));
MOCK_METHOD2
(
setRange
,
void
(
const
double
,
const
double
));
MOCK_CONST_METHOD0
(
min
,
double
());
MOCK_CONST_METHOD0
(
max
,
double
());
GNU_DIAG_ON_SUGGEST_OVERRIDE
};
}
// namespace
class
SampleEnvironmentTest
:
public
CxxTest
::
TestSuite
{
public:
// This pair of boilerplate methods prevent the suite being created statically
...
...
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