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

[<lol...@us...>]

Revision: 896
          http://treebase.svn.sourceforge.net/treebase/?rev=896&view=rev
Author:   loloyohe
Date:     2011-06-02 19:55:09 +0000 (Thu, 02 Jun 2011)

Log Message:
-----------


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-02 15:58:44 UTC (rev 895)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/NexmlMatrixConverterTest.java	2011-06-02 19:55:09 UTC (rev 896)
@@ -4,7 +4,10 @@
 
 import org.cipres.treebase.dao.AbstractDAOTest;
 import org.cipres.treebase.domain.matrix.CharacterMatrix;
+import org.cipres.treebase.domain.matrix.Matrix;
+import org.cipres.treebase.domain.matrix.StandardMatrix;
 import org.cipres.treebase.domain.nexus.nexml.NexmlMatrixConverter;
+import org.cipres.treebase.domain.nexus.nexml.NexmlDocumentConverter;
 import org.cipres.treebase.domain.nexus.NexusDataSet;
 import org.cipres.treebase.domain.study.Study;
 import org.cipres.treebase.domain.taxon.TaxonLabelHome;
@@ -29,8 +32,11 @@
 		NexusDataSet nexusDataSet = new NexusDataSet();
 		
 		Document doc = DocumentFactory.safeCreateDocument();
+		NexmlDocumentConverter ndc = new NexmlDocumentConverter(study,getTaxonLabelHome(),doc);
+		NexmlMatrixConverter nmc = new NexmlMatrixConverter (study,getTaxonLabelHome(),ndc.fromTreeBaseToXml(study));
+		nexusDataSet = ndc.fromXmlToTreeBase(doc);
 		nexusDataSet.setNexmlProject(doc);
-		NexmlMatrixConverter nmc = new NexmlMatrixConverter(study,getTaxonLabelHome(),doc);
+		
 		for (org.cipres.treebase.domain.matrix.Matrix matrix : nexusDataSet.getMatrices() ) {
 			if ( matrix instanceof CharacterMatrix ) {
 				//fromTreeBaseToXml(CharacterMatrix) is main method being tested here--it uses populateXmlMatrix() function
@@ -38,7 +44,11 @@
 				System.out.println(xml);
 				Assert.assertNotNull(xml);
 			}
+			else {
+				System.out.println("im not working");
+			}
 		}
+		
 		//signal that test is over
 		if (logger.isInfoEnabled()) {
 			logger.info(testName + " - end ");


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