Author: bugman
Date: Sun Nov 18 23:13:44 2007
New Revision: 3597
URL: http://svn.gna.org/viewcvs/relax?rev=3597&view=rev
Log:
Shifted the return_data_types() function into its own module for all prompt
tests to use.
Added:
1.3/test_suite/unit_tests/prompt/data_types.py
- copied, changed from r3596,
1.3/test_suite/unit_tests/prompt/test_spin.py
Modified:
1.3/test_suite/unit_tests/prompt/test_spin.py
Copied: 1.3/test_suite/unit_tests/prompt/data_types.py (from r3596,
1.3/test_suite/unit_tests/prompt/test_spin.py)
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/prompt/data_types.py?p2=1.3/test_suite/unit_tests/prompt/data_types.py&p1=1.3/test_suite/unit_tests/prompt/test_spin.py&r1=3596&r2=3597&rev=3597&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/prompt/test_spin.py (original)
+++ 1.3/test_suite/unit_tests/prompt/data_types.py Sun Nov 18 23:13:44 2007
@@ -20,94 +20,84 @@
#
#
###############################################################################
-# Python module imports.
-from unittest import TestCase
-
-# relax module imports.
-from data import Data as relax_data_store
-from prompt.spin import Spin
-from relax_errors import RelaxError, RelaxNoPipeError
-from test_suite.unit_tests.spin_testing_base import Spin_base_class
-# A class to act as a container.
class Container:
+ """A class to act as a container."""
+
pass
-# Fake normal relax usage of the user function class.
-relax = Container()
-relax.interpreter = Container()
-relax.interpreter.intro = True
-# A dummy function for testing data types.
def dummy_fn():
+ """A dummy function for testing data types."""
+
pass
-# A second dummy function for testing data types.
def dummy_fn2():
+ """A second dummy function for testing data types."""
+
return "Hello"
-class Test_spin(Spin_base_class, TestCase):
- """Unit tests for the functions of the 'generic_fns.spin' module."""
+def return_data_types(self):
+ """Function for returning an array of many different Python objects.
+
+ These objects are to test the correct behaviour towards the user
function arguments.
+ """
- # Instantiate the user function class.
- spin_fns = Spin(relax)
+ # Create the array.
+ data_types = []
+ # None.
+ data_types.append(['None', None])
- def return_data_types(self):
- """Function for returning an array of many different Python objects.
-
- These objects are to test the correct behaviour towards the user
function arguments.
- """
+ # Integers.
+ data_types.append(['int', 0])
+ data_types.append(['int', 10])
+ data_types.append(['int', -10])
- # Create the array.
- data_types = []
+ # Binaries.
+ data_types.append(['bin', 0])
+ data_types.append(['bin', 1])
- # None.
- data_types.append(['None', None])
+ # Floats.
+ data_types.append(['float', 0.0])
+ data_types.append(['float', 1e-7])
+ data_types.append(['float', 1000000.0])
- # Integers.
- data_types.append(['int', 0])
- data_types.append(['int', 10])
- data_types.append(['int', -10])
+ # Functions.
+ data_types.append(['function', dummy_fn])
+ data_types.append(['function', dummy_fn2])
- # Binaries.
- data_types.append(['bin', 0])
- data_types.append(['bin', 1])
+ # Classes.
+ data_types.append(['class', Container])
- # Floats.
- data_types.append(['float', 0.0])
- data_types.append(['float', 1e-7])
- data_types.append(['float', 1000000.0])
+ # Class objects.
+ data_types.append(['class obj', Container()])
- # Functions.
- data_types.append(['function', dummy_fn])
- data_types.append(['function', dummy_fn2])
+ # Strings.
+ data_types.append(['str', 'a'])
+ data_types.append(['str', '10'])
- # Strings.
- data_types.append(['str', 'a'])
- data_types.append(['str', '10'])
+ # List.
+ data_types.append(['list', []])
+ data_types.append(['list', [None, None]])
- # List.
- data_types.append(['list', []])
- data_types.append(['list', [None, None]])
+ # List of integers.
+ data_types.append(['int list', [-1, 0, 1]])
- # List of integers.
- data_types.append(['int list', [-1, 0, 1]])
+ # List of floats.
+ data_types.append(['float list', [-1., 0., 1.]])
- # List of floats.
- data_types.append(['float list', [-1., 0., 1.]])
+ # List of numbers.
+ data_types.append(['number list', [-1., 0, 1.]])
- # List of numbers.
- data_types.append(['number list', [-1., 0, 1.]])
+ # List of strings.
+ data_types.append(['str list', ['a']])
+ data_types.append(['str list', ['a', 'asldfjk']])
- # List of strings.
- data_types.append(['str list', ['a']])
- data_types.append(['str list', ['a', 'asldfjk']])
+ # Tuple.
+ data_types.append(['tuple', (None, None)])
- # Tuple.
- data_types.append(['tuple', (None, None)])
-
- # Return the data type array.
- return data_types
+ # Return the data type array.
+ return data_types
Modified: 1.3/test_suite/unit_tests/prompt/test_spin.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/prompt/test_spin.py?rev=3597&r1=3596&r2=3597&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/prompt/test_spin.py (original)
+++ 1.3/test_suite/unit_tests/prompt/test_spin.py Sun Nov 18 23:13:44 2007
@@ -39,14 +39,6 @@
relax.interpreter = Container()
relax.interpreter.intro = True
-# A dummy function for testing data types.
-def dummy_fn():
- pass
-
-# A second dummy function for testing data types.
-def dummy_fn2():
- return "Hello"
-
class Test_spin(Spin_base_class, TestCase):
"""Unit tests for the functions of the 'generic_fns.spin' module."""
@@ -55,59 +47,3 @@
spin_fns = Spin(relax)
- def return_data_types(self):
- """Function for returning an array of many different Python objects.
-
- These objects are to test the correct behaviour towards the user
function arguments.
- """
-
- # Create the array.
- data_types = []
-
- # None.
- data_types.append(['None', None])
-
- # Integers.
- data_types.append(['int', 0])
- data_types.append(['int', 10])
- data_types.append(['int', -10])
-
- # Binaries.
- data_types.append(['bin', 0])
- data_types.append(['bin', 1])
-
- # Floats.
- data_types.append(['float', 0.0])
- data_types.append(['float', 1e-7])
- data_types.append(['float', 1000000.0])
-
- # Functions.
- data_types.append(['function', dummy_fn])
- data_types.append(['function', dummy_fn2])
-
- # Strings.
- data_types.append(['str', 'a'])
- data_types.append(['str', '10'])
-
- # List.
- data_types.append(['list', []])
- data_types.append(['list', [None, None]])
-
- # List of integers.
- data_types.append(['int list', [-1, 0, 1]])
-
- # List of floats.
- data_types.append(['float list', [-1., 0., 1.]])
-
- # List of numbers.
- data_types.append(['number list', [-1., 0, 1.]])
-
- # List of strings.
- data_types.append(['str list', ['a']])
- data_types.append(['str list', ['a', 'asldfjk']])
-
- # Tuple.
- data_types.append(['tuple', (None, None)])
-
- # Return the data type array.
- return data_types
r3597 - in /1.3/test_suite/unit_tests/prompt: data_types.py test_spin.py