[Treebase-guts] SF.net SVN: treebase:[922] trunk/treebase-core/src/test/java/org/cipres/ treebase/domain/nexus/NexmlMatrixConverterTest.java

[<rv...@us...>]

Revision: 922
          http://treebase.svn.sourceforge.net/treebase/?rev=922&view=rev
Author:   rvos
Date:     2011-06-17 15:30:21 +0000 (Fri, 17 Jun 2011)

Log Message:
-----------
Slight re-ordering.

Modified Paths:
--------------
    trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/NexmlMatrixConverterTest.java

Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/NexmlMatrixConverterTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/NexmlMatrixConverterTest.java	2011-06-17 14:00:40 UTC (rev 921)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/NexmlMatrixConverterTest.java	2011-06-17 15:30:21 UTC (rev 922)
@@ -188,6 +188,13 @@
 							Subset nexSubset = nexMatrix.getSubset(tbCharSet.getLabel());
 							Assert.assertNotNull("If NexmlMatrixConverter works correctly, a Subset is returned", nexSubset);							
 						
+							//get names of TreeBASE and NeXML character set
+							String tbCharSetName = tbCharSet.getLabel();
+							String nexCharSetName = nexSubset.getLabel();
+								
+							//verify that the names are the same
+							Assert.assertEquals("The NeXML character set must have copied the label of the TreeBASE character set",tbCharSetName,nexCharSetName);							
+							
 							// the coordinates of the character set are defined by a collection of column ranges that we iterate over
 							Collection<ColumnRange> tbColumnRanges = tbCharSet.getColumns(tbCharacterMatrix);
 						
@@ -208,14 +215,7 @@
 								}
 								
 								// The NexmlMatrixConverter should have created a Subset for each tbCharSet
-								if ( null != nexSubset ) {
-									
-									//get names of TreeBASE and NeXML character set
-									String tbCharSetName = tbCharSet.getLabel();
-									String nexCharSetName = nexSubset.getLabel();
-										
-									//verify that the names are the same
-									Assert.assertTrue("The NeXML character set must have copied the label of the TreeBASE character set",tbCharSetName.equals(nexCharSetName));										
+								if ( null != nexSubset ) {																		
 								
 									// now we iterate over the coordinates in this column range
 									//and verify whether correct character objects are returned


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.