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

refactor

This commit is contained in:
coderfengyun 2013-12-23 17:29:49 +08:00
parent 1030587135
commit 2c479dbd9c
7 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/bench4q/master/helper/RunScenarioModelHelper.java
View File

@ -6,7 +6,7 @@ import java.util.List;
import org.bench4q.share.models.agent.ParameterModel;
import org.bench4q.share.models.agent.RunScenarioModel;
import org.bench4q.share.models.agent.scriptrecord.BatchModel;
import org.bench4q.share.models.agent.scriptrecord.BehaviorBaseModel;
import org.bench4q.share.models.agent.scriptrecord.BehaviorModel;
import org.bench4q.share.models.agent.scriptrecord.PageModel;
public class RunScenarioModelHelper {
@ -19,9 +19,9 @@ public class RunScenarioModelHelper {
return result;
}
public static BehaviorBaseModel createUserBehaviorModel(int id, String use,
public static BehaviorModel createUserBehaviorModel(int id, String use,
String name, List<ParameterModel> parameterModels) {
return BehaviorBaseModel.UserBehaviorBuilder(id, name, use,
return BehaviorModel.UserBehaviorBuilder(id, name, use,
parameterModels);
}

10
src/main/java/org/bench4q/master/scriptrecord/httpcapture/Bench4qTestScriptAdapter.java
View File

@ -16,7 +16,7 @@ import org.bench4q.share.helper.MarshalHelper;
import org.bench4q.share.models.agent.ParameterModel;
import org.bench4q.share.models.agent.RunScenarioModel;
import org.bench4q.share.models.agent.scriptrecord.BatchModel;
import org.bench4q.share.models.agent.scriptrecord.BehaviorBaseModel;
import org.bench4q.share.models.agent.scriptrecord.BehaviorModel;
import org.bench4q.share.models.agent.scriptrecord.PageModel;
import org.bench4q.share.models.agent.scriptrecord.UsePluginModel;
@ -72,7 +72,7 @@ public class Bench4qTestScriptAdapter implements IScriptAdapter {
assert (pageCountEqualWithPageSizeInScenario());
}
public void insertUserBehaviorsToScenario(BehaviorBaseModel model) {
public void insertUserBehaviorsToScenario(BehaviorModel model) {
List<BatchModel> batches = this.getCurrentPage().getBatches();
int parentBatchId = -1;
assert (batches != null);
@ -121,7 +121,7 @@ public class Bench4qTestScriptAdapter implements IScriptAdapter {
this.runScenarioModel).size());
batchBehavior.setParentId(-1);
batchBehavior.setChildId(-1);
List<BehaviorBaseModel> behaviors = new ArrayList<BehaviorBaseModel>();
List<BehaviorModel> behaviors = new ArrayList<BehaviorModel>();
batchBehavior.setBehaviors(behaviors);
return batchBehavior;
}
@ -144,7 +144,7 @@ public class Bench4qTestScriptAdapter implements IScriptAdapter {
return false;
}
private int getUrlParentBatch(BehaviorBaseModel model) {
private int getUrlParentBatch(BehaviorModel model) {
int parentBatchId = -1;
for (ParameterModel parameter : model.getParameters()) {
if (!parameter.getKey().equals("url")) {
@ -169,7 +169,7 @@ public class Bench4qTestScriptAdapter implements IScriptAdapter {
.getBatches(this.getRunScenarioModel());
for (int batchId = 0; batchId < batchesInScenario.size(); batchId++) {
BatchModel batch = batchesInScenario.get(batchId);
for (BehaviorBaseModel behavior : batch.getBehaviors()) {
for (BehaviorModel behavior : batch.getBehaviors()) {
for (ParameterModel parameter : behavior.getParameters()) {
if (parameter.getKey().equals("url")
&& parameter.getValue().equals(url)) {

4
src/main/java/org/bench4q/master/scriptrecord/httpcapture/IScriptAdapter.java
View File

@ -4,7 +4,7 @@ import java.util.List;
import org.bench4q.master.scriptrecord.httpcapture.generator.ChildrenUrl;
import org.bench4q.share.models.agent.RunScenarioModel;
import org.bench4q.share.models.agent.scriptrecord.BehaviorBaseModel;
import org.bench4q.share.models.agent.scriptrecord.BehaviorModel;
import org.bench4q.share.models.agent.scriptrecord.UsePluginModel;
public interface IScriptAdapter {
@ -16,7 +16,7 @@ public interface IScriptAdapter {
public abstract void appendUsePluginsToScenario(
List<UsePluginModel> usePluginModels);
public abstract void insertUserBehaviorsToScenario(BehaviorBaseModel model);
public abstract void insertUserBehaviorsToScenario(BehaviorModel model);
public abstract String getText();

10
src/main/java/org/bench4q/master/scriptrecord/httpcapture/generator/AbstractCodeGenerator.java
View File

@ -30,7 +30,7 @@ import org.bench4q.master.scriptrecord.httpcapture.ProxyServer;
import org.bench4q.master.scriptrecord.httpcapture.Utils;
import org.bench4q.master.scriptrecord.httpcapture.Utils.UserException;
import org.bench4q.share.models.agent.RunScenarioModel;
import org.bench4q.share.models.agent.scriptrecord.BehaviorBaseModel;
import org.bench4q.share.models.agent.scriptrecord.BehaviorModel;
public abstract class AbstractCodeGenerator implements IScriptGenerator,
ProxyServer.Observer, Runnable {
@ -49,7 +49,7 @@ public abstract class AbstractCodeGenerator implements IScriptGenerator,
private String testName;
private boolean ignoreNextResponse;
private Pattern[] namePatterns;
private LinkedList<BehaviorBaseModel> outstandingInserts;
private LinkedList<BehaviorModel> outstandingInserts;
private Thread insertThread;
private String charset;
private long timeElapsedSinceLastestRequest;
@ -378,13 +378,13 @@ public abstract class AbstractCodeGenerator implements IScriptGenerator,
}
public void run() {
this.outstandingInserts = new LinkedList<BehaviorBaseModel>();
this.outstandingInserts = new LinkedList<BehaviorModel>();
try {
while (!(Thread.interrupted())) {
synchronized (this.outstandingInserts) {
this.outstandingInserts.wait();
while (this.outstandingInserts.size() > 0) {
BehaviorBaseModel behaviorModel = this.outstandingInserts
BehaviorModel behaviorModel = this.outstandingInserts
.removeFirst();
this.getScriptAdapter().insertUserBehaviorsToScenario(
behaviorModel);
@ -437,7 +437,7 @@ public abstract class AbstractCodeGenerator implements IScriptGenerator,
public abstract void doHeaders(HeaderValue[] paramArrayOfHeaderValue);
protected void insert(BehaviorBaseModel behaviorModel)
protected void insert(BehaviorModel behaviorModel)
throws Utils.UserException {
synchronized (this.outstandingInserts) {
this.outstandingInserts.add(behaviorModel);

16
src/main/java/org/bench4q/master/scriptrecord/httpcapture/generator/Bench4qCodeGenerator.java
View File

@ -14,7 +14,7 @@ import org.bench4q.master.scriptrecord.httpcapture.IScriptAdapter;
import org.bench4q.master.scriptrecord.httpcapture.Param;
import org.bench4q.master.scriptrecord.httpcapture.Utils;
import org.bench4q.share.models.agent.ParameterModel;
import org.bench4q.share.models.agent.scriptrecord.BehaviorBaseModel;
import org.bench4q.share.models.agent.scriptrecord.BehaviorModel;
import org.bench4q.share.models.agent.scriptrecord.UsePluginModel;
public class Bench4qCodeGenerator extends AbstractCodeGenerator {
@ -152,7 +152,7 @@ public class Bench4qCodeGenerator extends AbstractCodeGenerator {
String contentLength) throws Utils.UserException {
if (!isFirstRequest())
doInsertDelay(getTimeElapsedSinceLastestRequest());
BehaviorBaseModel userBehavior = createHttpBehavior(
BehaviorModel userBehavior = createHttpBehavior(
this.getRequestCount(), action.getUrl(), method);
insertBehavior(userBehavior);
@ -161,7 +161,7 @@ public class Bench4qCodeGenerator extends AbstractCodeGenerator {
}
// TODO:look at this carefully
private BehaviorBaseModel createHttpBehavior(int behaviorId, String url,
private BehaviorModel createHttpBehavior(int behaviorId, String url,
String method) {
ParameterModel param1 = new ParameterModel();
ParameterModel param3 = new ParameterModel();
@ -178,7 +178,7 @@ public class Bench4qCodeGenerator extends AbstractCodeGenerator {
param2.setValue(this.bodyParameters);
params.add(param2);
}
return BehaviorBaseModel.UserBehaviorBuilder(behaviorId, method,
return BehaviorModel.UserBehaviorBuilder(behaviorId, method,
"http", params);
}
@ -253,13 +253,13 @@ public class Bench4qCodeGenerator extends AbstractCodeGenerator {
this.getScriptAdapter().appendUsePluginsToScenario(usePlugins);
}
private void insertBehavior(BehaviorBaseModel behaviorModel)
private void insertBehavior(BehaviorModel behaviorModel)
throws Utils.UserException {
insert(behaviorModel);
}
private void doInsertDelay(long delay) throws Utils.UserException {
BehaviorBaseModel timerBehavior = createTimerBehavior(delay);
BehaviorModel timerBehavior = createTimerBehavior(delay);
try {
insertBehavior(timerBehavior);
} catch (Exception e) {
@ -269,13 +269,13 @@ public class Bench4qCodeGenerator extends AbstractCodeGenerator {
}
private BehaviorBaseModel createTimerBehavior(long delay) {
private BehaviorModel createTimerBehavior(long delay) {
List<ParameterModel> parameterModels = new ArrayList<ParameterModel>();
ParameterModel parameterModel = new ParameterModel();
parameterModel.setKey("time");
parameterModel.setValue(String.valueOf(delay));
parameterModels.add(parameterModel);
return BehaviorBaseModel.TimerBehaviorBuilder(0, "Sleep", "timer",
return BehaviorModel.TimerBehaviorBuilder(0, "Sleep", "timer",
parameterModels);
}

6
src/test/java/ModelTest/BehaviorBaseModelTest.java
View File

@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import org.bench4q.share.models.agent.ParameterModel;
import org.bench4q.share.models.agent.scriptrecord.BehaviorBaseModel;
import org.bench4q.share.models.agent.scriptrecord.BehaviorModel;
import org.junit.Test;
import static org.junit.Assert.*;
@ -17,7 +17,7 @@ public class BehaviorBaseModelTest {
param.setKey("url");
param.setValue("www.baidu.com");
parameterModels.add(param);
BehaviorBaseModel behaviorBaseModel = BehaviorBaseModel
BehaviorModel behaviorBaseModel = BehaviorModel
.UserBehaviorBuilder(20, "Put", "http", parameterModels);
assertEquals(20, behaviorBaseModel.getId());
assertEquals("Put", behaviorBaseModel.getName());
@ -33,7 +33,7 @@ public class BehaviorBaseModelTest {
param.setKey("Time");
param.setValue("209");
params.add(param);
BehaviorBaseModel behaviorBaseModel = BehaviorBaseModel
BehaviorModel behaviorBaseModel = BehaviorModel
.TimerBehaviorBuilder(3, "Sleep", "ContantTimer", params);
assertEquals(3, behaviorBaseModel.getId());
assertEquals("Sleep", behaviorBaseModel.getName());

6
src/test/java/org/bench4q/master/test/recordscript/TestRecordBase.java
View File

@ -8,7 +8,7 @@ import org.bench4q.master.scriptrecord.httpcapture.IScriptAdapter;
import org.bench4q.master.scriptrecord.httpcapture.generator.Bench4qCodeGenerator;
import org.bench4q.share.models.agent.ParameterModel;
import org.bench4q.share.models.agent.RunScenarioModel;
import org.bench4q.share.models.agent.scriptrecord.BehaviorBaseModel;
import org.bench4q.share.models.agent.scriptrecord.BehaviorModel;
public abstract class TestRecordBase {
private IScriptAdapter adapter;
@ -38,12 +38,12 @@ public abstract class TestRecordBase {
this.setCodeGenerator(new Bench4qCodeGenerator(this.getAdpater()));
}
protected BehaviorBaseModel createUserBehaviorModel(String url) {
protected BehaviorModel createUserBehaviorModel(String url) {
List<ParameterModel> params = new ArrayList<ParameterModel>();
ParameterModel param = new ParameterModel();
param.setKey("url");
param.setValue(url);
params.add(param);
return BehaviorBaseModel.UserBehaviorBuilder(1, "Get", "http", params);
return BehaviorModel.UserBehaviorBuilder(1, "Get", "http", params);
}
}