Move tests and rename test files

Author: bobleesj

src/diffpy/srfit/.DS_Store

@@ -21,7 +21,7 @@
 
 import diffpy.srfit.equation.builder as builder
 import diffpy.srfit.equation.literals as literals
-from diffpy.srfit.tests.utils import _makeArgs, noObserversInGlobalBuilders
+from utils import _makeArgs, noObserversInGlobalBuilders
 
 
 class TestBuilder(unittest.TestCase):

src/diffpy/srfit/tests/__init__.py

@@ -20,7 +20,7 @@
 import numpy
 
 from diffpy.srfit.sas.sasimport import sasimport
-from diffpy.srfit.tests.utils import _msg_nosas, has_sas
+from utils import _msg_nosas, has_sas
 
 # Global variables to be assigned in setUp
 cf = None

src/diffpy/srfit/tests/debug.py

@@ -24,7 +24,7 @@
 from diffpy.srfit.fitbase.parameter import Parameter
 from diffpy.srfit.fitbase.profile import Profile
 from diffpy.srfit.fitbase.profilegenerator import ProfileGenerator
-from diffpy.srfit.tests.utils import noObserversInGlobalBuilders
+from utils import noObserversInGlobalBuilders
 
 
 class TestContribution(unittest.TestCase):

src/diffpy/srfit/tests/run.py

@@ -20,7 +20,7 @@
 
 import numpy
 
-from diffpy.srfit.tests.utils import _msg_nostructure, has_structure
+from utils import _msg_nostructure, has_structure
 
 # Global variables to be assigned in setUp
 Atom = Lattice = Structure = DiffpyStructureParSet = None

src/diffpy/srfit/tests/testbuilder.py renamed to tests/test_builder.py

@@ -19,7 +19,7 @@
 
 import diffpy.srfit.equation.literals as literals
 from diffpy.srfit.equation import Equation
-from diffpy.srfit.tests.utils import _makeArgs, noObserversInGlobalBuilders
+from utils import _makeArgs, noObserversInGlobalBuilders
 
 
 class TestEquation(unittest.TestCase):