Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell: [504] trunk/testing
|
From: <mwl...@us...> - 2007-08-30 20:39:40
|
Revision: 504
http://cishell.svn.sourceforge.net/cishell/?rev=504&view=rev
Author: mwlinnem
Date: 2007-08-30 13:39:35 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Added report that simply outputs the unmodified converter graph.
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/ConverterTester2.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/readme/ReadMeReportGenerator.java
Removed Paths:
-------------
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterNode.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 20:38:58 UTC (rev 503)
+++ trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java 2007-08-30 20:39:35 UTC (rev 504)
@@ -11,11 +11,11 @@
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.ConverterGraph;
import org.cishell.testing.convertertester.core.tester2.ConverterTester2;
import org.cishell.testing.convertertester.core.tester2.reportgen.ReportGenerator;
import org.cishell.testing.convertertester.core.tester2.reportgen.allconvs.AllConvsReportGenerator;
import org.cishell.testing.convertertester.core.tester2.reportgen.alltests.AllTestsReportGenerator;
+import org.cishell.testing.convertertester.core.tester2.reportgen.convgraph.AnnotatedGraphReportGenerator;
import org.cishell.testing.convertertester.core.tester2.reportgen.convgraph.GraphReportGenerator;
import org.cishell.testing.convertertester.core.tester2.reportgen.readme.ReadMeReportGenerator;
import org.cishell.testing.convertertester.core.tester2.reportgen.reports.AllConvsReport;
@@ -35,7 +35,8 @@
//TODO: Maybe let the user specify which converters he/she wants to test, or other things
//TODO: Make it progress-trackable
-public class ConverterTesterAlgorithm implements Algorithm, AlgorithmProperty {
+public class ConverterTesterAlgorithm implements Algorithm,
+ AlgorithmProperty {
private CIShellContext cContext;
private BundleContext bContext;
@@ -62,7 +63,8 @@
Data[] returnDM;
- final IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
+ final IWorkbenchWindow[] windows =
+ PlatformUI.getWorkbench().getWorkbenchWindows();
if (windows.length == 0) {
return null;
}
@@ -111,16 +113,26 @@
//initialize all the report generators
- AllTestsReportGenerator allGen = new AllTestsReportGenerator(this.log);
- AllConvsReportGenerator allConvGen = new AllConvsReportGenerator(this.log);
- GraphReportGenerator graphGen = new GraphReportGenerator(this.log);
- ReadMeReportGenerator readmeGen = new ReadMeReportGenerator();
+ AllTestsReportGenerator allGen =
+ new AllTestsReportGenerator(this.log);
+ AllConvsReportGenerator allConvGen =
+ new AllConvsReportGenerator(this.log);
+ GraphReportGenerator origGraphGen =
+ new GraphReportGenerator(this.log);
+ AnnotatedGraphReportGenerator graphGen =
+ new AnnotatedGraphReportGenerator(this.log);
+ ReadMeReportGenerator readmeGen =
+ new ReadMeReportGenerator(this.log);
- //execute the tests, and provide the results to the report generators
+ /*
+ * execute the tests, and provide the results to the
+ * report generators
+ */
ConverterTester2 ct = new ConverterTester2(log);
ct.execute(convRefs,
new ReportGenerator[]
- {allGen, allConvGen, graphGen, readmeGen},
+ {allGen, allConvGen, graphGen, origGraphGen,
+ readmeGen},
cContext, bContext);
/*
* report generators have now been supplied with the test
@@ -143,29 +155,38 @@
allReport.getName() , null);
addReturn(allReportData);
- TestReport[] sTestReports = allReport.getSuccessfulTestReports();
+ TestReport[] sTestReports =
+ allReport.getSuccessfulTestReports();
addFilePasses(sTestReports, allReportData);
- TestReport[] ppTestReports = allReport.getPartialSuccessTestReports();
+ TestReport[] ppTestReports =
+ allReport.getPartialSuccessTestReports();
addFilePasses(ppTestReports, allReportData);
- TestReport[] fTestReports = allReport.getFailedTestReports();
+ TestReport[] fTestReports =
+ allReport.getFailedTestReports();
addFilePasses(fTestReports, allReportData);
//return all converters report
- AllConvsReport allConvReport = allConvGen.getAllConvsReport();
+ AllConvsReport allConvReport =
+ allConvGen.getAllConvsReport();
File allConvReportFile = allConvReport.getReport();
- Data allConvReportData = createReportData(allConvReportFile, allConvReport.getName(),
+ Data allConvReportData =
+ createReportData(allConvReportFile,
+ allConvReport.getName(),
null);
addReturn(allConvReportData);
//return each converter report
- ConvReport[] convReports = allConvReport.getConverterReports();
+ ConvReport[] convReports =
+ allConvReport.getConverterReports();
for (int ii = 0; ii < convReports.length; ii++) {
ConvReport convReport = convReports[ii];
File convReportFile = convReport.getReport();
- Data convReportData = createReportData(convReportFile, convReport.getName(), allConvReportData);
+ Data convReportData =
+ createReportData(convReportFile,
+ convReport.getName(), allConvReportData);
addReturn(convReportData);
TestReport[] trs = convReport.getTestReports();
@@ -175,11 +196,23 @@
//return annotated graph report
File graphReportFile = graphGen.getGraphReport();
- Data graphReport = createReportData(graphReportFile, "Annotated Graph Report", null,
+ Data graphReport = createReportData(graphReportFile,
+ "Annotated Converter Graph", null,
"file:text/nwb", DataProperty.NETWORK_TYPE);
addReturn(graphReport);
+
+ //return original graph report
+
+ File origGraphReportFile = origGraphGen.getGraphReport();
+ Data origGraphReport = createReportData(
+ origGraphReportFile,
+ "Original Converter Graph", null,
+ "file:text/nwb", DataProperty.NETWORK_TYPE);
+ addReturn(origGraphReport);
+
} catch (Exception e) {
- this.log.log(LogService.LOG_ERROR, "Converter Tester Failed.", e);
+ this.log.log(LogService.LOG_ERROR, "Converter Tester Failed.",
+ e);
e.printStackTrace();
}
}
@@ -195,20 +228,20 @@
/**
* Returns file pass reports associated with tests or converters.
- * @param testReports reports to be returned as children or test or converter
+ * @param testReports reports to be returned as children or test or
+ * converter
* @param parent the parent of the file pass
*/
private void addFilePasses(TestReport[] testReports, Data parent) {
for (int ii = 0; ii < testReports.length; ii++) {
TestReport tr = testReports[ii];
File testReportFile = tr.getTestReport();
-// System.out.println("In algorithm, file pass name is : " + tr.getName());
-// System.out.println("In algorithm FILE name is : " + testReportFile.getName());
Data testReportData = createReportData(testReportFile,
tr.getName(), parent);
addReturn(testReportData);
- FilePassReport[] sFilePassReports = tr.getSuccessfulFilePassReports();
+ FilePassReport[] sFilePassReports =
+ tr.getSuccessfulFilePassReports();
for (int kk = 0; kk < sFilePassReports.length; kk++) {
FilePassReport fp = sFilePassReports[kk];
File fpFile = fp.getFilePassReport();
@@ -217,7 +250,8 @@
addReturn(fpData);
}
- FilePassReport[] fFilePassReports = tr.getFailedFilePassReports();
+ FilePassReport[] fFilePassReports =
+ tr.getFailedFilePassReports();
for (int kk = 0; kk < fFilePassReports.length; kk++) {
FilePassReport fp = fFilePassReports[kk];
File fpFile = fp.getFilePassReport();
@@ -233,14 +267,16 @@
* returned from the algorithm.
*
* @param report the report to be turned into data
- * @param label how the report will be labeled in the data manager window
+ * @param label how the report will be labeled in the data manager
+ * window
* @param parent which report this report will hang from
* (null if it is not a child of any report)
* @param format The file format or class name of the report
* @param type whether the report is a network or text file
* @return the report encapsulated in data, ready to be returned.
*/
- private Data createReportData(Object report, String label, Data parent, String format, String type) {
+ private Data createReportData(Object report, String label,
+ Data parent, String format, String type) {
Data reportData = new BasicData(report, format);
Dictionary metadata = reportData.getMetaData();
metadata.put(DataProperty.LABEL, label);
@@ -252,22 +288,26 @@
}
/**
- * Alternate version of createReportData that assumes the report is a plain text file
+ * Alternate version of createReportData that assumes the report
+ * is a plain text file
* @param report the report to be turned into data
- * @param label how the report will be labeled in the data manager window
+ * @param label how the report will be labeled in the data manager
+ * window
* @param parent which report this report will hang from
* (null if it is not a child of any report)
* @return the report encapsulated in data, ready to be returned.
*/
- private Data createReportData(Object report, String label, Data parent) {
- return createReportData(report, label, parent, "file:text/plain", DataProperty.TEXT_TYPE);
+ private Data createReportData(Object report, String label,
+ Data parent) {
+ return createReportData(report, label, parent, "file:text/plain",
+ DataProperty.TEXT_TYPE);
}
}
private ServiceReference[] getConverterReferences() {
- String filter = "(&("+ALGORITHM_TYPE+"="+TYPE_CONVERTER+"))";// +
+ String filter = "(&("+ALGORITHM_TYPE+"="+TYPE_CONVERTER+"))";
try {
ServiceReference[] refs = bContext.getServiceReferences(
Deleted: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterNode.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterNode.java 2007-08-30 20:38:58 UTC (rev 503)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterNode.java 2007-08-30 20:39:35 UTC (rev 504)
@@ -1,32 +0,0 @@
-package org.cishell.testing.convertertester.core.converter.graph;
-
-public class ConverterNode {
- String name;
- int id;
-
- public ConverterNode(String s, int i){
- name = s;
- id = i;
- }
-
- public String getName(){
- return name;
- }
-
- public int getID(){
- return id;
- }
-
- public void setName(String s){
- name = s;
- }
-
- public void setID(int i){
- id = i;
- }
-
- public String toString(){
- return name + " " + id;
- }
-
-}
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 2007-08-30 20:38:58 UTC (rev 503)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/ConverterTester2.java 2007-08-30 20:39:35 UTC (rev 504)
@@ -79,9 +79,6 @@
TestResult[] rawResults =
runAllTests(converterGraph, cContext, bContext);
- System.out.println("Num Test Results coming out of runAllTests" +
- ": " + rawResults.length);
-
AllTestsResult allTestsResult = new AllTestsResult(rawResults);
//analyze the test results to extract more useful info
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/readme/ReadMeReportGenerator.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/readme/ReadMeReportGenerator.java 2007-08-30 20:38:58 UTC (rev 503)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/readme/ReadMeReportGenerator.java 2007-08-30 20:39:35 UTC (rev 504)
@@ -5,14 +5,18 @@
import org.cishell.testing.convertertester.core.tester2.TestFileKeeper;
import org.cishell.testing.convertertester.core.tester2.reportgen.ReportGenerator;
import org.cishell.testing.convertertester.core.tester2.reportgen.reports.ReadMeReport;
-import org.cishell.testing.convertertester.core.tester2.reportgen.reports.Report;
import org.cishell.testing.convertertester.core.tester2.reportgen.results.AllConvsResult;
import org.cishell.testing.convertertester.core.tester2.reportgen.results.AllTestsResult;
+import org.osgi.service.log.LogService;
public class ReadMeReportGenerator implements ReportGenerator {
+ private LogService log;
private ReadMeReport readme;
+ public ReadMeReportGenerator(LogService log) {
+ this.log = log;
+ }
/**
* Instead of actually generating the report in-line, we just
* load a file with the report text inside it, and return it as is.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
