From cc261575447731897d9b817d3e2d6185e0739f6a Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Tue, 19 Jan 2016 11:21:24 -0600 Subject: [PATCH] Replace four plot tests with one --- .../geometry.xml | 0 .../materials.xml | 0 tests/{test_plot_mask => test_plot}/plots.xml | 7 +++--- tests/test_plot/results_true.dat | 1 + .../settings.xml | 6 +++++ .../test_plot.py} | 0 tests/test_plot_background/geometry.xml | 8 ------- tests/test_plot_background/materials.xml | 9 -------- tests/test_plot_background/plots.xml | 11 ---------- tests/test_plot_background/results_true.dat | 1 - .../test_plot_background.py | 11 ---------- tests/test_plot_basis/plots.xml | 22 ------------------- tests/test_plot_basis/results_true.dat | 1 - tests/test_plot_basis/settings.xml | 16 -------------- tests/test_plot_colspec/geometry.xml | 8 ------- tests/test_plot_colspec/materials.xml | 9 -------- tests/test_plot_colspec/plots.xml | 11 ---------- tests/test_plot_colspec/results_true.dat | 1 - tests/test_plot_colspec/settings.xml | 16 -------------- tests/test_plot_colspec/test_plot_colspec.py | 11 ---------- tests/test_plot_mask/geometry.xml | 13 ----------- tests/test_plot_mask/materials.xml | 19 ---------------- tests/test_plot_mask/results_true.dat | 1 - tests/test_plot_mask/settings.xml | 16 -------------- tests/test_plot_mask/test_plot_mask.py | 11 ---------- 25 files changed, 11 insertions(+), 198 deletions(-) rename tests/{test_plot_basis => test_plot}/geometry.xml (100%) rename tests/{test_plot_basis => test_plot}/materials.xml (100%) rename tests/{test_plot_mask => test_plot}/plots.xml (71%) create mode 100644 tests/test_plot/results_true.dat rename tests/{test_plot_background => test_plot}/settings.xml (66%) rename tests/{test_plot_basis/test_plot_basis.py => test_plot/test_plot.py} (100%) delete mode 100644 tests/test_plot_background/geometry.xml delete mode 100644 tests/test_plot_background/materials.xml delete mode 100644 tests/test_plot_background/plots.xml delete mode 100644 tests/test_plot_background/results_true.dat delete mode 100644 tests/test_plot_background/test_plot_background.py delete mode 100644 tests/test_plot_basis/plots.xml delete mode 100644 tests/test_plot_basis/results_true.dat delete mode 100644 tests/test_plot_basis/settings.xml delete mode 100644 tests/test_plot_colspec/geometry.xml delete mode 100644 tests/test_plot_colspec/materials.xml delete mode 100644 tests/test_plot_colspec/plots.xml delete mode 100644 tests/test_plot_colspec/results_true.dat delete mode 100644 tests/test_plot_colspec/settings.xml delete mode 100644 tests/test_plot_colspec/test_plot_colspec.py delete mode 100644 tests/test_plot_mask/geometry.xml delete mode 100644 tests/test_plot_mask/materials.xml delete mode 100644 tests/test_plot_mask/results_true.dat delete mode 100644 tests/test_plot_mask/settings.xml delete mode 100644 tests/test_plot_mask/test_plot_mask.py diff --git a/tests/test_plot_basis/geometry.xml b/tests/test_plot/geometry.xml similarity index 100% rename from tests/test_plot_basis/geometry.xml rename to tests/test_plot/geometry.xml diff --git a/tests/test_plot_basis/materials.xml b/tests/test_plot/materials.xml similarity index 100% rename from tests/test_plot_basis/materials.xml rename to tests/test_plot/materials.xml diff --git a/tests/test_plot_mask/plots.xml b/tests/test_plot/plots.xml similarity index 71% rename from tests/test_plot_mask/plots.xml rename to tests/test_plot/plots.xml index 72b40f72cf..e8848f6172 100644 --- a/tests/test_plot_mask/plots.xml +++ b/tests/test_plot/plots.xml @@ -5,7 +5,8 @@ 0. 0. 0. 25 25 200 200 - + + @@ -15,11 +16,11 @@ - + 0. 0. 0. 25 25 200 200 - + 0 0 0 diff --git a/tests/test_plot/results_true.dat b/tests/test_plot/results_true.dat new file mode 100644 index 0000000000..910e41a060 --- /dev/null +++ b/tests/test_plot/results_true.dat @@ -0,0 +1 @@ +f76183da6a581c17f9a1572e1f1573d784e3f2e3efa3e7a3bd8786991df7a086e0b5f7f1c6b00343fa61b601ec70ad619b5ff5d8120af32559b882ca57be6768 \ No newline at end of file diff --git a/tests/test_plot_background/settings.xml b/tests/test_plot/settings.xml similarity index 66% rename from tests/test_plot_background/settings.xml rename to tests/test_plot/settings.xml index a6fd5da19e..03985b3ae9 100644 --- a/tests/test_plot_background/settings.xml +++ b/tests/test_plot/settings.xml @@ -13,4 +13,10 @@ + + 5 4 3 + -10 -10 -10 + 10 10 10 + + diff --git a/tests/test_plot_basis/test_plot_basis.py b/tests/test_plot/test_plot.py similarity index 100% rename from tests/test_plot_basis/test_plot_basis.py rename to tests/test_plot/test_plot.py diff --git a/tests/test_plot_background/geometry.xml b/tests/test_plot_background/geometry.xml deleted file mode 100644 index bc56030e18..0000000000 --- a/tests/test_plot_background/geometry.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/tests/test_plot_background/materials.xml b/tests/test_plot_background/materials.xml deleted file mode 100644 index 315c0fa848..0000000000 --- a/tests/test_plot_background/materials.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/test_plot_background/plots.xml b/tests/test_plot_background/plots.xml deleted file mode 100644 index 879d2b30df..0000000000 --- a/tests/test_plot_background/plots.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - 0. 0. 0. - 30. 30. - 200 200 - 0 0 0 - - - diff --git a/tests/test_plot_background/results_true.dat b/tests/test_plot_background/results_true.dat deleted file mode 100644 index cea27e38e2..0000000000 --- a/tests/test_plot_background/results_true.dat +++ /dev/null @@ -1 +0,0 @@ -d0a8c3cd2eb2b73430e0fcac2f5249c012ba678d08add40fc43563332e71873977b2271d1e93ba42b3c1298f987f7d01406f60115d2f1c0879d140a11b909598 \ No newline at end of file diff --git a/tests/test_plot_background/test_plot_background.py b/tests/test_plot_background/test_plot_background.py deleted file mode 100644 index 7890eca19d..0000000000 --- a/tests/test_plot_background/test_plot_background.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 PlotTestHarness - - -if __name__ == '__main__': - harness = PlotTestHarness(('1_plot.ppm', )) - harness.main() diff --git a/tests/test_plot_basis/plots.xml b/tests/test_plot_basis/plots.xml deleted file mode 100644 index 492236d376..0000000000 --- a/tests/test_plot_basis/plots.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - 0. 0. 0. - 25 25 - 200 200 - - - - 0. 0. 0. - 25 25 - 200 200 - - - - 0. 0. 0. - 25 25 - 200 200 - - - diff --git a/tests/test_plot_basis/results_true.dat b/tests/test_plot_basis/results_true.dat deleted file mode 100644 index b1d5dc8534..0000000000 --- a/tests/test_plot_basis/results_true.dat +++ /dev/null @@ -1 +0,0 @@ -368e0135c136d5c8a2dabb4c8085279dc7ac0bd81b2ec905bdf11ecb5fe99803868631cdff0b3ddec941323bcc661747d4c16edfd4f8d38582155bd6fd7e82e8 \ No newline at end of file diff --git a/tests/test_plot_basis/settings.xml b/tests/test_plot_basis/settings.xml deleted file mode 100644 index a6fd5da19e..0000000000 --- a/tests/test_plot_basis/settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - 10 - 5 - 1000 - - - - - -4 -4 -4 4 4 4 - - - - diff --git a/tests/test_plot_colspec/geometry.xml b/tests/test_plot_colspec/geometry.xml deleted file mode 100644 index bc56030e18..0000000000 --- a/tests/test_plot_colspec/geometry.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/tests/test_plot_colspec/materials.xml b/tests/test_plot_colspec/materials.xml deleted file mode 100644 index 315c0fa848..0000000000 --- a/tests/test_plot_colspec/materials.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/test_plot_colspec/plots.xml b/tests/test_plot_colspec/plots.xml deleted file mode 100644 index 27edcb11b0..0000000000 --- a/tests/test_plot_colspec/plots.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - 0. 0. 0. - 30. 30. - 200 200 - - - - diff --git a/tests/test_plot_colspec/results_true.dat b/tests/test_plot_colspec/results_true.dat deleted file mode 100644 index 0e4eb9a59b..0000000000 --- a/tests/test_plot_colspec/results_true.dat +++ /dev/null @@ -1 +0,0 @@ -32acbbd7b0f777589b108333e4928b6ecd93bc9e553b04cc611da4079ff8738a03dd0667e7e17161708fde86180532f19907272356d23e8a827a736a5b4a697a \ No newline at end of file diff --git a/tests/test_plot_colspec/settings.xml b/tests/test_plot_colspec/settings.xml deleted file mode 100644 index a6fd5da19e..0000000000 --- a/tests/test_plot_colspec/settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - 10 - 5 - 1000 - - - - - -4 -4 -4 4 4 4 - - - - diff --git a/tests/test_plot_colspec/test_plot_colspec.py b/tests/test_plot_colspec/test_plot_colspec.py deleted file mode 100644 index 7890eca19d..0000000000 --- a/tests/test_plot_colspec/test_plot_colspec.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 PlotTestHarness - - -if __name__ == '__main__': - harness = PlotTestHarness(('1_plot.ppm', )) - harness.main() diff --git a/tests/test_plot_mask/geometry.xml b/tests/test_plot_mask/geometry.xml deleted file mode 100644 index 83619d9f78..0000000000 --- a/tests/test_plot_mask/geometry.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/tests/test_plot_mask/materials.xml b/tests/test_plot_mask/materials.xml deleted file mode 100644 index f90a5e7f81..0000000000 --- a/tests/test_plot_mask/materials.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/tests/test_plot_mask/results_true.dat b/tests/test_plot_mask/results_true.dat deleted file mode 100644 index a1e323203d..0000000000 --- a/tests/test_plot_mask/results_true.dat +++ /dev/null @@ -1 +0,0 @@ -a7cb65bf40c84c0540d45ff292c398f9ae51b3d9396e88b9b4e5cdf05e8730f409bddb53aec6d396058194c6293c5bd3ef39efd0b0f30f2423f696193c85176c \ No newline at end of file diff --git a/tests/test_plot_mask/settings.xml b/tests/test_plot_mask/settings.xml deleted file mode 100644 index a6fd5da19e..0000000000 --- a/tests/test_plot_mask/settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - 10 - 5 - 1000 - - - - - -4 -4 -4 4 4 4 - - - - diff --git a/tests/test_plot_mask/test_plot_mask.py b/tests/test_plot_mask/test_plot_mask.py deleted file mode 100644 index d45479e256..0000000000 --- a/tests/test_plot_mask/test_plot_mask.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 PlotTestHarness - - -if __name__ == '__main__': - harness = PlotTestHarness(('1_plot.ppm', '2_plot.ppm', '3_plot.ppm')) - harness.main()