p05617423
/
bench4q
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,010 Commits 1 Branch 0 Tags 58 MiB
Commit Graph

2010 Commits

Author SHA1 Message Date
coderfengyun e8378b6476 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-09-02 17:37:13 +08:00
coderfengyun 9a5f32df39 remove warnings 
remove warnings
 2014-09-02 17:37: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
coderfengyun bed2979980 remove all bugs 
remove all bugs
 2014-09-02 17:16:26 +08:00
luqiong 26d689e005 edit filter dialog 
edit filter dialog
 2014-09-02 16:39:42 +08:00
coderfengyun 2a69bc8884 refactor code and remove some bug 
refactor code and remove some bug
 2014-09-02 16:30:13 +08:00
luqiong 01a0e56f6e add filter button 2014-09-02 16:09:10 +08:00
coderfengyun e11965f251 add test and remove some bug 
add test and remove some bug
 2014-09-02 15:46:13 +08:00
hmm 89d9b0711f delete unused js 2014-09-02 15:44:55 +08:00
hmm c55daae043 add loadProperties.js 2014-09-02 15:37:12 +08:00
hmm 8c1e9dd11f Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-02 15:06:32 +08:00
hmm fb2a04fd68 add stoprecording and stopproxyserver api 2014-09-02 15:06:17 +08:00
daisyonly 3672d3d101 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-09-02 14:40:15 +08:00
daisyonly 9fc76cf05e Add "required" tips 
Add "required" tips
 2014-09-02 14:40:00 +08:00
hmm 3349e5e0dc Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-02 14:37:01 +08:00
hmm 9a668ddf5e add chunked encoding to response 2014-09-02 14:36:43 +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
luqiong 5564c9d78b modify stopServer button 
modify stopServer button
 2014-09-02 14:22:17 +08:00
luqiong bbea098553 add i18n config 2014-09-02 14:08:38 +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 723de68ba8 get expcode and expcnttype from recording 2014-09-02 10:58:47 +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 9157b793fc add realStartTime to scenario 
add realStartTime to scenario
 2014-09-02 10:27:42 +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 2dcaf3664f add loadFilterTypeList api 2014-09-01 14:46:57 +08:00
hmm 50de7f9815 add filteredTypes to RunScenarioModel 2014-09-01 14:46:36 +08:00
hmm 6954a15bf4 get respCode and respCntType from response 2014-09-01 14:46:07 +08:00
hmm 7ccd47d74b add loadFilterTypeList api 2014-09-01 14:45:24 +08:00
hmm a72cb7a307 add expectedResCode and expectedResCntType to http ui.xml 2014-09-01 14:45:05 +08:00
daisyonly 7a04393a14 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-09-01 14:38:19 +08:00
daisyonly 6ba38aa94d edit PluginEntitiFactory.java 
edit PluginEntitiFactory.java
 2014-09-01 14:38:02 +08:00
coderfengyun 37622fc0ee Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-09-01 11:07:48 +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
daisyonly 03b99cc27e Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-09-01 10:50:24 +08:00
daisyonly 86a7926fef edit editorFactory.js 
edit editorFactory.js
 2014-09-01 10:50:08 +08:00
hmm c3af582914 change startrecording api 2014-09-01 10:43:02 +08:00