From 9be871419940b250fb290dc61bc3a405a5876132 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Tue, 19 Jan 2016 11:07:27 -0600 Subject: [PATCH] Replace four density tests with a single one --- tests/test_density/geometry.xml | 14 ++++++++++ tests/test_density/materials.xml | 26 +++++++++++++++++++ tests/test_density/results_true.dat | 2 ++ .../settings.xml | 0 .../test_density.py} | 0 tests/test_density_atombcm/geometry.xml | 8 ------ tests/test_density_atombcm/materials.xml | 9 ------- tests/test_density_atombcm/results_true.dat | 2 -- tests/test_density_atomcm3/geometry.xml | 8 ------ tests/test_density_atomcm3/materials.xml | 9 ------- tests/test_density_atomcm3/results_true.dat | 2 -- tests/test_density_atomcm3/settings.xml | 16 ------------ .../test_density_atomcm3.py | 11 -------- tests/test_density_kgm3/geometry.xml | 8 ------ tests/test_density_kgm3/materials.xml | 9 ------- tests/test_density_kgm3/results_true.dat | 2 -- tests/test_density_kgm3/settings.xml | 16 ------------ tests/test_density_kgm3/test_density_kgm3.py | 11 -------- tests/test_density_sum/geometry.xml | 8 ------ tests/test_density_sum/materials.xml | 11 -------- tests/test_density_sum/results_true.dat | 2 -- tests/test_density_sum/settings.xml | 16 ------------ tests/test_density_sum/test_density_sum.py | 11 -------- 23 files changed, 42 insertions(+), 159 deletions(-) create mode 100644 tests/test_density/geometry.xml create mode 100644 tests/test_density/materials.xml create mode 100644 tests/test_density/results_true.dat rename tests/{test_density_atombcm => test_density}/settings.xml (100%) rename tests/{test_density_atombcm/test_density_atombcm.py => test_density/test_density.py} (100%) delete mode 100644 tests/test_density_atombcm/geometry.xml delete mode 100644 tests/test_density_atombcm/materials.xml delete mode 100644 tests/test_density_atombcm/results_true.dat delete mode 100644 tests/test_density_atomcm3/geometry.xml delete mode 100644 tests/test_density_atomcm3/materials.xml delete mode 100644 tests/test_density_atomcm3/results_true.dat delete mode 100644 tests/test_density_atomcm3/settings.xml delete mode 100644 tests/test_density_atomcm3/test_density_atomcm3.py delete mode 100644 tests/test_density_kgm3/geometry.xml delete mode 100644 tests/test_density_kgm3/materials.xml delete mode 100644 tests/test_density_kgm3/results_true.dat delete mode 100644 tests/test_density_kgm3/settings.xml delete mode 100644 tests/test_density_kgm3/test_density_kgm3.py delete mode 100644 tests/test_density_sum/geometry.xml delete mode 100644 tests/test_density_sum/materials.xml delete mode 100644 tests/test_density_sum/results_true.dat delete mode 100644 tests/test_density_sum/settings.xml delete mode 100644 tests/test_density_sum/test_density_sum.py diff --git a/tests/test_density/geometry.xml b/tests/test_density/geometry.xml new file mode 100644 index 0000000000..c305754da9 --- /dev/null +++ b/tests/test_density/geometry.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/tests/test_density/materials.xml b/tests/test_density/materials.xml new file mode 100644 index 0000000000..36947d066d --- /dev/null +++ b/tests/test_density/materials.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/test_density/results_true.dat b/tests/test_density/results_true.dat new file mode 100644 index 0000000000..1dbadc039d --- /dev/null +++ b/tests/test_density/results_true.dat @@ -0,0 +1,2 @@ +k-combined: +1.088237E+00 1.999252E-02 diff --git a/tests/test_density_atombcm/settings.xml b/tests/test_density/settings.xml similarity index 100% rename from tests/test_density_atombcm/settings.xml rename to tests/test_density/settings.xml diff --git a/tests/test_density_atombcm/test_density_atombcm.py b/tests/test_density/test_density.py similarity index 100% rename from tests/test_density_atombcm/test_density_atombcm.py rename to tests/test_density/test_density.py diff --git a/tests/test_density_atombcm/geometry.xml b/tests/test_density_atombcm/geometry.xml deleted file mode 100644 index bc56030e18..0000000000 --- a/tests/test_density_atombcm/geometry.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/tests/test_density_atombcm/materials.xml b/tests/test_density_atombcm/materials.xml deleted file mode 100644 index 10d0519685..0000000000 --- a/tests/test_density_atombcm/materials.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/test_density_atombcm/results_true.dat b/tests/test_density_atombcm/results_true.dat deleted file mode 100644 index 2956b53888..0000000000 --- a/tests/test_density_atombcm/results_true.dat +++ /dev/null @@ -1,2 +0,0 @@ -k-combined: -1.752274E+00 4.032481E-02 diff --git a/tests/test_density_atomcm3/geometry.xml b/tests/test_density_atomcm3/geometry.xml deleted file mode 100644 index bc56030e18..0000000000 --- a/tests/test_density_atomcm3/geometry.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/tests/test_density_atomcm3/materials.xml b/tests/test_density_atomcm3/materials.xml deleted file mode 100644 index 57d177afc7..0000000000 --- a/tests/test_density_atomcm3/materials.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/test_density_atomcm3/results_true.dat b/tests/test_density_atomcm3/results_true.dat deleted file mode 100644 index 0bd16fc4de..0000000000 --- a/tests/test_density_atomcm3/results_true.dat +++ /dev/null @@ -1,2 +0,0 @@ -k-combined: -1.092376E+00 1.759788E-02 diff --git a/tests/test_density_atomcm3/settings.xml b/tests/test_density_atomcm3/settings.xml deleted file mode 100644 index a6fd5da19e..0000000000 --- a/tests/test_density_atomcm3/settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - 10 - 5 - 1000 - - - - - -4 -4 -4 4 4 4 - - - - diff --git a/tests/test_density_atomcm3/test_density_atomcm3.py b/tests/test_density_atomcm3/test_density_atomcm3.py deleted file mode 100644 index 2a595f3e66..0000000000 --- a/tests/test_density_atomcm3/test_density_atomcm3.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -import os -import sys -sys.path.insert(0, os.pardir) -from testing_harness import TestHarness - - -if __name__ == '__main__': - harness = TestHarness('statepoint.10.*') - harness.main() diff --git a/tests/test_density_kgm3/geometry.xml b/tests/test_density_kgm3/geometry.xml deleted file mode 100644 index bc56030e18..0000000000 --- a/tests/test_density_kgm3/geometry.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/tests/test_density_kgm3/materials.xml b/tests/test_density_kgm3/materials.xml deleted file mode 100644 index 2f74574e75..0000000000 --- a/tests/test_density_kgm3/materials.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/test_density_kgm3/results_true.dat b/tests/test_density_kgm3/results_true.dat deleted file mode 100644 index 6b008101fb..0000000000 --- a/tests/test_density_kgm3/results_true.dat +++ /dev/null @@ -1,2 +0,0 @@ -k-combined: -7.994522E-01 1.065745E-02 diff --git a/tests/test_density_kgm3/settings.xml b/tests/test_density_kgm3/settings.xml deleted file mode 100644 index a6fd5da19e..0000000000 --- a/tests/test_density_kgm3/settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - 10 - 5 - 1000 - - - - - -4 -4 -4 4 4 4 - - - - diff --git a/tests/test_density_kgm3/test_density_kgm3.py b/tests/test_density_kgm3/test_density_kgm3.py deleted file mode 100644 index 2a595f3e66..0000000000 --- a/tests/test_density_kgm3/test_density_kgm3.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -import os -import sys -sys.path.insert(0, os.pardir) -from testing_harness import TestHarness - - -if __name__ == '__main__': - harness = TestHarness('statepoint.10.*') - harness.main() diff --git a/tests/test_density_sum/geometry.xml b/tests/test_density_sum/geometry.xml deleted file mode 100644 index bc56030e18..0000000000 --- a/tests/test_density_sum/geometry.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/tests/test_density_sum/materials.xml b/tests/test_density_sum/materials.xml deleted file mode 100644 index 713661196f..0000000000 --- a/tests/test_density_sum/materials.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/tests/test_density_sum/results_true.dat b/tests/test_density_sum/results_true.dat deleted file mode 100644 index 9b16f2d988..0000000000 --- a/tests/test_density_sum/results_true.dat +++ /dev/null @@ -1,2 +0,0 @@ -k-combined: -3.231215E-01 6.421320E-03 diff --git a/tests/test_density_sum/settings.xml b/tests/test_density_sum/settings.xml deleted file mode 100644 index a6fd5da19e..0000000000 --- a/tests/test_density_sum/settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - 10 - 5 - 1000 - - - - - -4 -4 -4 4 4 4 - - - - diff --git a/tests/test_density_sum/test_density_sum.py b/tests/test_density_sum/test_density_sum.py deleted file mode 100644 index 2a595f3e66..0000000000 --- a/tests/test_density_sum/test_density_sum.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -import os -import sys -sys.path.insert(0, os.pardir) -from testing_harness import TestHarness - - -if __name__ == '__main__': - harness = TestHarness('statepoint.10.*') - harness.main()