r25222 - in /branches/frame_order_cleanup: ./ test_suite/system_tests/structure.py -- August 22, 2014 - 16:02

Author: bugman
Date: Fri Aug 22 16:02:50 2014
New Revision: 25222

URL: http://svn.gna.org/viewcvs/relax?rev=25222&view=rev
Log:
Merged revisions 25213 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r25213 | bugman | 2014-08-22 14:09:14 +0200 (Fri, 22 Aug 2014) | 7 lines
  
  Improved data checking for all of the Structure system tests.
  
  Before looping over the structural data, the number of lines in the real 
file and the newly
  generated file are compared.  This avoids the situation whereby an empty 
file is produced,
  accidentally allowing the test to pass.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/test_suite/system_tests/structure.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 22 16:02:50 2014
@@ -1 +1 @@
-/trunk:1-25211
+/trunk:1-25213

Modified: branches/frame_order_cleanup/test_suite/system_tests/structure.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/structure.py?rev=25222&r1=25221&r2=25222&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/system_tests/structure.py   
(original)
+++ branches/frame_order_cleanup/test_suite/system_tests/structure.py   Fri 
Aug 22 16:02:50 2014
@@ -143,6 +143,7 @@
         # Check the created PDB file.
         lines = file.readlines()
         self.strip_remarks(lines)
+        self.assertEqual(len(contents), len(lines))
         for i in range(len(lines)):
             self.assertEqual(contents[i], lines[i])
 
@@ -204,6 +205,7 @@
         # Check the created PDB file.
         lines = file.readlines()
         self.strip_remarks(lines)
+        self.assertEqual(len(contents), len(lines))
         for i in range(len(lines)):
             self.assertEqual(contents[i], lines[i])
 
@@ -3359,6 +3361,7 @@
 
         # Check the data.
         self.strip_remarks(lines)
+        self.assertEqual(len(real_data), len(lines))
         for i in range(len(real_data)):
             self.assertEqual(real_data[i], lines[i])
 
@@ -3637,6 +3640,7 @@
         # Check the created PDB file.
         lines = file.readlines()
         self.strip_remarks(lines)
+        self.assertEqual(len(result), len(lines))
         for i in range(len(lines)):
             self.assertEqual(result[i]+'\n', lines[i])
 
@@ -3694,6 +3698,7 @@
         # Check the created PDB file.
         lines = file.readlines()
         self.strip_remarks(lines)
+        self.assertEqual(len(result), len(lines))
         for i in range(len(lines)):
             self.assertEqual(result[i]+'\n', lines[i])
 
@@ -3767,5 +3772,6 @@
         # Check the created PDB file.
         lines = file.readlines()
         self.strip_remarks(lines)
+        self.assertEqual(len(result), len(lines))
         for i in range(len(lines)):
             self.assertEqual(result[i]+'\n', lines[i])