r27405 - /trunk/test_suite/system_tests/structure.py -- January 30, 2015 - 19:46

Author: bugman
Date: Fri Jan 30 19:46:14 2015
New Revision: 27405

URL: http://svn.gna.org/viewcvs/relax?rev=27405&view=rev
Log:
Updates for the Structure.test_sequence_alignment_molecules system test.

This is required due to the changes in the backend of the 
structure.sequence_alignment user
function.


Modified:
    trunk/test_suite/system_tests/structure.py

Modified: trunk/test_suite/system_tests/structure.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/structure.py?rev=27405&r1=27404&r2=27405&view=diff
==============================================================================
--- trunk/test_suite/system_tests/structure.py  (original)
+++ trunk/test_suite/system_tests/structure.py  Fri Jan 30 19:46:14 2015
@@ -4667,16 +4667,17 @@
         self.interpreter.state.load(self.tmpfile)
 
         # The real data.
-        object_ids = ['mf', 'mf']
+        pipes = ['mf', 'mf']
         models = [1, 1]
         molecules = ['CaM A', 'CaM B']
+        ids = ["Object 'mf'; Model 1; Molecule 'CaM A'", "Object 'mf'; Model 
1; Molecule 'CaM B'"]
         sequences = [
-            
'EEEIREAFRVFDKDGNGYISAAELRHVMTNLGEKLTDEEVDEMIREADIDGDGQVNYEEFVQMMTAK***',
-            
'EEEIREAFRVFDKDGNGYISAAELRHVMTNLGEKLTDEEVDEMIREADIDGDGQVNYEEFVQMMTAK***'
+            
'EEEIREAFRVFDKDGNGYISAAELRHVMTNLGEKLTDEEVDEMIREADIDGDGQVNYEEFVQMMTAK**',
+            
'EEEIREAFRVFDKDGNGYISAAELRHVMTNLGEKLTDEEVDEMIREADIDGDGQVNYEEFVQMMTAK**'
         ]
         strings = [
-            
'EEEIREAFRVFDKDGNGYISAAELRHVMTNLGEKLTDEEVDEMIREADIDGDGQVNYEEFVQMMTAK***',
-            
'EEEIREAFRVFDKDGNGYISAAELRHVMTNLGEKLTDEEVDEMIREADIDGDGQVNYEEFVQMMTAK***'
+            
'EEEIREAFRVFDKDGNGYISAAELRHVMTNLGEKLTDEEVDEMIREADIDGDGQVNYEEFVQMMTAK**',
+            
'EEEIREAFRVFDKDGNGYISAAELRHVMTNLGEKLTDEEVDEMIREADIDGDGQVNYEEFVQMMTAK**'
         ]
         gaps = []
         for i in range(len(strings)):
@@ -4695,12 +4696,13 @@
         for i in range(2):
             print("Checking \"%s\"" % molecules[i])
             self.assertEqual(ds.sequence_alignments[0].ids[i], ids[i])
-            self.assertEqual(ds.sequence_alignments[0].object_ids[i], 
object_ids[i])
+            self.assertEqual(ds.sequence_alignments[0].object_ids[i], 
pipes[i])
             self.assertEqual(ds.sequence_alignments[0].models[i], models[i])
             self.assertEqual(ds.sequence_alignments[0].molecules[i], 
molecules[i])
             self.assertEqual(ds.sequence_alignments[0].sequences[i], 
sequences[i])
             self.assertEqual(ds.sequence_alignments[0].strings[i], 
strings[i])
-            self.assertEqual(ds.sequence_alignments[0].gaps[i], gaps[i])
+            for j in range(len(strings[0])):
+                self.assertEqual(ds.sequence_alignments[0].gaps[i, j], 
gaps[i][j])
             self.assertEqual(ds.sequence_alignments[0].msa_algorithm, 
msa_algorithm)
             self.assertEqual(ds.sequence_alignments[0].pairwise_algorithm, 
pairwise_algorithm)
             self.assertEqual(ds.sequence_alignments[0].matrix, matrix)