Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell: [626] trunk/testing/org.cishell.testing. convertertester.core.new
|
From: <mwl...@us...> - 2008-02-16 01:20:01
|
Revision: 626
http://cishell.svn.sourceforge.net/cishell/?rev=626&view=rev
Author: mwlinnem
Date: 2008-02-15 17:19:53 -0800 (Fri, 15 Feb 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/testing/org.cishell.testing.convertertester.core.new/META-INF/MANIFEST.MF
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConverterTester2.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/DefaultTestRunner.java
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
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/reports/FilePassReport.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/reports/TestReport.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/FilePassResult.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/filepass/FilePassFailure.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/filepass/FilePassSuccess.java
Added Paths:
-----------
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/ConvertedDataSubGenerator.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/reports/ConvertedDataReport.java
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/META-INF/MANIFEST.MF
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/META-INF/MANIFEST.MF 2008-02-16 01:04:29 UTC (rev 625)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/META-INF/MANIFEST.MF 2008-02-16 01:19:53 UTC (rev 626)
@@ -4,7 +4,6 @@
Bundle-SymbolicName: org.cishell.testing.convertertester.core.new
Bundle-Version: 0.0.1
Bundle-ClassPath: .
-Bundle-Localization: plugin
Import-Package: org.cishell.framework,
org.cishell.framework.algorithm,
org.cishell.framework.data,
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConverterTester2.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConverterTester2.java 2008-02-16 01:04:29 UTC (rev 625)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConverterTester2.java 2008-02-16 01:19:53 UTC (rev 626)
@@ -117,8 +117,6 @@
CIShellContext cContext,
BundleContext bContext) {
-
-
Map fileFormatToTestConvs = convGraph.getTestMap();
Map fileFormatToCompareConvs = convGraph.getCompareMap();
@@ -156,6 +154,7 @@
if (filteredTestConvs != null &&
compareConv != null) {
for (int kk = 0; kk < filteredTestConvs.length; kk++) {
+ System.out.println("Running converter path " + kk);
numTestsSoFar++;
ConverterPath testConv = filteredTestConvs[kk];
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/DefaultTestRunner.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/DefaultTestRunner.java 2008-02-16 01:04:29 UTC (rev 625)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/DefaultTestRunner.java 2008-02-16 01:19:53 UTC (rev 626)
@@ -6,11 +6,14 @@
import java.io.StringWriter;
import java.io.Writer;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;
import org.cishell.framework.data.BasicData;
import org.cishell.framework.data.Data;
+import org.cishell.framework.data.DataProperty;
import org.cishell.testing.convertertester.core.converter.graph.Converter;
import org.cishell.testing.convertertester.core.converter.graph.ConverterPath;
import org.cishell.testing.convertertester.core.tester.graphcomparison.ComparisonResult;
@@ -40,7 +43,7 @@
ConverterPath testConverters = testData.getTestConverters();
ConverterPath comparisonConverters = testData
.getComparisonConverters();
-
+
List testResults = new ArrayList();
for (int ii = 0; ii < testFileData.length; ii++) {
@@ -49,40 +52,45 @@
// test conversion phase
ConvertResult testPhaseResult = convert(originalFileData,
- testConverters, testData);
+ testConverters, testData, null);
if (!testPhaseResult.succeeded()) {
FilePassFailure failure = createFailResult(originalFileData,
PassPhase.TEST_CONV_PHASE,
- testPhaseResult.getFailInfo());
+ testPhaseResult.getFailInfo(),
+ testPhaseResult.getAllData());
testResults.add(failure);
continue;
}
Data[] resultFileData = testPhaseResult.getResult();
+ Data[][] allDataFromTestPhase = testPhaseResult.getAllData();
// comparison conversion (for original file) phase
ConvertResult comparePhaseOrigResult = convert(originalFileData,
- comparisonConverters, testData);
+ comparisonConverters, testData, allDataFromTestPhase);
if (!comparePhaseOrigResult.succeeded()) {
FilePassFailure failure = createFailResult(originalFileData,
PassPhase.COMPARE_CONV_ORIG_PHASE,
- comparePhaseOrigResult.getFailInfo());
+ comparePhaseOrigResult.getFailInfo(),
+ comparePhaseOrigResult.getAllData());
testResults.add(failure);
continue;
}
Data[] originalInMemory = comparePhaseOrigResult.getResult();
-
+ Data[][] allDataFromTestAndComparisonPhases = comparePhaseOrigResult.getAllData();
+
//comparison conversion (for result file) phase
ConvertResult comparePhaseResultResult = convert(resultFileData,
- comparisonConverters, testData);
+ comparisonConverters, testData, allDataFromTestAndComparisonPhases);
if (!comparePhaseResultResult.succeeded()) {
FilePassFailure failure = createFailResult(originalFileData,
PassPhase.COMPARE_CONV_RESULT_PHASE,
- comparePhaseResultResult.getFailInfo());
+ comparePhaseResultResult.getFailInfo(),
+ comparePhaseResultResult.getAllData());
testResults.add(failure);
continue;
}
@@ -102,13 +110,14 @@
graphComparisonPhaseResult.getLog();
FilePassFailure failure = createFailResult(originalFileData,
explanation, PassPhase.GRAPH_COMPARE_PHASE,
- null);
+ null,
+ comparePhaseResultResult.getAllData());
testResults.add(failure);
continue;
}
FilePassSuccess success = new FilePassSuccess(originalFileData,
- "");
+ "", comparePhaseResultResult.getAllData());
testResults.add(success);
}
@@ -118,10 +127,18 @@
}
private ConvertResult convert(Data[] startData,
- ConverterPath converters, TestConfigData testData) {
+ ConverterPath converters, TestConfigData testData, Data[][] previousData) {
Data[] currentData = getFilePathData(startData);
+ List dataSoFar = new ArrayList();
+ if (previousData != null) {
+ dataSoFar.addAll(Arrays.asList(previousData));
+ }
+
+ if (startData != null) {
+ dataSoFar.add(startData);
+ }
/*
* rig up fake CISHellContext so we can get ahold of
* errors sent to logger.
@@ -129,16 +146,24 @@
FakeLogCIShellContext fakeCContext =
new FakeLogCIShellContext(testData.getContext());
+
+
+ dataSoFar.add(currentData);
+
Converter currentConverter = null;
try {
for (int ii = 0; ii < converters.size(); ii++) {
currentConverter = converters.get(ii);
-
//no parameters used
Hashtable parameters = new Hashtable();
currentData = currentConverter.execute(currentData,
parameters, fakeCContext);
+
+ if (currentData != null) {
+ setMetaData(currentData, currentConverter);
+ dataSoFar.add(currentData);
+ }
/*
* There are two ways that converters generally fail.
@@ -164,34 +189,34 @@
ConvFailureInfo failInfo = new ConvFailureInfo(
explanation, converter);
- ConvertResult result = new ConvertResult(failInfo);
+ ConvertResult result = new ConvertResult(failInfo, (Data[][]) dataSoFar.toArray(new Data[dataSoFar.size()][]));
return result;
}
}
} catch (Throwable t) {
ConvFailureInfo failInfo = new ConvFailureInfo(getStackTrace(t),
currentConverter);
- ConvertResult result = new ConvertResult(failInfo);
+ ConvertResult result = new ConvertResult(failInfo,(Data[][]) dataSoFar.toArray(new Data[dataSoFar.size()][]));
return result;
}
Data[] resultData = currentData;
- ConvertResult result = new ConvertResult(resultData);
+ ConvertResult result = new ConvertResult(resultData,(Data[][]) dataSoFar.toArray(new Data[dataSoFar.size()][]));
return result;
}
private FilePassFailure createFailResult(Data[] origData,
String explanation, PassPhase lastReachedPhase,
- Converter failedConverter) {
+ Converter failedConverter, Data[][] allData) {
FilePassFailure failure = new FilePassFailure(origData, explanation,
- lastReachedPhase, failedConverter);
+ lastReachedPhase, failedConverter, allData);
return failure;
}
private FilePassFailure createFailResult(Data[] origData,
- PassPhase lastReachedPhase, ConvFailureInfo failInfo) {
+ PassPhase lastReachedPhase, ConvFailureInfo failInfo, Data[][] allData) {
return createFailResult(origData, failInfo.getExplanation(),
- lastReachedPhase, failInfo.getFailedConverter());
+ lastReachedPhase, failInfo.getFailedConverter(), allData);
}
private class ConvertResult {
@@ -199,18 +224,20 @@
private boolean succeeded;
private Data[] result;
+
+ private Data[][] allData;
private ConvFailureInfo failInfo;
- public ConvertResult(Data[] result) {
+ public ConvertResult(Data[] result, Data[][] allData) {
this.result = result;
-
+ this.allData = allData;
this.succeeded = true;
}
- public ConvertResult(ConvFailureInfo failInfo) {
+ public ConvertResult(ConvFailureInfo failInfo, Data[][] allData) {
this.failInfo = failInfo;
-
+ this.allData = allData;
this.succeeded = false;
}
@@ -221,6 +248,10 @@
public Data[] getResult() {
return result;
}
+
+ public Data[][] getAllData() {
+ return this.allData;
+ }
public ConvFailureInfo getFailInfo() {
return this.failInfo;
@@ -271,4 +302,16 @@
return logText;
}
+
+ private void setMetaData(Data[] data, Converter converter) {
+ if (data == null || data.length < 1) {
+ return;
+ }
+
+ Data datum = data[0];
+ Dictionary md = datum.getMetaData();
+ if (md.get(DataProperty.LABEL) == null) {
+ md.put(DataProperty.LABEL, "result of " + converter.getShortName());
+ }
+ }
}
Added: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/ConvertedDataSubGenerator.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/ConvertedDataSubGenerator.java (rev 0)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/ConvertedDataSubGenerator.java 2008-02-16 01:19:53 UTC (rev 626)
@@ -0,0 +1,59 @@
+package org.cishell.testing.convertertester.core.tester2.reportgen.alltests;
+
+import java.io.File;
+import java.io.PrintStream;
+
+import org.cishell.framework.data.Data;
+import org.cishell.framework.data.DataProperty;
+import org.cishell.testing.convertertester.core.tester2.reportgen.reports.ConvertedDataReport;
+import org.cishell.testing.convertertester.core.tester2.reportgen.results.FilePassResult;
+import org.cishell.testing.convertertester.core.tester2.reportgen.results.TestResult;
+import org.osgi.service.log.LogService;
+
+public class ConvertedDataSubGenerator {
+private ConvertedDataReport convertedDataReport;
+
+ private LogService log;
+
+ public ConvertedDataSubGenerator(LogService log) {
+ this.log = log;
+ }
+
+ public void generateSubreport(TestResult tr, FilePassResult fpr, Data[] convertedData) {
+ if (convertedData.length == 0) {
+ return;
+ }
+
+ Data firstData = convertedData[0];
+ Object fileData = firstData.getData();
+ if (fileData != null && fileData instanceof File) {
+ this.convertedDataReport = new ConvertedDataReport((File) fileData,(String) firstData.getMetaData().get(DataProperty.LABEL) + "for " + fpr.getName());
+ } else {
+ this.convertedDataReport = new ConvertedDataReport((String) firstData.getMetaData().get(DataProperty.LABEL) + " for " + fpr.getName() + " of " + tr.getName());
+ }
+ }
+
+ public ConvertedDataReport getReport() {
+ return this.convertedDataReport;
+ }
+
+ public void writeReport(PrintStream report, FilePassResult fpr) {
+
+ report.println("");
+ report.println("File used : " + fpr.getOriginalFileLabel());
+
+ report.println("");
+ if (! fpr.getExplanation().trim().equals("")) {
+
+ if (fpr.failedWhileConverting()) {
+ report.println("Failed at " + fpr.getFailedConverter());
+ }
+
+ report.println("Explanation... \r\n" + fpr.getExplanation());
+ }
+
+ report.println("");
+
+ report.flush();
+ }
+}
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 2008-02-16 01:04:29 UTC (rev 625)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/FilePassSubGenerator.java 2008-02-16 01:19:53 UTC (rev 626)
@@ -5,23 +5,28 @@
import java.io.IOException;
import java.io.PrintStream;
+import org.cishell.framework.data.Data;
import org.cishell.testing.convertertester.core.tester2.reportgen.ReportGenerator;
+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.results.FilePassResult;
-import org.cishell.testing.convertertester.core.tester2.reportgen.results.filepass.PassPhase;
+import org.cishell.testing.convertertester.core.tester2.reportgen.results.TestResult;
import org.osgi.service.log.LogService;
public class FilePassSubGenerator {
private FilePassReport filePassReport;
+ private ConvertedDataSubGenerator convDataSubGenerator;
+
private LogService log;
public FilePassSubGenerator(LogService log) {
this.log = log;
+ this.convDataSubGenerator = new ConvertedDataSubGenerator(log);
}
- public void generateSubreport(FilePassResult fpr) {
+ public void generateSubreport(TestResult tr, FilePassResult fpr) {
FileOutputStream reportOutStream = null;
try {
File reportFile = new File(ReportGenerator.TEMP_DIR + fpr.getName());
@@ -42,8 +47,20 @@
writeReport(report, fpr);
- this.filePassReport = new FilePassReport(reportFile, fpr.getName());
+ Data[][] allData = fpr.getAllData();
+ ConvertedDataReport[] convDataReports = null;
+ if (allData != null) {
+ convDataReports = new ConvertedDataReport[allData.length];
+
+ for (int ii = 0; ii < allData.length; ii++) {
+ Data[] data = allData[ii];
+ convDataSubGenerator.generateSubreport(tr, fpr, data);
+ convDataReports[ii] =convDataSubGenerator.getReport();
+ }
+ }
+ this.filePassReport = new FilePassReport(reportFile, fpr.getName() + " for " + tr.getName(), convDataReports);
+
} catch (IOException e) {
this.log.log(LogService.LOG_ERROR,
"Unable to generate file pass report.", e);
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 2008-02-16 01:04:29 UTC (rev 625)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/TestReportSubGenerator.java 2008-02-16 01:19:53 UTC (rev 626)
@@ -33,7 +33,7 @@
public void generateSubreport(TestResult tr) {
FileOutputStream reportOutStream = null;
try {
- File reportFile = new File(ReportGenerator.TEMP_DIR + tr.getName());
+ File reportFile = new File(ReportGenerator.TEMP_DIR + tr.getName() + " for " + tr.getName());
reportOutStream = new FileOutputStream(reportFile);
PrintStream report = new PrintStream(reportOutStream);
@@ -102,7 +102,7 @@
for (int ii = 0; ii < successfulFPs.length; ii++) {
FilePassResult successfulFP = successfulFPs[ii];
- filePassSubGen.generateSubreport(successfulFP);
+ filePassSubGen.generateSubreport(tr, successfulFP);
FilePassReport filePassReport = filePassSubGen.getFilePassReport();
successfulFPReports.add(filePassReport);
@@ -112,15 +112,14 @@
for (int ii = 0; ii < failedFPs.length; ii++) {
FilePassResult failedFP = failedFPs[ii];
- filePassSubGen.generateSubreport(failedFP);
+ filePassSubGen.generateSubreport(tr, failedFP);
FilePassReport filePassReport = filePassSubGen.getFilePassReport();
failedFPReports.add(filePassReport);
}
- //TODO: remove file pass reports
this.testReport = new TestReport(reportFile, tr.getNameWithSuccess(),
- new FilePassReport[0],
- new FilePassReport[0]);
+ (FilePassReport[]) successfulFPReports.toArray(new FilePassReport[successfulFPReports.size()]),
+ (FilePassReport[]) failedFPReports.toArray(new FilePassReport[failedFPReports.size()]));
} catch (IOException e) {
Added: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/reports/ConvertedDataReport.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/reports/ConvertedDataReport.java (rev 0)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/reports/ConvertedDataReport.java 2008-02-16 01:19:53 UTC (rev 626)
@@ -0,0 +1,27 @@
+package org.cishell.testing.convertertester.core.tester2.reportgen.reports;
+
+import java.io.File;
+
+public class ConvertedDataReport implements Report {
+
+ private String name;
+ private File report;
+
+ public ConvertedDataReport (File report, String name) {
+ this.report = report;
+ this.name = name;
+ }
+
+ public ConvertedDataReport(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public File getReport() {
+ return report;
+ }
+
+}
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/reports/FilePassReport.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/reports/FilePassReport.java 2008-02-16 01:04:29 UTC (rev 625)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/reports/FilePassReport.java 2008-02-16 01:19:53 UTC (rev 626)
@@ -8,9 +8,12 @@
private String name;
- public FilePassReport (File filePassReport, String name) {
+ private ConvertedDataReport[] convertedDataReports;
+
+ public FilePassReport (File filePassReport, String name, ConvertedDataReport[] convertedDataReports) {
this.filePassReport = filePassReport;
this.name = name;
+ this.convertedDataReports = convertedDataReports;
}
public File getFilePassReport() {
@@ -20,4 +23,8 @@
public String getName() {
return this.name;
}
+
+ public ConvertedDataReport[] getConvertedDataReports() {
+ return this.convertedDataReports;
+ }
}
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/reports/TestReport.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/reports/TestReport.java 2008-02-16 01:04:29 UTC (rev 625)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/reports/TestReport.java 2008-02-16 01:19:53 UTC (rev 626)
@@ -8,7 +8,6 @@
private File testReport;
private FilePassReport[] successfulFilePassReports;
private FilePassReport[] failedFilePassReports;
-
private String name;
public TestReport(File testReport, String name, FilePassReport[] successfulFilePassReports,
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/FilePassResult.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/FilePassResult.java 2008-02-16 01:04:29 UTC (rev 625)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/FilePassResult.java 2008-02-16 01:19:53 UTC (rev 626)
@@ -23,6 +23,7 @@
private String explanation;
private PassPhase lastReachedPhase;
private Converter failedConverter;
+ private Data[][] allData;
//variables not set by constructor
@@ -41,11 +42,12 @@
private List chanceAtFaults;
public FilePassResult(Data[] originalData, String explanation,
- PassPhase lastReachedPhase, Converter failedConverter) {
+ PassPhase lastReachedPhase, Converter failedConverter, Data[][] allData) {
this.originalData = originalData;
this.explanation = explanation;
this.lastReachedPhase = lastReachedPhase;
this.failedConverter = failedConverter;
+ this.allData = allData;
chanceAtFaults = new ArrayList();
}
@@ -95,6 +97,10 @@
return this.originalData;
}
+ public Data[][] getAllData() {
+ return this.allData;
+ }
+
public String getOriginalFileLabel() {
return (String) getOriginalData()[0].getMetaData().get(DataProperty.LABEL);
}
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/filepass/FilePassFailure.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/filepass/FilePassFailure.java 2008-02-16 01:04:29 UTC (rev 625)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/filepass/FilePassFailure.java 2008-02-16 01:19:53 UTC (rev 626)
@@ -7,8 +7,8 @@
public class FilePassFailure extends FilePassResult {
public FilePassFailure(Data[] originalData, String explanation,
- PassPhase phaseReached, Converter failedConverter) {
+ PassPhase phaseReached, Converter failedConverter, Data[][] allData) {
super(originalData, explanation, phaseReached,
- failedConverter);
+ failedConverter, allData);
}
}
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/filepass/FilePassSuccess.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/filepass/FilePassSuccess.java 2008-02-16 01:04:29 UTC (rev 625)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/filepass/FilePassSuccess.java 2008-02-16 01:19:53 UTC (rev 626)
@@ -5,7 +5,7 @@
public class FilePassSuccess extends FilePassResult {
- public FilePassSuccess(Data[] originalData, String explanation) {
- super(originalData, explanation, PassPhase.SUCCEEDED_PHASE, null);
+ public FilePassSuccess(Data[] originalData, String explanation, Data[][] allData) {
+ super(originalData, explanation, PassPhase.SUCCEEDED_PHASE, null, allData);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
