Commit Graph

158 Commits

Author SHA1 Message Date
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 836a4102db add test for ratio take effect
add test for ratio take effect
2014-09-09 10:04:36 +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
daisyonly 1f031c4cad Revert "edit CsvProvider Plugin"
This reverts commit ed466e085ab3187da7df8e4f9c2ce0e933d77ed3.
2014-09-04 15:06:57 +08:00
daisyonly 9781437652 edit CsvProvider Plugin
edit CsvProvider Plugin
2014-09-04 15:06:54 +08:00
coderfengyun e67a80db8d add new Test
add new Test
2014-09-04 14:06:39 +08:00
coderfengyun c9bb8207a4 update observers
update observers
2014-09-04 10:57:00 +08:00
hmm ecf91213c2 solve request header——accept q=* 2014-09-04 10:40:09 +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 2a69bc8884 refactor code and remove some bug
refactor code and remove some bug
2014-09-02 16:30:13 +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 6e973cf6db add assisting methods for test
refactor, let the schedule be the stand-alone one
2014-09-02 14:32:01 +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 2b3f97a605 sync 2014-09-02 10:41:46 +08:00
coderfengyun 6c19a07c61 modify the api, and need to be tested
modify the api, and need to be tested
2014-09-02 10:33:09 +08:00
coderfengyun fd82b54d4e refs the api of bookTest
refs the api of bookTest
2014-09-02 10:12:28 +08:00
coderfengyun b288d92336 add supervisor to schedule
add supervisor to schedule, and need to be tested
2014-09-02 09:34:31 +08:00
coderfengyun 3e73f4b4ed finish about schedule
this.setFinished(true);
2014-09-01 17:32:26 +08:00
coderfengyun ddc57ba3ca remove redundant code
remove redundant code
2014-09-01 16:20:20 +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 a72cb7a307 add expectedResCode and expectedResCntType to http ui.xml 2014-09-01 14:45:05 +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 24a529451e refactor the tests
refactor the tests
2014-08-29 15:43:15 +08:00
coderfengyun 22cd79bb4e Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-08-29 15:34:25 +08:00
coderfengyun 5ff8fb00ac remove the bug of taskMaker
remove the bug of taskMaker that just make so many junk jobs
2014-08-29 15:34:14 +08:00
daisyonly 170d8524b1 edit ui.xml
edit ui.xml
2014-08-29 11:41:38 +08:00
coderfengyun 77168b6ac7 remove a warning from agent
remove a warning from agent
2014-08-29 08:58:42 +08:00
hmm a4451435a1 add required attribute to csvprovider ui.xml 2014-08-28 16:42:28 +08:00
coderfengyun aaf7f00759 fix gitignore problem 2014-08-28 08:49:15 +08:00
rzs840707 7626aca95f HBase and MongoDB Plugin update 2014-08-27 16:26:41 +08:00
rzs840707 8fd8b0a890 Add Oracle Plugin 2014-08-27 16:03:20 +08:00
rzs840707 86dbdfad95 MongoDB Plugin,Changed to can connect a set of mongo servers 2014-08-27 15:57:14 +08:00
daisyonly c93b0319db edit ui.xml 2014-08-26 14:24:55 +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 050c231ae6 change "Get" to "get" 2014-08-25 08:39:35 +08:00
coderfengyun a70cda6d62 add test about ScriptSampler
add test about ScriptSampler
2014-08-22 14:19:10 +08:00
coderfengyun ab845abf2a add test about ScriptSampler
add test about ScriptSampler
2014-08-22 14:18:03 +08:00
hmm 87a16b3ee5 PageModel add id 2014-08-21 13:20:03 +08:00
coderfengyun c53abbe0ff add new test
add new test
2014-08-21 09:18:07 +08:00
hmm 0950ae617c Conflicts:
Bench4Q-Web/src/main/webapp/script/editor/uiFactory.js
2014-08-15 16:47:22 +08:00
coderfengyun c2e661733f add code and edit the usepluginmodel
add code and edit the usepluginmodel
2014-08-15 13:57:31 +08:00
coderfengyun f0296eb398 remove that outer right join
remove that outer right join
2014-07-21 13:47:34 +08:00