TST: test_spherical_zone() now redefined in test subclasses to proper…

…ly handle regression in Issue #1795.

testsuite/MDAnalysisTests/core/test_atomselections.py

@@ -21,7 +21,7 @@
 #
 from __future__ import division, absolute_import
 
-from six.moves import range
+from six.moves import range, zip
 
 import itertools
 import numpy as np
@@ -542,20 +542,6 @@ def test_spherical_layer(self, u, meth, periodic):
 
         assert ref == set(result.indices)
 
-    @pytest.mark.parametrize('input_val, expected',
-                             zip(methods,
-                                 [25, 31, 33, 25,
-                                  55, 55, 55, 55]))
-    def test_spherical_zone(self, u, input_val, expected):
-        # NOTE: this has been modified to regression test
-        # only for resolution of Issue #1795
-        # pending proper pbc & wrapping implementations
-        # in the future
-        sel = Parser.parse('sphzone 5.0 resid 1', u.atoms)
-        sel = self.choosemeth(sel, input_val[0], input_val[1])
-        result = len(sel.apply(u.atoms))
-        assert result == expected
-
     @pytest.mark.parametrize('meth, periodic', methods)
     def test_point(self, u, meth, periodic):
         sel = Parser.parse('point 5.0 5.0 5.0  3.0', u.atoms)
@@ -602,12 +588,38 @@ def test_cyzone(self, u, meth, periodic):
 
         assert ref == set(result.indices)
 
+    @pytest.mark.parametrize('input_val, expected',
+                             zip(BaseDistanceSelection.methods,
+                                 [25, 31, 33, 25]))
+    def test_spherical_zone(self, u, input_val, expected):
+        # NOTE: this has been modified to regression test
+        # only for resolution of Issue #1795
+        # pending proper pbc & wrapping implementations
+        # in the future
+        sel = Parser.parse('sphzone 5.0 resid 1', u.atoms)
+        sel = self.choosemeth(sel, input_val[0], input_val[1])
+        result = len(sel.apply(u.atoms))
+        assert result == expected
+
 
 class TestTriclinicDistanceSelections(BaseDistanceSelection):
     @pytest.fixture()
     def u(self):
         return mda.Universe(GRO)
 
+    @pytest.mark.parametrize('input_val, expected',
+                             zip(BaseDistanceSelection.methods,
+                                 [55, 55, 55, 55]))
+    def test_spherical_zone(self, u, input_val, expected):
+        # NOTE: this has been modified to regression test
+        # only for resolution of Issue #1795
+        # pending proper pbc & wrapping implementations
+        # in the future
+        sel = Parser.parse('sphzone 5.0 resid 1', u.atoms)
+        sel = self.choosemeth(sel, input_val[0], input_val[1])
+        result = len(sel.apply(u.atoms))
+        assert result == expected
+
 
 class TestTriclinicSelections(object):
     """Non-KDTree based selections