[CIShell-SVN] SF.net SVN: cishell: [625] trunk/testing/org.cishell.testing. convertertester.algorithm

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

Revision: 625
          http://cishell.svn.sourceforge.net/cishell/?rev=625&view=rev
Author:   mwlinnem
Date:     2008-02-15 17:04:29 -0800 (Fri, 15 Feb 2008)

Log Message:
-----------
Changes for converted data.

Modified Paths:
--------------
    trunk/testing/org.cishell.testing.convertertester.algorithm/META-INF/MANIFEST.MF
    trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java

Modified: trunk/testing/org.cishell.testing.convertertester.algorithm/META-INF/MANIFEST.MF
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.algorithm/META-INF/MANIFEST.MF	2008-02-13 15:14:14 UTC (rev 624)
+++ trunk/testing/org.cishell.testing.convertertester.algorithm/META-INF/MANIFEST.MF	2008-02-16 01:04:29 UTC (rev 625)
@@ -9,7 +9,14 @@
  org.cishell.framework,
  org.cishell.framework.algorithm,
  org.cishell.framework.data,
+ org.cishell.reference.app.service.datamanager,
+ org.cishell.reference.app.service.scheduler,
  org.cishell.reference.gui.common,
+ org.cishell.reference.gui.datamanager,
+ org.cishell.reference.gui.guibuilder.swt,
+ org.cishell.reference.gui.scheduler,
+ org.cishell.reference.gui.workspace,
+ org.cishell.reference.service.conversion,
  org.cishell.reference.service.metatype,
  org.cishell.service.conversion,
  org.cishell.service.guibuilder,

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	2008-02-13 15:14:14 UTC (rev 624)
+++ trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java	2008-02-16 01:04:29 UTC (rev 625)
@@ -24,6 +24,7 @@
 import org.cishell.testing.convertertester.core.tester2.reportgen.reports.AllErrorReport;
 import org.cishell.testing.convertertester.core.tester2.reportgen.reports.AllTestsReport;
 import org.cishell.testing.convertertester.core.tester2.reportgen.reports.ConvReport;
+import org.cishell.testing.convertertester.core.tester2.reportgen.reports.ConvertedDataReport;
 import org.cishell.testing.convertertester.core.tester2.reportgen.reports.FilePassReport;
 import org.cishell.testing.convertertester.core.tester2.reportgen.reports.ReadMeReport;
 import org.cishell.testing.convertertester.core.tester2.reportgen.reports.TestReport;
@@ -266,7 +267,9 @@
     	 * @param report the report to be returned from this algorithm
     	 */
         private void addReturn(Data report) {
-        	this.returnList.add(report);
+        	if (report != null) {
+        		this.returnList.add(report);
+        	}
         }
         
         
@@ -292,6 +295,14 @@
     					Data fpData = createReportData(fpFile, fp.getName(),
     							testReportData);
     					addReturn(fpData);
+    					ConvertedDataReport[] cdrs = fp.getConvertedDataReports();
+    					if (cdrs != null) {
+    					for (int mm = 0; mm < cdrs.length; mm++) {
+    						File cdrFile = cdrs[mm].getReport();
+    						Data cdrData = createReportData(cdrFile, cdrs[mm].getName(), fpData);
+    						addReturn(cdrData);
+    					}
+    					}
     				}
     				
     				FilePassReport[] fFilePassReports = 
@@ -302,6 +313,14 @@
     					Data fpData = createReportData(fpFile, fp.getName(),
     							testReportData);
     					addReturn(fpData);
+    					ConvertedDataReport[] cdrs = fp.getConvertedDataReports();
+    					if (cdrs != null) {
+    					for (int mm = 0; mm < cdrs.length; mm++) {
+    						File cdrFile = cdrs[mm].getReport();
+    						Data cdrData = createReportData(cdrFile, cdrs[mm].getName(), fpData);
+    						addReturn(cdrData);
+    					}
+    					}
     				}
     			}
         }
@@ -323,6 +342,13 @@
         		Data parent, String format, String type) {
         	Data reportData = new BasicData(report, format);
 			Dictionary metadata = reportData.getMetaData();
+			if (label == null) {
+				label = "no label";
+			}
+			
+			if (type == null) {
+				type = "No type";
+			}
 			metadata.put(DataProperty.LABEL, label);
 			metadata.put(DataProperty.TYPE, type);
 			if (parent != null) {


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