[CIShell-SVN] SF.net SVN: cishell: [475] trunk/testing/org.cishell.testing. convertertester.core.new/src/org/cishell/testing/convertertester/core/ tester2/reportgen/alltests

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

Revision: 475
          http://cishell.svn.sourceforge.net/cishell/?rev=475&view=rev
Author:   mwlinnem
Date:     2007-08-16 13:09:25 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
Information previous in File Pass Reports is not incorporated into Test Reports.

Modified Paths:
--------------
    trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/FilePassSubGenerator.java
    trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/TestReportSubGenerator.java

Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/FilePassSubGenerator.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/FilePassSubGenerator.java	2007-08-15 23:04:17 UTC (rev 474)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/FilePassSubGenerator.java	2007-08-16 20:09:25 UTC (rev 475)
@@ -27,27 +27,15 @@
 			
 			boolean succeeded = fpr.succeeded();
 			
-			String summary = null;
 			if (succeeded) {
-				summary = "Succeeded";
-				report.println(summary);
+				report.println("Succeeded");
 			} else {
-				summary = "Failed";
-				report.println(summary);
+				report.println("Failed");
 			}
 			
-			report.println("");
-			report.println("File used   : " + fpr.getOriginalFileLabel());
+			writeReport(report, fpr);
 			
-			if (! fpr.getExplanation().trim().equals("")) {
-				report.println("Explanation :" + fpr.getExplanation());
-			}
-			
-			report.println("");
-			
-			report.flush();
-			
-			
+			String summary = "";
 			this.filePassReport = new FilePassReport(reportFile, fpr.getName(),
 					summary);
 			
@@ -59,6 +47,8 @@
 			closeStream(reportOutStream);
 		}
 		
+
+
 		
 	}
 	
@@ -66,6 +56,20 @@
 		return this.filePassReport;
 	}
 	
+	public void writeReport(PrintStream report, FilePassResult fpr) {
+		
+		report.println("");
+		report.println("File used   : " + fpr.getOriginalFileLabel());
+		
+		if (! fpr.getExplanation().trim().equals("")) {
+			report.println("Explanation :" + fpr.getExplanation());
+		}
+		
+		report.println("");
+		
+		report.flush();
+	}
+	
 	private void closeStream(FileOutputStream stream) {
 		try {
 			if (stream != null)

Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/TestReportSubGenerator.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/TestReportSubGenerator.java	2007-08-15 23:04:17 UTC (rev 474)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/TestReportSubGenerator.java	2007-08-16 20:09:25 UTC (rev 475)
@@ -43,13 +43,6 @@
 			
 			float percentSuccessful = tr.getNumFilePassSuccesses() / tr.getNumFilePasses();
 			
-//			name them all
-//			FilePassResult[] allFPs = tr.getFilePassResults();
-//			for (int ii = 0; ii < allFPs.length; ii++) {
-//				FilePassResult fp = allFPs[ii];			
-//				fp.setName("Pass " + ii + " of " + tr.getName() + " . ");
-//			}
-			
 			report.println("");
 			report.println("---------------");
 			report.println("");
@@ -79,7 +72,8 @@
 			for (int ii = 0; ii < successfulFPs.length; ii++) {
 				FilePassResult successfulFP = successfulFPs[ii];
 				namePass("Successful", successfulFP, tr, ii);
-				report.println("  " + successfulFP.getName() + successfulFP.getShortSummary());
+				report.println(successfulFP.getName() + successfulFP.getShortSummary());
+				filePassSubGen.writeReport(report, successfulFP);
 			}
 			report.println("");
 			
@@ -88,7 +82,10 @@
 			for (int ii = 0; ii < failedFPs.length; ii++) {
 				FilePassResult failedFP = failedFPs[ii];
 				namePass("Failed", failedFP, tr, ii);
-				report.println("  " + failedFP.getName() + failedFP.getShortSummary());
+				report.println("--------");
+				report.println(failedFP.getName() + failedFP.getShortSummary());
+				filePassSubGen.writeReport(report, failedFP);
+				report.println("");
 			}
 			report.println("");
 			
@@ -115,8 +112,10 @@
 //			String summary = "%" + percentSuccessful + " Successful";
 			String summary = "";
 			this.testReport = new TestReport(reportFile, tr.getName(),
-				(FilePassReport[]) successfulFPReports.toArray(new FilePassReport[0]),
-				(FilePassReport[]) failedFPReports.toArray(new FilePassReport[0]),
+					new FilePassReport[0],
+					new FilePassReport[0],
+//				(FilePassReport[]) successfulFPReports.toArray(new FilePassReport[0]),
+//				(FilePassReport[]) failedFPReports.toArray(new FilePassReport[0]),
 				summary);
 					
 			


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