p05617423
/
bench4q
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add finish for script brief 

add finish for script brief
This commit is contained in:
coderfengyun 2014-03-31 16:08:58 +08:00
parent a368444412
commit b209177720
3 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/TestPlanScript.java
View File

@ -246,9 +246,8 @@ public class TestPlanScript extends Observable implements
private void doPeriodicalBrief() {
try {
if (isFinish())
return;
ScriptResultModel scriptResultModel = this.getSampler()
ScriptResultModel scriptResultModel = isFinish() ? ScriptResultModel
.buildFinishedResult() : this.getSampler()
.getResultModelFromAgent();
notifyObserver(scriptResultModel.getScriptPagesBriefModel());
notifyObserver(scriptResultModel.getScriptBriefResultModel());

10
Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/SampleModel.java
View File

@ -8,6 +8,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public abstract class SampleModel {
protected Date samplingTime;
protected boolean finished;
@XmlElement
public Date getSamplingTime() {
@ -18,4 +19,13 @@ public abstract class SampleModel {
this.samplingTime = samplingTime;
}
@XmlElement
public boolean isFinished() {
return finished;
}
public void setFinished(boolean finished) {
this.finished = finished;
}
}

26
Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/ScriptResultModel.java
View File

@ -3,7 +3,6 @@ package org.bench4q.share.models.master.statistics;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class ScriptResultModel extends SampleModel {
@ -41,4 +40,29 @@ public class ScriptResultModel extends SampleModel {
this.scriptPagesBriefModel = scriptPagesBriefModel;
}
public static ScriptResultModel buildFinishedResult() {
ScriptResultModel result = new ScriptResultModel();
result.setScriptBehaviorsBriefModel(buildFinishedBehaviors());
result.setScriptBriefResultModel(buildFinishedScenario());
result.setScriptPagesBriefModel(buildFinishedPages());
return result;
}
private static ScriptPagesBriefModel buildFinishedPages() {
ScriptPagesBriefModel result = new ScriptPagesBriefModel();
result.setFinished(true);
return result;
}
private static ScriptBriefResultModel buildFinishedScenario() {
ScriptBriefResultModel result = new ScriptBriefResultModel();
result.setFinished(true);
return result;
}
private static ScriptBehaviorsBriefModel buildFinishedBehaviors() {
ScriptBehaviorsBriefModel result = new ScriptBehaviorsBriefModel();
result.setFinished(true);
return result;
}
}