From c8bca0452b6cd6bd965f65a89035ef9dd9f14729 Mon Sep 17 00:00:00 2001
From: Elliot Oram <elliot.oram@stfc.ac.uk>
Date: Mon, 20 Nov 2017 16:09:11 +0000
Subject: [PATCH] Add test for geometry and material generation functions
Refs #21214
---
scripts/test/ISISPowderCommonTest.py | 31 +++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/scripts/test/ISISPowderCommonTest.py b/scripts/test/ISISPowderCommonTest.py
index 80eba229b04..03e78eb529f 100644
--- a/scripts/test/ISISPowderCommonTest.py
+++ b/scripts/test/ISISPowderCommonTest.py
@@ -5,7 +5,7 @@ import unittest
from six_shim import assertRaisesRegex
-from isis_powder.routines import common, common_enums
+from isis_powder.routines import common, common_enums, SampleDetails
class ISISPowderCommonTest(unittest.TestCase):
@@ -519,6 +519,35 @@ class ISISPowderCommonTest(unittest.TestCase):
mantid.DeleteWorkspace(sample_ws)
+ def test_generate_sample_geometry(self):
+ # Create mock SampleDetails
+ sample_details = SampleDetails(height=4.0, radius=3.0,
+ center=[0.5, 1.0, -3.2], shape='cylinder')
+ # Run test
+ result = common.generate_sample_geometry(sample_details)
+ # Validate result
+ expected = {'Shape': 'Cylinder',
+ 'Height': 4.0,
+ 'Radius': 3.0,
+ 'Center': [0.5, 1.0, -3.2]}
+ self.assertEquals(result, expected)
+
+ def test_generate_sample_material(self):
+ # Create mock SampleDetails
+ sample_details = SampleDetails(height=1.0, radius=1.0,
+ center=[0.0, 0.0, 0.0])
+ sample_details.set_material(chemical_formula='Si', number_density=1.5)
+ sample_details.set_material_properties(absorption_cross_section=123,
+ scattering_cross_section=456)
+ # Run test
+ result = common.generate_sample_material(sample_details)
+ # Validate
+ expected = {'ChemicalFormula': 'Si',
+ 'SampleNumberDensity': 1.5,
+ 'AttenuationXSection': 123.0,
+ 'ScatteringXSection': 456.0}
+ self.assertEquals(result, expected)
+
class ISISPowderMockInst(object):
def __init__(self, file_ext=None):
--
GitLab