diff --git a/tests/test_filter_delayedgroup/geometry.xml b/tests/test_filter_delayedgroup/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_filter_delayedgroup/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
-
-
- |
-
-
- |
-
-
- |
-
-
-
- 17 17
- -10.71 -10.71
- 1.26 1.26
-
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
- 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
- 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-
-
-
-
- 17 17
- -10.71 -10.71
- 1.26 1.26
-
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
- 3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
- 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-
-
-
-
-
- 21 21
- -224.91 -224.91
- 21.42 21.42
-
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
- 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
- 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
- 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
- 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
- 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
- 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
- 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
- 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
- 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
- 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
- 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
- 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
- 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
- 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
- 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
- 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-
-
-
-
-
- 21 21
- -224.91 -224.91
- 21.42 21.42
-
- 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
- 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
- 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
- 7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
- 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
- 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
- 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
- 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
- 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
- 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
- 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
- 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
- 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
- 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
- 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
- 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
- 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
- 7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
- 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
- 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
- 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-
-
-
-
diff --git a/tests/test_filter_delayedgroup/inputs_true.dat b/tests/test_filter_delayedgroup/inputs_true.dat
new file mode 100644
index 0000000000..21bce00fd2
--- /dev/null
+++ b/tests/test_filter_delayedgroup/inputs_true.dat
@@ -0,0 +1 @@
+e771470681d3b4af57a70d148f5eb728df57f1fd7bdb5d6f76ac556b69f10bf0cdd5645fe488f1e17f07cbb72e9fb34af2fd7ede95c8e39c5ffa6ea9b6c5810e
\ No newline at end of file
diff --git a/tests/test_filter_delayedgroup/materials.xml b/tests/test_filter_delayedgroup/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_filter_delayedgroup/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-
-
-
- 71c
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/test_filter_delayedgroup/results_true.dat b/tests/test_filter_delayedgroup/results_true.dat
index f44821a238..9db6de2562 100644
--- a/tests/test_filter_delayedgroup/results_true.dat
+++ b/tests/test_filter_delayedgroup/results_true.dat
@@ -1,15 +1,15 @@
k-combined:
-1.005983E+00 2.248579E-02
+9.903196E-01 4.279617E-02
tally 1:
-6.113116E-04
-7.519725E-08
-3.155402E-03
-2.003485E-06
-3.012421E-03
-1.826031E-06
-6.754097E-03
-9.179336E-06
-2.769084E-03
-1.542940E-06
-1.159960E-03
-2.707463E-07
+8.141852E-04
+1.337187E-07
+4.849156E-03
+4.744020E-06
+4.460252E-03
+4.015453E-06
+1.028479E-02
+2.136252E-05
+5.002274E-03
+5.056965E-06
+1.974747E-03
+7.882970E-07
diff --git a/tests/test_filter_delayedgroup/settings.xml b/tests/test_filter_delayedgroup/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_filter_delayedgroup/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- 10
- 5
- 100
-
-
-
-
-
- -160 -160 -183
- 160 160 183
-
-
-
-
-
diff --git a/tests/test_filter_delayedgroup/tallies.xml b/tests/test_filter_delayedgroup/tallies.xml
deleted file mode 100644
index b3649b4697..0000000000
--- a/tests/test_filter_delayedgroup/tallies.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
- delayed-nu-fission
- U-235
-
-
-
diff --git a/tests/test_filter_delayedgroup/test_filter_delayedgroup.py b/tests/test_filter_delayedgroup/test_filter_delayedgroup.py
index 1777db993e..bdad3cc958 100644
--- a/tests/test_filter_delayedgroup/test_filter_delayedgroup.py
+++ b/tests/test_filter_delayedgroup/test_filter_delayedgroup.py
@@ -1,10 +1,30 @@
#!/usr/bin/env python
+import os
import sys
-sys.path.insert(0, '..')
-from testing_harness import TestHarness
+sys.path.insert(0, os.pardir)
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+
+
+class FilterDelayedgroupTestHarness(PyAPITestHarness):
+ def _build_inputs(self):
+ filt = openmc.Filter(type='delayedgroup',
+ bins=(1, 2, 3, 4, 5, 6))
+ tally = openmc.Tally(tally_id=1)
+ tally.add_filter(filt)
+ tally.add_score('delayed-nu-fission')
+ self._input_set.tallies = openmc.TalliesFile()
+ self._input_set.tallies.add_tally(tally)
+
+ super(FilterDelayedgroupTestHarness, self)._build_inputs()
+
+ def _cleanup(self):
+ super(FilterDelayedgroupTestHarness, self)._cleanup()
+ f = os.path.join(os.getcwd(), 'tallies.xml')
+ if os.path.exists(f): os.remove(f)
if __name__ == '__main__':
- harness = TestHarness('statepoint.10.*', True)
+ harness = FilterDelayedgroupTestHarness('statepoint.10.*', True)
harness.main()
diff --git a/tests/test_score_delayed_nufission/geometry.xml b/tests/test_score_delayed_nufission/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_score_delayed_nufission/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
-
-
- |
-
-
- |
-
-
- |
-
-
-
- 17 17
- -10.71 -10.71
- 1.26 1.26
-
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
- 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
- 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-
-
-
-
- 17 17
- -10.71 -10.71
- 1.26 1.26
-
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
- 3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
- 3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
- 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
-
-
-
-
-
- 21 21
- -224.91 -224.91
- 21.42 21.42
-
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
- 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
- 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
- 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
- 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
- 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
- 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
- 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
- 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
- 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
- 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
- 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
- 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
- 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
- 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
- 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
- 5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-
-
-
-
-
- 21 21
- -224.91 -224.91
- 21.42 21.42
-
- 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
- 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
- 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
- 7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
- 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
- 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
- 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
- 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
- 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
- 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
- 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
- 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
- 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
- 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
- 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
- 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
- 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
- 7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
- 7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
- 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
- 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
-
-
-
-
diff --git a/tests/test_score_delayed_nufission/inputs_true.dat b/tests/test_score_delayed_nufission/inputs_true.dat
new file mode 100644
index 0000000000..5a0ec8a211
--- /dev/null
+++ b/tests/test_score_delayed_nufission/inputs_true.dat
@@ -0,0 +1 @@
+f3c246a1c83b1283163b22069f78231e3f6623fa3c2eb664ce400d0fff07105b6106d0fa8c6dfd49512a7eb676c80e4ee602e19063a9fc453394fe07a94a1bdd
\ No newline at end of file
diff --git a/tests/test_score_delayed_nufission/materials.xml b/tests/test_score_delayed_nufission/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_score_delayed_nufission/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-
-
-
- 71c
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/test_score_delayed_nufission/results_true.dat b/tests/test_score_delayed_nufission/results_true.dat
index 6818f88e49..d797baf18c 100644
--- a/tests/test_score_delayed_nufission/results_true.dat
+++ b/tests/test_score_delayed_nufission/results_true.dat
@@ -1,29 +1,29 @@
k-combined:
-1.005983E+00 2.248579E-02
+9.903196E-01 4.279617E-02
tally 1:
-1.432292E-02
-4.518762E-05
+1.711611E-02
+5.967549E-05
0.000000E+00
0.000000E+00
0.000000E+00
0.000000E+00
-1.531359E-02
-5.079909E-05
+1.026930E-02
+2.198717E-05
tally 2:
-1.576415E-02
-2.485084E-04
0.000000E+00
0.000000E+00
0.000000E+00
0.000000E+00
0.000000E+00
0.000000E+00
+1.976462E-02
+1.953328E-04
tally 3:
-1.369800E-02
-3.974018E-05
+1.687894E-02
+5.776176E-05
0.000000E+00
0.000000E+00
0.000000E+00
0.000000E+00
-1.447073E-02
-4.579588E-05
+1.061803E-02
+2.308636E-05
diff --git a/tests/test_score_delayed_nufission/settings.xml b/tests/test_score_delayed_nufission/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_score_delayed_nufission/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- 10
- 5
- 100
-
-
-
-
-
- -160 -160 -183
- 160 160 183
-
-
-
-
-
diff --git a/tests/test_score_delayed_nufission/tallies.xml b/tests/test_score_delayed_nufission/tallies.xml
deleted file mode 100644
index 5ca1409859..0000000000
--- a/tests/test_score_delayed_nufission/tallies.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
- delayed-nu-fission
-
-
-
-
- delayed-nu-fission
- analog
-
-
-
-
- delayed-nu-fission
- collision
-
-
-
diff --git a/tests/test_score_delayed_nufission/test_score_delayed_nufission.py b/tests/test_score_delayed_nufission/test_score_delayed_nufission.py
index 1777db993e..0738520e29 100644
--- a/tests/test_score_delayed_nufission/test_score_delayed_nufission.py
+++ b/tests/test_score_delayed_nufission/test_score_delayed_nufission.py
@@ -1,10 +1,32 @@
#!/usr/bin/env python
+import os
import sys
-sys.path.insert(0, '..')
-from testing_harness import TestHarness
+sys.path.insert(0, os.pardir)
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+
+
+class ScoreDelayedNuFissionTestHarness(PyAPITestHarness):
+ def _build_inputs(self):
+ filt = openmc.Filter(type='cell', bins=(21, 22, 23, 27))
+ tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+ [t.add_filter(filt) for t in tallies]
+ [t.add_score('delayed-nu-fission') for t in tallies]
+ tallies[0].estimator = 'tracklength'
+ tallies[1].estimator = 'analog'
+ tallies[2].estimator = 'collision'
+ self._input_set.tallies = openmc.TalliesFile()
+ [self._input_set.tallies.add_tally(t) for t in tallies]
+
+ super(ScoreDelayedNuFissionTestHarness, self)._build_inputs()
+
+ def _cleanup(self):
+ super(ScoreDelayedNuFissionTestHarness, self)._cleanup()
+ f = os.path.join(os.getcwd(), 'tallies.xml')
+ if os.path.exists(f): os.remove(f)
if __name__ == '__main__':
- harness = TestHarness('statepoint.10.*', True)
+ harness = ScoreDelayedNuFissionTestHarness('statepoint.10.*', True)
harness.main()