Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell: [472] trunk/testing
|
From: <mwl...@us...> - 2007-08-15 21:16:04
|
Revision: 472
http://cishell.svn.sourceforge.net/cishell/?rev=472&view=rev
Author: mwlinnem
Date: 2007-08-15 14:16:01 -0700 (Wed, 15 Aug 2007)
Log Message:
-----------
Reports no longer dumped into users home directory. Removed platform specific file separators.
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/TestFileKeeper.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/ReportGenerator.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/allconvs/ConvReportSubGenerator.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/AllTestsReportGenerator.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/convgraph/GraphReportGenerator.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-15 20:29:01 UTC (rev 471)
+++ trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java 2007-08-15 21:16:01 UTC (rev 472)
@@ -51,10 +51,18 @@
this.log = (LogService) cContext.getService(
LogService.class.getName());
+
}
public Data[] execute() {
+ this.log.log(LogService.LOG_WARNING, "-------NOTICE-------" + "\n" +
+ "The Converter Tester will take " +
+ "approximately 30 seconds to run all the tests, and around " +
+ "20 seconds to display all the results. Thank you for " +
+ "waiting :)" + "\n" +
+ "-----END NOTICE-----");
+
Data[] returnDM;
final IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
@@ -107,8 +115,6 @@
}
public void run (){
-
-// FileDialog dialog = new FileDialog(window.getShell(), SWT.OPEN);
// if (currentDir == null) {
// currentDir = new File(System.getProperty("user.dir") + File.separator + "sampledata");
//
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/TestFileKeeper.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/TestFileKeeper.java 2007-08-15 20:29:01 UTC (rev 471)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/TestFileKeeper.java 2007-08-15 21:16:01 UTC (rev 472)
@@ -16,9 +16,16 @@
public class TestFileKeeper {
//TODO: How should we expose this to the user?
- public static final String DEFAULT_ROOT_DIR = "workspace/org.cishell."
- + "testing.convertertester.core.new/src/org/cishell/testing/"
- + "convertertester/core/test_files/";
+ static {
+ String fs = File.separator;
+
+ DEFAULT_ROOT_DIR = "workspace" + fs + "org.cishell."
+ + "testing.convertertester.core.new" + fs + "src" + fs +
+ "org" + fs + "cishell" + fs + "testing" + fs +
+ "convertertester" + fs + "core" + fs + "test_files" + fs;
+ }
+
+ public static final String DEFAULT_ROOT_DIR;
public static final String CONF_FILE_NAME = "filetypes.conf";
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/ReportGenerator.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/ReportGenerator.java 2007-08-15 20:29:01 UTC (rev 471)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/ReportGenerator.java 2007-08-15 21:16:01 UTC (rev 472)
@@ -1,9 +1,14 @@
package org.cishell.testing.convertertester.core.tester2.reportgen;
+import java.io.File;
+
import org.cishell.testing.convertertester.core.tester2.reportgen.results.AllTestsResult;
public interface ReportGenerator {
+ public static final String FS = File.separator;
+ public static final String TEMP_DIR = "tmp" + FS;
+
public void generateReport(AllTestsResult atr);
}
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 2007-08-15 20:29:01 UTC (rev 471)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/allconvs/AllConvsReportGenerator.java 2007-08-15 21:16:01 UTC (rev 472)
@@ -36,7 +36,8 @@
FileOutputStream reportOutStream = null;
try {
- File reportFile = new File(TEMP_FILE_PATH);
+ new File(TEMP_DIR);
+ File reportFile = new File(TEMP_DIR + TEMP_FILE_PATH);
reportOutStream = new FileOutputStream(reportFile);
PrintStream report = new PrintStream(reportOutStream);
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/allconvs/ConvReportSubGenerator.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/allconvs/ConvReportSubGenerator.java 2007-08-15 20:29:01 UTC (rev 471)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/allconvs/ConvReportSubGenerator.java 2007-08-15 21:16:01 UTC (rev 472)
@@ -7,11 +7,10 @@
import java.util.ArrayList;
import java.util.List;
+import org.cishell.testing.convertertester.core.tester2.reportgen.ReportGenerator;
import org.cishell.testing.convertertester.core.tester2.reportgen.reports.ConvReport;
import org.cishell.testing.convertertester.core.tester2.reportgen.reports.TestReport;
import org.cishell.testing.convertertester.core.tester2.reportgen.results.ConvResult;
-import org.cishell.testing.convertertester.core.tester2.reportgen.results.FilePassResult;
-import org.cishell.testing.convertertester.core.tester2.reportgen.results.TestResult;
import org.osgi.framework.ServiceReference;
public class ConvReportSubGenerator {
@@ -25,7 +24,7 @@
ConvResult convResult = cr;
ServiceReference conv = convResult.getRef();
- File reportFile = new File(cr.getName());
+ File reportFile = new File(ReportGenerator.TEMP_DIR + cr.getName());
reportOutStream = new FileOutputStream(reportFile);
PrintStream report = new PrintStream(reportOutStream);
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/AllTestsReportGenerator.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/AllTestsReportGenerator.java 2007-08-15 20:29:01 UTC (rev 471)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/AllTestsReportGenerator.java 2007-08-15 21:16:01 UTC (rev 472)
@@ -27,12 +27,15 @@
public AllTestsReportGenerator(LogService log) {
this.log = log;
this.testResultSubGen = new TestReportSubGenerator();
+
+ //TODO: Make this not a huge hack
+ new File(TEMP_DIR).mkdir();
}
public void generateReport(AllTestsResult atr) {
FileOutputStream reportOutStream = null;
try {
- File reportFile = new File(TEMP_FILE_PATH);
+ File reportFile = new File(TEMP_DIR + TEMP_FILE_PATH);
reportOutStream = new FileOutputStream(reportFile);
PrintStream report = new PrintStream(reportOutStream);
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 20:29:01 UTC (rev 471)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/FilePassSubGenerator.java 2007-08-15 21:16:01 UTC (rev 472)
@@ -5,9 +5,9 @@
import java.io.IOException;
import java.io.PrintStream;
+import org.cishell.testing.convertertester.core.tester2.reportgen.ReportGenerator;
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.TestResult;
public class FilePassSubGenerator {
@@ -17,7 +17,7 @@
public void generateSubreport(FilePassResult fpr) {
FileOutputStream reportOutStream = null;
try {
- File reportFile = new File(fpr.getName());
+ File reportFile = new File(ReportGenerator.TEMP_DIR + fpr.getName());
reportOutStream = new FileOutputStream(reportFile);
PrintStream report = new PrintStream(reportOutStream);
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 20:29:01 UTC (rev 471)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/alltests/TestReportSubGenerator.java 2007-08-15 21:16:01 UTC (rev 472)
@@ -8,6 +8,7 @@
import java.util.List;
import org.cishell.testing.convertertester.core.converter.graph.ConverterPath;
+import org.cishell.testing.convertertester.core.tester2.reportgen.ReportGenerator;
import org.cishell.testing.convertertester.core.tester2.reportgen.reports.FilePassReport;
import org.cishell.testing.convertertester.core.tester2.reportgen.reports.TestReport;
import org.cishell.testing.convertertester.core.tester2.reportgen.results.FilePassResult;
@@ -27,7 +28,7 @@
public void generateSubreport(TestResult tr) {
FileOutputStream reportOutStream = null;
try {
- File reportFile = new File(tr.getName());
+ File reportFile = new File(ReportGenerator.TEMP_DIR + tr.getName());
reportOutStream = new FileOutputStream(reportFile);
PrintStream report = new PrintStream(reportOutStream);
@@ -144,6 +145,6 @@
private void namePass(String prefix, FilePassResult fp, TestResult parent,
int index) {
- fp.setName(prefix + " Pass " + index + " of " + fp);
+ fp.setName(prefix + " Pass " + index + " of " + parent.getName() + " . ");
}
}
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/convgraph/GraphReportGenerator.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/convgraph/GraphReportGenerator.java 2007-08-15 20:29:01 UTC (rev 471)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/reportgen/convgraph/GraphReportGenerator.java 2007-08-15 21:16:01 UTC (rev 472)
@@ -19,7 +19,7 @@
private ConvResultMaker convGen = new ConvResultMaker();
private LogService log;
- private File annotatedNWBGraph = new File("annotated-converter-graph.nwb");
+ private File annotatedNWBGraph = new File(TEMP_DIR + "annotated-converter-graph.nwb");
private String NODE_LINE = "^\\d+? \".*?\"$";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
