Revision: 323
http://p-unit.svn.sourceforge.net/p-unit/?rev=323&view=rev
Author: zhanghuangzhu
Date: 2008-06-16 23:35:04 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
Andrew Zhag: removed multiple virtual machine support.
Modified Paths:
--------------
trunk/punit.extension/src/org/punit/reporter/chart/AbstractChartReporter.java
Modified: trunk/punit.extension/src/org/punit/reporter/chart/AbstractChartReporter.java
===================================================================
--- trunk/punit.extension/src/org/punit/reporter/chart/AbstractChartReporter.java 2008-06-17 06:34:55 UTC (rev 322)
+++ trunk/punit.extension/src/org/punit/reporter/chart/AbstractChartReporter.java 2008-06-17 06:35:04 UTC (rev 323)
@@ -9,9 +9,7 @@
import org.jfree.chart.*;
import org.jfree.data.category.*;
import org.punit.events.*;
-import org.punit.exception.IOException;
import org.punit.message.*;
-import org.punit.reporter.chart.image.*;
import org.punit.runner.*;
import org.punit.type.*;
import org.punit.util.*;
@@ -25,8 +23,6 @@
protected ChartRender _render;
- protected transient RunnerProperties _runnerProperties;
-
protected transient Object _testInstance;
public AbstractChartReporter(ChartRender render) {
@@ -38,10 +34,7 @@
@SuppressWarnings("unchecked")
public void onRunnerStart(final Class clazz, Runner runner) {
ReporterUtil.initResultFolder(runner);
- _runnerProperties = runner.properties();
- if (!isIntermediate()) {
- _render.onRunnerStart(clazz, runner);
- }
+ _render.onRunnerStart(clazz, runner);
}
@SuppressWarnings("unchecked")
@@ -51,79 +44,24 @@
String fileName = generateResultFileNamePrefix(runner, key);
storeDataset(dataset, fileName, key);
}
- if (!isIntermediate()) {
- _render.onRunnerEnd(clazz, runner);
- }
+ _render.onRunnerEnd(clazz, runner);
}
private DefaultCategoryDataset getDataset(final Runner runner,
DatasetKey key) {
- DefaultCategoryDataset dataset;
- if (isParentRunner()) {
- dataset = generateDatasetFromChildrenVMs(runner, key);
- } else {
- dataset = (DefaultCategoryDataset) getDatasetOrNew(key);
- }
- return dataset;
+ return getDatasetOrNew(key);
}
- private DefaultCategoryDataset generateDatasetFromChildrenVMs(
- final Runner runner, DatasetKey key) {
- String childFileNamePrefix = generateResultFileNamePrefix(runner, key);
- final VM[] vms = _runnerProperties.vms;
- DefaultCategoryDataset dataset = getDatasetOrNew(key);
- for (int i = 0; i < vms.length; ++i) {
- String vmname = vms[i].punitName();
- String childFileName = generateIntermediateFileName(
- childFileNamePrefix, vmname);
- DefaultCategoryDataset childDataset = consumeChildData(runner,
- childFileName);
- dataset = ChartUtil.appendDataset(dataset, childDataset, vmname);
- }
- return dataset;
- }
- private DefaultCategoryDataset consumeChildData(final Runner runner,
- String childFileName) {
- ObjectInputStream ois = null;
- try {
- FileInputStream fis = new FileInputStream(childFileName);
- ois = new ObjectInputStream(fis);
- return (DefaultCategoryDataset) ois.readObject();
- } catch (Exception e) {
- throw new IOException(e);
- } finally {
- if (ois != null) {
- try {
- ois.close();
- } catch (java.io.IOException e) {
- throw new IOException(e);
- }
- }
- IOUtil.deleteFile(childFileName);
- }
- }
-
private void storeDataset(DefaultCategoryDataset dataset,
- String prefixFileName, DatasetKey key) {
- if (isIntermediate()) {
- String fileName = generateIntermediateFileName(prefixFileName,
- _runnerProperties.vmName);
- ChartUtil.storeDatasetAsObject(dataset, new File(fileName));
- } else {
- String title = key.punitName();
- String yLegendText = watcherLegend(key.watcher());
- JFreeChart chart = ChartUtil.generateChartFromDataset(title,
- yLegendText, dataset);
- _render.renderChart(chart, prefixFileName);
- }
- }
+ String prefixFileName, DatasetKey key) {
+ String title = key.punitName();
+ String yLegendText = watcherLegend(key.watcher());
+ JFreeChart chart = ChartUtil.generateChartFromDataset(title,
+ yLegendText, dataset);
+ _render.renderChart(chart, prefixFileName);
+ }
- private static String generateIntermediateFileName(String prefix,
- String vmName) {
- return prefix + vmName + ImageConstants.SER;
- }
-
private final String generateResultFileNamePrefix(Runner runner,
DatasetKey key) {
StringBuffer sb = new StringBuffer();
@@ -142,14 +80,6 @@
return watcher.punitName() + " [" + watcher.unit() + "]"; //$NON-NLS-1$//$NON-NLS-2$
}
- protected final boolean isIntermediate() {
- return _runnerProperties.isIntermediate;
- }
-
- protected final boolean isParentRunner() {
- return _runnerProperties.isParent;
- }
-
private final DefaultCategoryDataset getDatasetOrNew(DatasetKey key) {
DefaultCategoryDataset dataset = _datasets.get(key);
if (dataset == null) {
@@ -200,9 +130,6 @@
Watcher watcher = iter.next();
DatasetKey key = getKey(watcher);
DefaultCategoryDataset dataset = getDatasetOrNew(key);
- if (isParentRunner()) {
- return;
- }
double value = watcher.value();
String yname = testInstance.getClass().getSimpleName();
String xname = ReporterUtil.simpleMethodName(method, params);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|