r26253 - /trunk/test_suite/gui_tests/test_user_functions.py -- October 13, 2014 - 14:11

Author: bugman
Date: Mon Oct 13 14:11:03 2014
New Revision: 26253

URL: http://svn.gna.org/viewcvs/relax?rev=26253&view=rev
Log:
Improved the feedback in the User_functions.test_structure_add_atom system 
test.

It is now clearer what the input and output data is.


Modified:
    trunk/test_suite/gui_tests/test_user_functions.py

Modified: trunk/test_suite/gui_tests/test_user_functions.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/test_user_functions.py?rev=26253&r1=26252&r2=26253&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/test_user_functions.py   (original)
+++ trunk/test_suite/gui_tests/test_user_functions.py   Mon Oct 13 14:11:03 
2014
@@ -23,6 +23,7 @@
 
 # Python module imports.
 from os import sep
+import sys
 
 # relax module imports.
 from status import Status; status = Status()
@@ -211,21 +212,25 @@
         #self.assertEqual(pos[2], None)
 
         # Set the pos to nothing in the wizard, open the Sequence window, 
close the window, and check that None comes back.
-        uf.page.uf_args['pos'].SetValue(str_to_gui(''))
+        val = ''
+        sys.stdout.write("Value: %40s;  " % repr(val))
+        uf.page.uf_args['pos'].SetValue(str_to_gui(val))
         uf.page.uf_args['pos'].selection_win_show()
         uf.page.uf_args['pos'].selection_win_data()
         pos = uf.page.uf_args['pos'].GetValue()
-        print("Pos:  %s" % pos)
+        sys.stdout.write("Return: %40s\n" % repr(pos))
         self.assertEqual(pos, None)
 
         # Set a valid pos in the wizard, open and close the Sequence window 
(twice), and check that the pos comes back.
-        uf.page.uf_args['pos'].SetValue(str_to_gui('[1, 2, -3.]'))
+        val = '[1, 2, -3.]'
+        sys.stdout.write("Value: %40s;  " % repr(val))
+        uf.page.uf_args['pos'].SetValue(str_to_gui(val))
         uf.page.uf_args['pos'].selection_win_show()
         uf.page.uf_args['pos'].selection_win_data()
         uf.page.uf_args['pos'].selection_win_show()
         uf.page.uf_args['pos'].selection_win_data()
         pos = uf.page.uf_args['pos'].GetValue()
-        print("Pos:  %s" % pos)
+        sys.stdout.write("Return: %40s\n" % repr(pos))
         self.assertEqual(len(pos), 3)
         self.assertEqual(pos[0], 1.0)
         self.assertEqual(pos[1], 2.0)
@@ -233,22 +238,24 @@
 
         # Set the pos to a number of invalid values, checking that they are 
ignored.
         for val in ['die', '[1, 2, 3', '[[1, 2, 3], 1, 2, 3], [1, 2, 3]]']:
+            sys.stdout.write("Value: %40s;  " % repr(val))
             uf.page.uf_args['pos'].SetValue(str_to_gui(val))
             uf.page.uf_args['pos'].selection_win_show()
             uf.page.uf_args['pos'].selection_win_data()
             pos = uf.page.uf_args['pos'].GetValue()
-            print("Invalid pos: %s\nPos:  %s" % (val, pos))
+            sys.stdout.write("Return: %40s\n" % repr(pos))
             self.assertEqual(pos, None)
 
         # Set the Sequence elements to invalid values.
         for val in ['x']:
+            sys.stdout.write("Value: %40s;  " % repr(val))
             uf.page.uf_args['pos'].SetValue(str_to_gui(''))
             uf.page.uf_args['pos'].selection_win_show()
             uf.page.uf_args['pos'].sel_win.sequence.SetStringItem(index=1, 
col=1, label=str_to_gui(val))
             uf.page.uf_args['pos'].sel_win.sequence.SetStringItem(index=0, 
col=1, label=int_to_gui(1))
             uf.page.uf_args['pos'].selection_win_data()
             pos = uf.page.uf_args['pos'].GetValue()
-            print("Pos:  %s" % pos)
+            sys.stdout.write("Return: %40s\n" % repr(pos))
             #self.assertEqual(len(pos), 3)
             self.assertEqual(pos[0], 1.0)
             #self.assertEqual(pos[1], None)