[CIShell-SVN] SF.net SVN: cishell: [499] trunk/testing/org.cishell.testing. convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm /ConverterTesterAlgorithm.java

[<mwl...@us...>]

Revision: 499
          http://cishell.svn.sourceforge.net/cishell/?rev=499&view=rev
Author:   mwlinnem
Date:     2007-08-30 12:09:19 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
Major refactoring. Many little changes.

Modified Paths:
--------------
    trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java

Modified: trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java	2007-08-30 19:08:56 UTC (rev 498)
+++ trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java	2007-08-30 19:09:19 UTC (rev 499)
@@ -52,13 +52,13 @@
     }
 
     public Data[] execute() {
-    	
     	this.log.log(LogService.LOG_INFO, 
-    			"-------NOTICE-------" +                       "\n" + 	
+    			                                               "\r\n" +
+    			"-------NOTICE-------" +                       "\r\n" + 	
     			"The Converter Tester will take " +
-    			"approximately 30 seconds to run all the tests. \n" +
-    			"Thank you for waiting :)" +                   "\n" +
-    			"-----END NOTICE-----");
+    			"approximately 30 seconds to run all the tests. \r\n" +
+    			"Thank you for waiting :)" +                   "\r\n" +
+    			"-----END NOTICE-----                           \r\n");
     	
     	Data[] returnDM;
 
@@ -107,22 +107,18 @@
     				//get all the converters
 		   			ServiceReference[] convRefs = getConverterReferences();
 		   			
-		   			//generate converter paths inside converter graph, for use in executing the test
-		   			ConverterGraph converterGraph = new ConverterGraph(convRefs, bContext, log);
+
 		   			
-		   			//extract converter graph in nwb file format.
-		   			File nwbGraph = converterGraph.asNWB();
-		   			
 		   			//initialize all the report generators
 		   			
 		   			AllTestsReportGenerator allGen     = new AllTestsReportGenerator(this.log);
 		   			AllConvsReportGenerator allConvGen = new AllConvsReportGenerator(this.log);
-		   			GraphReportGenerator    graphGen   = new GraphReportGenerator(nwbGraph, this.log);
+		   			GraphReportGenerator    graphGen   = new GraphReportGenerator(this.log);
 		   			ReadMeReportGenerator   readmeGen  = new ReadMeReportGenerator();
 		   			
 		   			//execute the tests, and provide the results to the report generators
 		   			ConverterTester2 ct = new ConverterTester2(log);
-		   			ct.execute(converterGraph,
+		   			ct.execute(convRefs,
 		   					new ReportGenerator[] 
 		   					   {allGen, allConvGen, graphGen, readmeGen},
 		   					cContext, bContext);
@@ -184,6 +180,7 @@
 		   			addReturn(graphReport);
     		} catch (Exception e) {
     			this.log.log(LogService.LOG_ERROR, "Converter Tester Failed.", e);
+    			e.printStackTrace();
     		}
     }
     	


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