save the behaviorsBriefResultModel, PageBriefResultModel
This commit is contained in:
parent
f3d89c32a5
commit
695830a129
|
@ -57,7 +57,7 @@ public class RunningScriptService {
|
|||
ScriptBriefResultModel result = (ScriptBriefResultModel) runningScript
|
||||
.getScriptBriefStatistics().getStatistics();
|
||||
result.setFinished(runningScript.isFinished());
|
||||
this.getTestPlanScriptService().saveResult(testPlanId,
|
||||
this.getTestPlanScriptService().saveScriptBriefResult(testPlanId,
|
||||
runningScript.getScriptId(), result);
|
||||
return result;
|
||||
}
|
||||
|
@ -79,6 +79,8 @@ public class RunningScriptService {
|
|||
result.setTestBehaviorsBriefModel((AgentBehaviorsBriefModel) runningScript
|
||||
.getBehaviorsBriefStatistics().getStatistics());
|
||||
// TODO: save this in the database
|
||||
this.getTestPlanScriptService().saveBehaviorsBriefResult(testPlanID,
|
||||
runningScript.getScriptId(), result);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -98,6 +100,8 @@ public class RunningScriptService {
|
|||
.getPageBriefStatistics().getStatistics();
|
||||
result.setFinished(runningScript.isFinished());
|
||||
// TODO:save it in the database
|
||||
this.getTestPlanScriptService().savePageBriefResult(testPlanID,
|
||||
runningScript.getScriptId(), result);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -16,7 +16,9 @@ import org.bench4q.master.entity.db.TestPlanScriptResult;
|
|||
import org.bench4q.master.exception.ExceptionLog;
|
||||
import org.bench4q.master.helper.SessionHelper;
|
||||
import org.bench4q.share.helper.MarshalHelper;
|
||||
import org.bench4q.share.models.master.ScriptBehaviorsBriefModel;
|
||||
import org.bench4q.share.models.master.ScriptBriefResultModel;
|
||||
import org.bench4q.share.models.master.ScriptPageBriefModel;
|
||||
import org.hibernate.Session;
|
||||
import org.hibernate.Transaction;
|
||||
import org.hibernate.criterion.Restrictions;
|
||||
|
@ -77,8 +79,24 @@ public class TestPlanScriptService {
|
|||
}
|
||||
}
|
||||
|
||||
public boolean saveResult(final UUID testPlanRunId, final int scriptId,
|
||||
public boolean saveScriptBriefResult(final UUID testPlanRunId, final int scriptId,
|
||||
final ScriptBriefResultModel resultModel) {
|
||||
return saveResultPrivate(testPlanRunId, scriptId, resultModel);
|
||||
}
|
||||
|
||||
public boolean saveBehaviorsBriefResult(final UUID testPlanRunId, final int scriptId,
|
||||
final ScriptBehaviorsBriefModel scriptBehaviorsBriefModel) {
|
||||
return saveResultPrivate(testPlanRunId, scriptId,
|
||||
scriptBehaviorsBriefModel);
|
||||
}
|
||||
|
||||
public boolean savePageBriefResult(final UUID testPlanRunId, final int scriptId,
|
||||
final ScriptPageBriefModel pageBriefModel) {
|
||||
return saveResultPrivate(testPlanRunId, scriptId, pageBriefModel);
|
||||
}
|
||||
|
||||
private boolean saveResultPrivate(final UUID testPlanRunId,
|
||||
final int scriptId, final Object resultModel) {
|
||||
ExecutorService executorService = Executors.newCachedThreadPool();
|
||||
final Date now = new Date();
|
||||
executorService.execute(new Runnable() {
|
||||
|
@ -90,7 +108,7 @@ public class TestPlanScriptService {
|
|||
}
|
||||
|
||||
private void doSaveResult(UUID testPlanRunId, int scriptId,
|
||||
ScriptBriefResultModel resultModel, Date now) {
|
||||
Object resultModel, Date now) {
|
||||
Session session = this.getSessionHelper().openSession();
|
||||
Transaction transaction = session.beginTransaction();
|
||||
try {
|
||||
|
@ -128,9 +146,8 @@ public class TestPlanScriptService {
|
|||
}
|
||||
}
|
||||
|
||||
private TestPlanScriptResult buildScriptResultWithModel(
|
||||
ScriptBriefResultModel model, TestPlanScript testPlanScript,
|
||||
Date createDatetime) {
|
||||
private TestPlanScriptResult buildScriptResultWithModel(Object model,
|
||||
TestPlanScript testPlanScript, Date createDatetime) {
|
||||
TestPlanScriptResult result = new TestPlanScriptResult();
|
||||
result.setTestPlanScript(testPlanScript);
|
||||
try {
|
||||
|
|
|
@ -7,6 +7,7 @@ import java.util.Date;
|
|||
|
||||
import org.bench4q.share.models.master.ScriptBriefResultModel;
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
public class IpTest {
|
||||
|
@ -24,4 +25,11 @@ public class IpTest {
|
|||
assertTrue(Class.forName(model.getClass().getName()).equals(
|
||||
model.getClass()));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testForInheritance() throws ClassNotFoundException {
|
||||
Object model = new ScriptBriefResultModel();
|
||||
assertEquals(ScriptBriefResultModel.class.getName(), model.getClass()
|
||||
.getName());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -65,7 +65,7 @@ public class TestTestPlanScriptService {
|
|||
briefResultModel.setFailRateThisTime(0);
|
||||
briefResultModel.setFailThroughputThisTime(0);
|
||||
briefResultModel.setFinished(true);
|
||||
this.getTestPlanScriptService().saveResult(
|
||||
this.getTestPlanScriptService().saveScriptBriefResult(
|
||||
UUID.fromString(WRONG_TEST_PLAN_RUN_ID), WRONG_SCRIPT_ID,
|
||||
briefResultModel);
|
||||
TestPlanScript testPlanScript = this.getTestPlanScriptService()
|
||||
|
|
Loading…
Reference in New Issue