Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell: [643] trunk/testing
|
From: <mwl...@us...> - 2008-03-05 15:34:30
|
Revision: 643
http://cishell.svn.sourceforge.net/cishell/?rev=643&view=rev
Author: mwlinnem
Date: 2008-03-05 07:34:19 -0800 (Wed, 05 Mar 2008)
Log Message:
-----------
Various changed I don't recall.
Modified Paths:
--------------
trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConvResultMaker.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/allconvs/AllConvsReportGenerator.java
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/FilePassSubGenerator.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/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
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/util/FormatUtil.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 2008-03-04 23:53:10 UTC (rev 642)
+++ trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java 2008-03-05 15:34:19 UTC (rev 643)
@@ -1,6 +1,7 @@
package org.cishell.testing.convertertester.algorithm;
import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Dictionary;
@@ -295,15 +296,8 @@
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);
+ addAllConvertedDataReports(fp, fpData);
}
- }
- }
FilePassReport[] fFilePassReports =
tr.getFailedFilePassReports();
@@ -313,18 +307,44 @@
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);
+ addAllConvertedDataReports(fp, fpData);
}
- }
- }
}
}
+ private void addConvertedDataReports(ConvertedDataReport[] cdrs, Data fpData) {
+ 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);
+ }
+ }
+ }
+
+ private void addAllConvertedDataReports(FilePassReport fp, Data fpData) {
+ try {
+ ConvertedDataReport[] testCDRs = fp.getTestConvertedDataReports();
+ File testDummyParentFile = File.createTempFile("testdummyfile", "");
+ Data testDummyParentData = createReportData(testDummyParentFile, "test phase", fpData);
+ addReturn(testDummyParentData);
+ addConvertedDataReports(testCDRs, testDummyParentData);
+ ConvertedDataReport[] origCompareCDRs = fp.getOrigCompareConvertedDataReports();
+ File origCompareDummyParentFile = File.createTempFile("origcomparedummyfile", "");
+ Data origCompareDummyParentData = createReportData(origCompareDummyParentFile, "compare phase for original file", fpData);
+ addReturn(origCompareDummyParentData);
+ addConvertedDataReports(origCompareCDRs, origCompareDummyParentData);
+ ConvertedDataReport[] resultCompareCDRs = fp.getResultCompareConvertedDataReports();
+ File resultCompareDummyParentFile = File.createTempFile("origresultdummyfile", "");
+ Data resultCompareDummyParentData = createReportData(resultCompareDummyParentFile, "compare phase for resulting file", fpData);
+ addReturn(resultCompareDummyParentData);
+ addConvertedDataReports(resultCompareCDRs, resultCompareDummyParentData);
+ } catch (IOException e) {
+ this.log.log(LogService.LOG_WARNING, "Unable to write converted data reports due to IO Error");
+ }
+
+ }
+
/**
* Wraps the report with metadata in a form that is ready to be
* returned from the algorithm.
@@ -372,6 +392,8 @@
return createReportData(report, label, parent, "file:text/plain",
DataProperty.TEXT_TYPE);
}
+
+
}
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConvResultMaker.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConvResultMaker.java 2008-03-04 23:53:10 UTC (rev 642)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConvResultMaker.java 2008-03-05 15:34:19 UTC (rev 643)
@@ -20,9 +20,9 @@
public class ConvResultMaker {
- //must succeed at least 3 times in the file pass
+ //must succeed at least x times in the file pass
private static int MINIMUM_SUCCESSES_TO_BE_TRUSTED = 3;
- //must be tested by at least 2/3rds of file passes in test
+ //must be tested by at least x% of file passes in test
private static float MINIMUM_PERCENT_FILE_PASSES_REACHED_TO_BE_TRUSTED = .8f;
public static AllConvsResult generate(AllTestsResult atr,
@@ -65,7 +65,7 @@
//determine which converters always succeeded.
int FAILED = -1;
- int NEVER_TESTED = 0;
+ int NEVER_TESTED = 0; // array entries are 0 by default
int[] trusted = new int[tr.getAllConverters().length];
for (int jj = 0; jj < fprs.length; jj++) {
@@ -94,8 +94,7 @@
ConverterPath testConvs = tr.getTestConverters();
if (fprs.length > 0) {
//mark trusted converters.
-
-
+
for (int kk = 0; kk < testConvs.size(); kk++) {
Converter c = testConvs.get(kk);
float percentFilePassesThisConvParticipatedIn =
@@ -106,22 +105,6 @@
trustedConverters.add(c);
}
}
-// ConverterPath testConvs = tr.getAllConverters();
-// for (int kk = 0; kk < testConvs.length; kk++) {
-// Converter conv = testConvs[kk];
-// if (trusted[kk] == ALWAYS_SUCCEEDED) {
-// trustedConverters.add(conv);
-// }
-// }
-
-// //technically I wouldn't trust the comparison
-// //converters here, but I'm adding this because
-// //it makes the results easier to understand.
-// ConverterPath compareConvs = tr.getComparisonConverters();
-// for (int kk = 0; kk < compareConvs.size(); kk++) {
-// Converter conv = compareConvs.get(kk);
-// trustedConverters.add(conv);
-// }
}
}
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-03-04 23:53:10 UTC (rev 642)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/DefaultTestRunner.java 2008-03-05 15:34:19 UTC (rev 643)
@@ -6,7 +6,6 @@
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;
@@ -52,49 +51,62 @@
// test conversion phase
ConvertResult testPhaseResult = convert(originalFileData,
- testConverters, testData, null);
+ testConverters, testData);
+ Data[][] allDataFromTestPhase = testPhaseResult.getAllData();
+
if (!testPhaseResult.succeeded()) {
FilePassFailure failure = createFailResult(originalFileData,
PassPhase.TEST_CONV_PHASE,
testPhaseResult.getFailInfo(),
- testPhaseResult.getAllData());
+ allDataFromTestPhase,
+ null,
+ null);
testResults.add(failure);
continue;
}
Data[] resultFileData = testPhaseResult.getResult();
- Data[][] allDataFromTestPhase = testPhaseResult.getAllData();
+
// comparison conversion (for original file) phase
ConvertResult comparePhaseOrigResult = convert(originalFileData,
- comparisonConverters, testData, allDataFromTestPhase);
+ comparisonConverters, testData);
+ Data[][] allDataFromOrigComparePhase = comparePhaseOrigResult.getAllData();
+
if (!comparePhaseOrigResult.succeeded()) {
FilePassFailure failure = createFailResult(originalFileData,
PassPhase.COMPARE_CONV_ORIG_PHASE,
comparePhaseOrigResult.getFailInfo(),
- comparePhaseOrigResult.getAllData());
+ allDataFromTestPhase,
+ allDataFromOrigComparePhase,
+ null);
testResults.add(failure);
continue;
}
Data[] originalInMemory = comparePhaseOrigResult.getResult();
- Data[][] allDataFromTestAndComparisonPhases = comparePhaseOrigResult.getAllData();
+
//comparison conversion (for result file) phase
ConvertResult comparePhaseResultResult = convert(resultFileData,
- comparisonConverters, testData, allDataFromTestAndComparisonPhases);
+ comparisonConverters, testData);
+ Data[][] allDataFromResultComparePhase = comparePhaseResultResult.getAllData();
+
if (!comparePhaseResultResult.succeeded()) {
FilePassFailure failure = createFailResult(originalFileData,
PassPhase.COMPARE_CONV_RESULT_PHASE,
comparePhaseResultResult.getFailInfo(),
- comparePhaseResultResult.getAllData());
+ allDataFromTestPhase,
+ allDataFromOrigComparePhase,
+ allDataFromResultComparePhase);
testResults.add(failure);
continue;
}
Data[] resultInMemory = comparePhaseResultResult.getResult();
+
// graph comparison phase
@@ -111,13 +123,15 @@
FilePassFailure failure = createFailResult(originalFileData,
explanation, PassPhase.GRAPH_COMPARE_PHASE,
null,
- comparePhaseResultResult.getAllData());
+ allDataFromTestPhase,
+ allDataFromOrigComparePhase,
+ allDataFromResultComparePhase);
testResults.add(failure);
continue;
}
FilePassSuccess success = new FilePassSuccess(originalFileData,
- "", comparePhaseResultResult.getAllData());
+ "", allDataFromTestPhase, allDataFromOrigComparePhase, allDataFromResultComparePhase);
testResults.add(success);
}
@@ -127,20 +141,19 @@
}
private ConvertResult convert(Data[] startData,
- ConverterPath converters, TestConfigData testData, Data[][] previousData) {
+ ConverterPath converters, TestConfigData testData) {
Data[] currentData = getFilePathData(startData);
List dataSoFar = new ArrayList();
- if (previousData != null) {
- dataSoFar.addAll(Arrays.asList(previousData));
- }
- if (startData != null) {
- dataSoFar.add(startData);
- }
+// if (startData != null) {
+// alterMetaData(startData);
+// dataSoFar.add(startData);
+// }
+
/*
- * rig up fake CISHellContext so we can get ahold of
+ * rig up fake CIShellContext so we can get ahold of
* errors sent to logger.
*/
FakeLogCIShellContext fakeCContext =
@@ -148,14 +161,14 @@
- dataSoFar.add(currentData);
+ //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();
+
+ Hashtable parameters = new Hashtable(); //no parameters used
currentData = currentConverter.execute(currentData,
parameters, fakeCContext);
@@ -207,16 +220,16 @@
private FilePassFailure createFailResult(Data[] origData,
String explanation, PassPhase lastReachedPhase,
- Converter failedConverter, Data[][] allData) {
+ Converter failedConverter, Data[][] testData, Data[][] origCompareData, Data[][] resultCompareData) {
FilePassFailure failure = new FilePassFailure(origData, explanation,
- lastReachedPhase, failedConverter, allData);
+ lastReachedPhase, failedConverter, testData, origCompareData, resultCompareData);
return failure;
}
private FilePassFailure createFailResult(Data[] origData,
- PassPhase lastReachedPhase, ConvFailureInfo failInfo, Data[][] allData) {
+ PassPhase lastReachedPhase, ConvFailureInfo failInfo, Data[][] testData, Data[][] origCompareData, Data[][] resultCompareData) {
return createFailResult(origData, failInfo.getExplanation(),
- lastReachedPhase, failInfo.getFailedConverter(), allData);
+ lastReachedPhase, failInfo.getFailedConverter(), testData, origCompareData, resultCompareData);
}
private class ConvertResult {
@@ -312,6 +325,44 @@
Dictionary md = datum.getMetaData();
if (md.get(DataProperty.LABEL) == null) {
md.put(DataProperty.LABEL, "result of " + converter.getShortName());
+ } else {
+ alterMetaData(data);
+ md.put(DataProperty.LABEL, md.get(DataProperty.LABEL) + ": result of " + converter.getShortName());
}
}
+
+ private String getFileName(String fileLabel) {
+
+ //index variables will be -1 if index is not found.
+ int descriptionEndIndex = fileLabel.lastIndexOf(":");
+ int filePathEndIndex = fileLabel.lastIndexOf(File.separator);
+
+ //doesn't matter if either variable is -1, since startIndex will be
+ //zero and none of the string will be cut off the front.
+ int startIndex = Math.max(descriptionEndIndex, filePathEndIndex) + 1;
+
+ String fileNameWithExtension = fileLabel.substring(startIndex);
+
+
+
+ int endIndex = fileNameWithExtension.length(); // don't cut any off the end.
+
+
+ String fileNameWithoutExtension = fileNameWithExtension.substring(0, endIndex);
+
+ String fileName = fileNameWithoutExtension;
+ return fileName;
+ }
+
+
+ private void alterMetaData(Data[] origFileData) {
+ Data data = origFileData[0];
+ Dictionary metadata = data.getMetaData();
+ String label = (String) metadata.get(DataProperty.LABEL);
+ if (label != null) {
+ metadata.put(DataProperty.LABEL, getFileName(label));
+ } else {
+ metadata.put(DataProperty.LABEL, "null");
+ }
+ }
}
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/allconvs/AllConvsReportGenerator.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/allconvs/AllConvsReportGenerator.java 2008-03-04 23:53:10 UTC (rev 642)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/allconvs/AllConvsReportGenerator.java 2008-03-05 15:34:19 UTC (rev 643)
@@ -50,38 +50,50 @@
report.println("---------------------------------------------");
report.println("" );
+ int numTested = 0;
+
float passedPercentTotal = 0;
for (int ii = 0; ii < convResults.length; ii++) {
if (convResults[ii].wasTested()) {
+ if (convResults[ii].wasTested()) {
+ numTested++;
passedPercentTotal += convResults[ii].getPercentPassed();
+ }
}
}
- float avgPercentPassed =
- passedPercentTotal / convResults.length;
+ float avgPercentPassed = 0;
+ if (numTested != 0) {
+ avgPercentPassed =
+ passedPercentTotal / (float) numTested;
+ }
float chanceCorrectTotal = 0.0f;
for (int ii = 0; ii < convResults.length; ii++) {
- if (convResults[ii].wasTested()) {
+ if (convResults[ii].wasTested()) {
chanceCorrectTotal += convResults[ii].getChanceCorrect();
}
}
+ float avgChanceCorrect = 0;
+ if (numTested != 0) {
+ avgChanceCorrect = chanceCorrectTotal / ((float) numTested);
+ }
- float avgChanceCorrect =
- chanceCorrectTotal / ((float) convResults.length);
-
List convReportsList = new ArrayList();
List trustedConvs = new ArrayList();
List nonTrustedConvs = new ArrayList();
+ List nonTestedConvs = new ArrayList();
for (int ii = 0; ii < convResults.length; ii++) {
ConvResult cr = convResults[ii];
if (cr.isTrusted()) {
trustedConvs.add(cr);
+ } else if (cr.wasTested()) {
+ nonTrustedConvs.add(cr);
} else {
- nonTrustedConvs.add(cr);
+ nonTestedConvs.add(cr);
}
}
@@ -90,6 +102,8 @@
trustedConvs.size());
report.println(" # of Non-Trusted Converters : " +
nonTrustedConvs.size());
+ report.println(" # of Untested Converters :" +
+ nonTestedConvs.size());
report.println(" Total # of Converters : " +
convResults.length);
@@ -114,7 +128,7 @@
}
report.println("");
- report.println("Non-Trusted Converters...");
+ report.println("Non-Trusted Tested Converters...");
for (int ii = 0; ii < nonTrustedConvs.size(); ii++) {
ConvResult cr = (ConvResult) nonTrustedConvs.get(ii);
Modified: 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 2008-03-04 23:53:10 UTC (rev 642)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/ConvertedDataSubGenerator.java 2008-03-05 15:34:19 UTC (rev 643)
@@ -27,9 +27,13 @@
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());
+ this.convertedDataReport =
+ new ConvertedDataReport((File) fileData,(String) firstData.getMetaData().get(DataProperty.LABEL) +
+ " for " + fpr.getName() + " of " + tr.getName());
} else {
- this.convertedDataReport = new ConvertedDataReport((String) firstData.getMetaData().get(DataProperty.LABEL) + " for " + fpr.getName() + " of " + tr.getName());
+ this.convertedDataReport =
+ new ConvertedDataReport((String) firstData.getMetaData().get(DataProperty.LABEL) +
+ " for " + fpr.getName() + " of " + tr.getName());
}
}
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-03-04 23:53:10 UTC (rev 642)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/FilePassSubGenerator.java 2008-03-05 15:34:19 UTC (rev 643)
@@ -47,20 +47,20 @@
writeReport(report, fpr);
- Data[][] allData = fpr.getAllData();
+ Data[][] testData = fpr.getTestData();
+ Data[][] origCompareData = fpr.getOrigCompareData();
+ Data[][] resultCompareData = fpr.getResultCompareData();
- 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);
+ ConvertedDataReport[] testConvDataReports = genConvDataReports(tr, fpr, testData);
+ ConvertedDataReport[] origCompareConvDataReports = genConvDataReports(tr, fpr,origCompareData);
+ ConvertedDataReport[] resultCompareConvDataReports = genConvDataReports(tr, fpr,resultCompareData);
+
+ this.filePassReport = new FilePassReport(reportFile, fpr.getName() + " for " + tr.getName(),
+ testConvDataReports,
+ origCompareConvDataReports,
+ resultCompareConvDataReports);
+
} catch (IOException e) {
this.log.log(LogService.LOG_ERROR,
"Unable to generate file pass report.", e);
@@ -68,10 +68,22 @@
} finally {
closeStream(reportOutStream);
}
-
+ }
+
+ private ConvertedDataReport[] genConvDataReports(TestResult tr, FilePassResult fpr, Data[][] data) {
+ if (data != null) {
+ ConvertedDataReport[] testConvDataReports = new ConvertedDataReport[data.length];
-
-
+ for (int ii = 0; ii < data.length; ii++) {
+ Data[] datum = data[ii];
+ convDataSubGenerator.generateSubreport(tr, fpr, datum);
+ testConvDataReports[ii] =convDataSubGenerator.getReport();
+ }
+
+ return testConvDataReports;
+ } else {
+ return new ConvertedDataReport[0];
+ }
}
public FilePassReport getFilePassReport() {
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-03-04 23:53:10 UTC (rev 642)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/reports/FilePassReport.java 2008-03-05 15:34:19 UTC (rev 643)
@@ -8,12 +8,20 @@
private String name;
- private ConvertedDataReport[] convertedDataReports;
+ private ConvertedDataReport[] testConvertedDataReports;
+ private ConvertedDataReport[] origCompareConvertedDataReports;
+ private ConvertedDataReport[] resultCompareConvertedDataReports;
- public FilePassReport (File filePassReport, String name, ConvertedDataReport[] convertedDataReports) {
+ public FilePassReport (File filePassReport,
+ String name,
+ ConvertedDataReport[] testConvertedDataReports,
+ ConvertedDataReport[] origCompareConvertedDataReports,
+ ConvertedDataReport[] resultCompareConvertedDataReports) {
this.filePassReport = filePassReport;
this.name = name;
- this.convertedDataReports = convertedDataReports;
+ this.testConvertedDataReports = testConvertedDataReports;
+ this.origCompareConvertedDataReports = origCompareConvertedDataReports;
+ this.resultCompareConvertedDataReports = resultCompareConvertedDataReports;
}
public File getFilePassReport() {
@@ -24,7 +32,16 @@
return this.name;
}
- public ConvertedDataReport[] getConvertedDataReports() {
- return this.convertedDataReports;
+ public ConvertedDataReport[] getTestConvertedDataReports() {
+ return this.testConvertedDataReports;
}
+
+ public ConvertedDataReport[] getOrigCompareConvertedDataReports() {
+ return this.origCompareConvertedDataReports;
+ }
+
+ public ConvertedDataReport[] getResultCompareConvertedDataReports() {
+ return this.resultCompareConvertedDataReports;
+ }
+
}
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-03-04 23:53:10 UTC (rev 642)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/FilePassResult.java 2008-03-05 15:34:19 UTC (rev 643)
@@ -23,7 +23,10 @@
private String explanation;
private PassPhase lastReachedPhase;
private Converter failedConverter;
- private Data[][] allData;
+
+ private Data[][] testData;
+ private Data[][] origCompareData;
+ private Data[][] resultCompareData;
//variables not set by constructor
@@ -42,13 +45,16 @@
private List chanceAtFaults;
public FilePassResult(Data[] originalData, String explanation,
- PassPhase lastReachedPhase, Converter failedConverter, Data[][] allData) {
+ PassPhase lastReachedPhase, Converter failedConverter, Data[][] testData, Data[][] origCompareData, Data[][] resultCompareData) {
this.originalData = originalData;
this.explanation = explanation;
this.lastReachedPhase = lastReachedPhase;
this.failedConverter = failedConverter;
- this.allData = allData;
+ this.testData = testData;
+ this.origCompareData = origCompareData;
+ this.resultCompareData = resultCompareData;
+
chanceAtFaults = new ArrayList();
}
@@ -97,10 +103,18 @@
return this.originalData;
}
- public Data[][] getAllData() {
- return this.allData;
+ public Data[][] getTestData() {
+ return this.testData;
}
+ public Data[][] getOrigCompareData() {
+ return this.origCompareData;
+ }
+
+ public Data[][] getResultCompareData() {
+ return this.resultCompareData;
+ }
+
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-03-04 23:53:10 UTC (rev 642)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/filepass/FilePassFailure.java 2008-03-05 15:34:19 UTC (rev 643)
@@ -7,8 +7,8 @@
public class FilePassFailure extends FilePassResult {
public FilePassFailure(Data[] originalData, String explanation,
- PassPhase phaseReached, Converter failedConverter, Data[][] allData) {
+ PassPhase phaseReached, Converter failedConverter, Data[][] testData, Data[][] origCompareData, Data[][] resultCompareData) {
super(originalData, explanation, phaseReached,
- failedConverter, allData);
+ failedConverter, testData, origCompareData, resultCompareData);
}
}
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-03-04 23:53:10 UTC (rev 642)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/results/filepass/FilePassSuccess.java 2008-03-05 15:34:19 UTC (rev 643)
@@ -5,7 +5,7 @@
public class FilePassSuccess extends FilePassResult {
- public FilePassSuccess(Data[] originalData, String explanation, Data[][] allData) {
- super(originalData, explanation, PassPhase.SUCCEEDED_PHASE, null, allData);
+ public FilePassSuccess(Data[] originalData, String explanation, Data[][] testData, Data[][] origCompareData, Data[][] resultCompareData) {
+ super(originalData, explanation, PassPhase.SUCCEEDED_PHASE, null, testData, origCompareData, resultCompareData);
}
}
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/util/FormatUtil.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/util/FormatUtil.java 2008-03-04 23:53:10 UTC (rev 642)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/util/FormatUtil.java 2008-03-05 15:34:19 UTC (rev 643)
@@ -10,11 +10,11 @@
* @return
*/
public static float formatToPercent(float decimal) {
-
float temp = decimal;
temp *= 100f;
temp *= Math.pow(10.0, NUM_DECIMALS);
- temp = Math.round(temp) / (float) (Math.pow(10.0, NUM_DECIMALS));
+ temp = Math.round(temp);
+ temp = temp / (float) (Math.pow(10.0, NUM_DECIMALS));
float percent = temp;
return percent;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
