Commit Graph

113 Commits

Author SHA1 Message Date
coderfengyun cbc19f8207 refactor ing
refactor ing
2014-09-23 08:45:47 +08:00
hmm bfc81c62ad fix bug about two ParameterModel when marshal 2014-09-22 16:44:36 +08:00
hmm d186075beb add limit flag to MonitorMain
add Observer to testplan for stopping
2014-09-22 10:35:59 +08:00
hmm 937391a995 add function: web get limit field from master
add function: web submit testplan with LimitModel to master and submit
LimitModel to monitor
2014-09-19 16:41:16 +08:00
coderfengyun b0faf5b729 refact
refact
2014-09-19 14:26:59 +08:00
coderfengyun 73c26d9439 refactor
refactor
2014-09-19 14:06:25 +08:00
coderfengyun fa8aa5b22c refactor
refactor
2014-09-19 10:59:54 +08:00
hmm 846c226496 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-19 09:29:38 +08:00
hmm 0aedd662f0 monitor tell the testplan to stop itself by TestPlanEngine, changes in
master
2014-09-19 09:29:21 +08:00
coderfengyun 43d056a19b refactor the engine's running way to instruction running
refactor the engine's running way to instruction running
2014-09-18 21:43:03 +08:00
hmm 755ac2db3c fix the bug load filter type failed 2014-09-17 08:57:00 +08:00
coderfengyun b1d0f3eb1d refactor MarshalHelper to generic
refactor MarshalHelper to generic
2014-09-15 21:46:03 +08:00
coderfengyun 7d7d8c7837 refactor the testplanControler's api to pure restful
refactor the testplanControler's api to pure restful
2014-09-15 20:16:23 +08:00
coderfengyun 226e9ec522 refactor
refactor
2014-09-15 16:25:29 +08:00
coderfengyun 030794d5ca refactor
refactor
2014-09-15 15:08:56 +08:00
coderfengyun 093f2d0a84 refactor and remove thtat bug of briefing behaviorsBrief
refactor and remove thtat bug of briefing behaviorsBrief
2014-09-15 15:07:39 +08:00
coderfengyun 2b1fdb9f17 add behaviorResultCollector and behaviorStatusResultCollector
add behaviorResultCollector and behaviorStatusResultCollector
2014-09-12 15:08:59 +08:00
coderfengyun 19170fd438 add tests for behaviorsBrief
add  tests for behaviorsBrief
2014-09-11 17:42:55 +08:00
coderfengyun 3c25415a9a refactor
refactor
2014-09-09 17:44:58 +08:00
coderfengyun 4f51501237 add zero zero point to schedule if it doesn't exists
add zero zero point to schedule if it doesn't exists
2014-09-09 16:48:22 +08:00
coderfengyun fa0329dd6b refactor
refactor
2014-09-09 11:36:11 +08:00
coderfengyun 8af22ed469 refactor
refactor
2014-09-09 11:19:38 +08:00
coderfengyun 836a4102db add test for ratio take effect
add test for ratio take effect
2014-09-09 10:04:36 +08:00
hmm 731edb5ea7 change test plan submit 2014-09-05 15:13:06 +08:00
hmm 37abca2229 response host ip to web when recording script
resolve stop recording button 
add highlight in new script and new testplan webpage
2014-09-04 17:43:29 +08:00
coderfengyun ff5dd49e0b remove all problem about ms to s
remove all problem about ms to s
2014-09-04 15:33:19 +08:00
coderfengyun 52a048a89a refactor continue
refactor continue
2014-09-04 10:43:28 +08:00
coderfengyun b943800a02 remove redundant code
remove redundant code
2014-09-04 09:17:45 +08:00
coderfengyun b00cc44785 add support for schedule
add support for schedule
2014-09-04 09:17:04 +08:00
coderfengyun 9a5f32df39 remove warnings
remove warnings
2014-09-02 17:37:02 +08:00
coderfengyun bed2979980 remove all bugs
remove all bugs
2014-09-02 17:16:26 +08:00
coderfengyun e11965f251 add test and remove some bug
add test and remove some bug
2014-09-02 15:46:13 +08:00
coderfengyun fccd5d0a27 refactor, let the schedule be the stand-alone one
refactor, let the schedule be the stand-alone one
2014-09-02 11:39:10 +08:00
hmm dd93e0321f Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
Conflicts:
	Bench4Q-Master/src/main/java/org/bench4q/master/api/TestPlanController.java
	Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/RunScenarioModel.java
	Bench4Q-Web/src/main/java/org/bench4q/web/masterMessager/TestPlanMessager.java
2014-09-02 11:17:37 +08:00
hmm 3c46fdda89 add function filter type of behavior and timer 2014-09-02 10:57:50 +08:00
coderfengyun 70985ffdef Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
Conflicts:

Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioCo
ntext.java

Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioEn
gine.java

Bench4Q-Master/src/main/java/org/bench4q/master/api/TestPlanController.j
ava

Bench4Q-Web/src/main/java/org/bench4q/web/masterMessager/TestPlanMessage
r.java

Bench4Q-Web/src/test/java/org/bench4q/web/test/masterMessager/TestPlanMe
ssageTest.java
2014-09-01 16:18:08 +08:00
coderfengyun 167d8f4934 add test schedule to agent
add tests and pass them
2014-09-01 16:06:47 +08:00
hmm f3816e8304 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
Conflicts:
	Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/RunScenarioModel.java
2014-09-01 14:49:33 +08:00
hmm 50de7f9815 add filteredTypes to RunScenarioModel 2014-09-01 14:46:36 +08:00
coderfengyun b17334bfae Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
Conflicts:

Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioCo
ntext.java

Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioEn
gine.java

Bench4Q-Master/src/main/java/org/bench4q/master/api/TestPlanController.j
ava

Bench4Q-Web/src/main/java/org/bench4q/web/masterMessager/TestPlanMessage
r.java

Bench4Q-Web/src/test/java/org/bench4q/web/test/masterMessager/TestPlanMe
ssageTest.java
2014-09-01 11:07:30 +08:00
coderfengyun fb4e9937ea adding the TestSchedule to agent
adding the TestSchedule to agent
2014-09-01 10:13:05 +08:00
coderfengyun aaf7f00759 fix gitignore problem 2014-08-28 08:49:15 +08:00
hmm 4c53ba8ccd Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
Conflicts:
	Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/basic/http/ui.xml
	Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/dtd/ui.dtd
2014-08-25 17:32:22 +08:00
hmm 247de8b4ce add id to page/batch/behavior and set nickName when record script 2014-08-25 17:28:38 +08:00
daisyonly a5b7b95958 edit ui.xml 2014-08-25 17:06:12 +08:00
hmm 51efd4556c set UsePluginModel nickName 2014-08-25 13:28:29 +08:00
hmm f47d025b38 change BathcModel Id to id 2014-08-22 14:10:10 +08:00
fanfuxiaoran f78be23664 add name...to testplanresult model 2014-08-21 16:56:49 +08:00
hmm 41f7dd7b42 PageModel add id 2014-08-21 13:20:21 +08:00
hmm 0950ae617c Conflicts:
Bench4Q-Web/src/main/webapp/script/editor/uiFactory.js
2014-08-15 16:47:22 +08:00