From e32e19c4f5e86b0eb73da8c7e4ab8074bf5e2cd0 Mon Sep 17 00:00:00 2001 From: ryanstwrt Date: Tue, 1 Oct 2019 18:43:30 -0600 Subject: [PATCH] Updated tests to include perturbations. --- fridge/test_suite/driver_test.py | 8 +++++--- fridge/test_suite/reactorMaker_test.py | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/fridge/test_suite/driver_test.py b/fridge/test_suite/driver_test.py index f243d4b..cf909ed 100644 --- a/fridge/test_suite/driver_test.py +++ b/fridge/test_suite/driver_test.py @@ -5,12 +5,14 @@ cur_dir = os.path.dirname(__file__) mcnp_dir = os.path.join(cur_dir, '../mcnp_input_files/') +mcnp_test_dir = os.path.join(cur_dir, '../mcnp_input_files/Test_Inputs/') + def test_fridge_driver_singleAssembly(): """Test that the new files gets made to the right directory""" fd.main('A271_Assembly_Test') - knownTestFile = glob.glob(os.path.join(mcnp_dir, 'Prefab_Fuel_Assembly_Test.i')) + knownTestFile = glob.glob(os.path.join(mcnp_test_dir, 'Prefab_Fuel_Assembly_Test.i')) testFile = glob.glob(os.path.join(mcnp_dir, 'Fuel_Assembly_Test.i')) assert filecmp.cmp(testFile[0], knownTestFile[0]) is True @@ -18,6 +20,6 @@ def test_fridge_driver_singleAssembly(): def test_fridge_driver_core(): """Test that the new files gets made to the right directory""" fd.main('Full_Core_Test') - knownTestFile = glob.glob(os.path.join(mcnp_dir, 'Prefab_Full_Core_Test.i')) - testFile = glob.glob(os.path.join(mcnp_dir, 'Prefab_Full_Core_Test.i')) + knownTestFile = glob.glob(os.path.join(mcnp_test_dir, 'Prefab_Full_Core_Test.i')) + testFile = glob.glob(os.path.join(mcnp_dir, 'Full_Core_Test.i')) assert filecmp.cmp(testFile[0], knownTestFile[0]) is True \ No newline at end of file diff --git a/fridge/test_suite/reactorMaker_test.py b/fridge/test_suite/reactorMaker_test.py index 7272d6a..7f34341 100644 --- a/fridge/test_suite/reactorMaker_test.py +++ b/fridge/test_suite/reactorMaker_test.py @@ -6,8 +6,8 @@ global_vars = gb.GlobalVariables() cur_dir = os.path.dirname(__file__) -mcnp_dir = os.path.join(cur_dir, '../mcnp_input_files/Test_Inputs') -mcnp_test_dir = os.path.join(cur_dir, '../mcnp_input_files/') +mcnp_dir = os.path.join(cur_dir, '../mcnp_input_files/') +mcnp_test_dir = os.path.join(cur_dir, '../mcnp_input_files/Test_Inputs/') def test_singleAssembly_Fuel():