Commit Graph

226 Commits

Author SHA1 Message Date
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
hmm 0aedd662f0 monitor tell the testplan to stop itself by TestPlanEngine, changes in
master
2014-09-19 09:29:21 +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
hmm dcf91a19b1 fix the override error about BehaviorStatusCodeStatistics and
ScriptStatistics
2014-09-15 16:36:15 +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 513cbf3a4f refactor
refactor
2014-09-12 16:59:15 +08:00
coderfengyun a703ecc65c refacotr
refacotr
2014-09-12 15:09:54 +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 21e3cf4f9f add more tests about statistics of behaviorResult
add more tests about statistics of behaviorResult
2014-09-10 17:10:01 +08:00
hmm dab0984203 get charset from html 2014-09-10 10:59:41 +08:00
luqiong f743714b32 modify Chinese to English
modify Chinese to English
2014-09-10 09:47:59 +08:00
coderfengyun 3c25415a9a refactor
refactor
2014-09-09 17:44:58 +08:00
daisyonly fc9222c104 fix pir chart bug
fix pir chart bug
2014-09-09 17:39:54 +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
luqiong 0ec2f364f7 refactor and try to log to front end
refactor and try to log to front end
2014-09-09 15:36:43 +08:00
coderfengyun a04a075ffe refactor, and add test for generateScheduleModel as ratio
refactor, and add test for generateScheduleModel as ratio
2014-09-09 14:17:07 +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
luqiong 23709d0a94 remove all overrides
remove all overrides
2014-09-09 10:18:30 +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 270c4b8d14 add function recording many times in a port 2014-09-09 09:40:49 +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 0f29deb274 remove a bug for ms to s
remove a bug for ms to s
:from milisecond to second
2014-09-04 15:02:53 +08:00
coderfengyun 5390aa5c05 ok, i can run it now
ok, i can run it now
2014-09-04 14:45:53 +08:00
hmm 5a0a1074c9 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-04 14:15:24 +08:00
hmm 9756ef1999 fix bug "scriptFilterOptionsModel may be null" 2014-09-04 14:15:06 +08:00
coderfengyun 55a78b46fe Merge remote-tracking branch 'origin/master'
Conflicts:

	Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/RunningAgentDB.java

	Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/TestPlanScript.java
2014-09-04 14:09:13 +08:00
coderfengyun e67a80db8d add new Test
add new Test
2014-09-04 14:06:39 +08:00
hmm 47d4b97131 change filter script to testplanscript from script 2014-09-04 13:44:22 +08:00
coderfengyun 52a048a89a refactor continue
refactor continue
2014-09-04 10:43:28 +08:00
coderfengyun 6a8e50cf6f Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-09-04 09:17:14 +08:00
coderfengyun b00cc44785 add support for schedule
add support for schedule
2014-09-04 09:17:04 +08:00
hmm 230a2e23ca list script and testplan by time desc 2014-09-03 14:30:05 +08:00
hmm 8b0e7a1985 success to filter behavior 2014-09-03 13:35:02 +08:00
hmm 4e01cf19db Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-02 17:26:19 +08:00
hmm 96941bb33b add filter think-time and sort the js of testplan 2014-09-02 17:25:55 +08:00
coderfengyun 3a03b2906a remove warnings
remove warnings
2014-09-02 17:24:28 +08:00
hmm fb2a04fd68 add stoprecording and stopproxyserver api 2014-09-02 15:06:17 +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 1bfbbde54d Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-02 11:17:58 +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
luqiong db964183e2 modify the gettter to transient
modify the gettter to transient
2014-09-02 11:16:15 +08:00
hmm 5a6ce8a63b no creating new entity 2014-09-02 10:59:50 +08:00
hmm 3c46fdda89 add function filter type of behavior and timer 2014-09-02 10:57:50 +08:00