 fanfuxiaoran
|
6e9a62cbd2
|
add test to upload param file
|
2014-04-22 23:19:23 +08:00 |
|
fanfuxiaoran
|
3207b48d3a
|
fix the upload script and file
|
2014-04-22 23:17:01 +08:00 |
 coderfengyun
|
9d622781b3
|
remove conflict
remove conflict
|
2014-04-22 17:53:12 +08:00 |
|
coderfengyun
|
6877d2e59f
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
Conflicts:
Bench4Q-Master/pluginUI/ui.xml
Bench4Q-Master/src/main/java/org/bench4q/master/api/ScriptController.java
Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/plugin/FileType.java
Bench4Q-Master/src/main/resources/org/bench4q/master/config/hibernate.cfg.xml
Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/FileModel.java
|
2014-04-22 17:50:51 +08:00 |
|
coderfengyun
|
d7082a113c
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
Conflicts:
Bench4Q-Master/src/main/java/org/bench4q/master/api/ScriptController.java
|
2014-04-22 17:47:16 +08:00 |
|
coderfengyun
|
8331391b35
|
edit UploadScriptWithParams
edit UploadScriptWithParams, and need to be tested
|
2014-04-22 17:38:06 +08:00 |
|
fanfuxiaoran
|
5963e394c8
|
add file type
|
2014-04-22 15:46:12 +08:00 |
|
fanfuxiaoran
|
d035288cfa
|
fix the bug in get behavior infos ,add test
|
2014-04-22 11:11:13 +08:00 |
|
coderfengyun
|
dc45262df6
|
refactor
refactor
|
2014-04-22 09:31:29 +08:00 |
|
coderfengyun
|
92b1f36356
|
refactoring
refactoring
|
2014-04-22 09:16:10 +08:00 |
|
coderfengyun
|
0f9e403731
|
refactor
refactor
|
2014-04-22 09:13:11 +08:00 |
|
fanfuxiaoran
|
755599e5aa
|
add paramTypeModel in paramInfoModel
|
2014-04-21 15:27:23 +08:00 |
ZhengYingYing
|
6188d14105
|
remove gson in plugin api
|
2014-04-21 11:12:34 +08:00 |
|
fanfuxiaoran
|
4aec35152c
|
add test to plugin pramtype
|
2014-04-21 09:34:41 +08:00 |
|
fanfuxiaoran
|
97c4a31855
|
change the Serialization of paramTypeModel
|
2014-04-18 18:16:31 +08:00 |
|
fanfuxiaoran
|
41f9961b41
|
refactor
|
2014-04-17 18:13:46 +08:00 |
|
coderfengyun
|
fd20997b24
|
remove those unused tasks
remove those unused tasks
|
2014-04-17 15:40:24 +08:00 |
|
coderfengyun
|
124a499257
|
refactor
refactor
|
2014-04-17 15:23:32 +08:00 |
|
coderfengyun
|
fcee930598
|
refactor
refactor
|
2014-04-17 15:14:58 +08:00 |
|
fanfuxiaoran
|
b1b7fa28a1
|
testing plugin controller
|
2014-04-17 14:32:34 +08:00 |
|
fanfuxiaoran
|
3b57cc690f
|
add behavior to behavior
|
2014-04-17 11:38:46 +08:00 |
|
fanfuxiaoran
|
22ef97bd37
|
add plugin service and controller
|
2014-04-16 17:09:29 +08:00 |
|
coderfengyun
|
3190963c2d
|
refactor the organization of the code
refactor the organization of the code
|
2014-04-16 17:05:34 +08:00 |
|
coderfengyun
|
bb854e437c
|
refactor the organization of the code
refactor the organization of the code
|
2014-04-16 16:49:11 +08:00 |
|
coderfengyun
|
50a4ad2720
|
refactor
refactor
|
2014-04-16 16:35:23 +08:00 |
|
fanfuxiaoran
|
60726bfe3b
|
refactor the plugin manange :now add plugin ui of xml is able
|
2014-04-16 15:05:09 +08:00 |
|
coderfengyun
|
f2863281f6
|
Add DFA of extract the parameter by provider
Add DFA of extract the parameter by provider
|
2014-04-11 16:43:07 +08:00 |
|
fanfuxiaoran
|
8b2b7c1c89
|
add testResultSave to testPlan
|
2014-04-09 13:35:24 +08:00 |
|
fanfuxiaoran
|
db6393773c
|
test for git
|
2014-04-09 11:30:46 +08:00 |
|
fanfuxiaoran
|
28554f125e
|
finish save test result refactor
|
2014-04-09 10:52:25 +08:00 |
|
fanfuxiaoran
|
93e7ea5ccc
|
change the save result
|
2014-04-08 18:47:06 +08:00 |
|
coderfengyun
|
ae3800160b
|
.gitignore not work well
|
2014-04-08 09:53:17 +08:00 |
|
coderfengyun
|
ec42ccc4a5
|
remove git ignore from all the children projects
remove git ignore from all the children projects
|
2014-04-08 09:27:33 +08:00 |
|
fanfuxiaoran
|
2884acd9b2
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
|
2014-04-08 09:10:55 +08:00 |
|
fanfuxiaoran
|
57924debce
|
add test
|
2014-04-04 17:41:35 +08:00 |
|
coderfengyun
|
f35e5964b3
|
litte step towads parameterization
litte step towads parameterization
|
2014-04-04 17:30:25 +08:00 |
|
fanfuxiaoran
|
cc0cdd834d
|
when testplan is finished,stop the doAfterRun thread in testplan
|
2014-04-04 14:31:51 +08:00 |
|
zhengyingying
|
3603b08369
|
modify ScriptController
|
2014-04-04 11:33:02 +08:00 |
|
fanfuxiaoran
|
ecce6f01c4
|
refactor the testplan result save .save interval is 5 second;
|
2014-04-03 17:13:09 +08:00 |
|
fanfuxiaoran
|
e25a35d20b
|
refactor the plugin ,change eager get method to lazy get method ,
and change get the interface of get method list
|
2014-04-03 13:49:49 +08:00 |
|
coderfengyun
|
8d1427dabe
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
Conflicts:
Bench4Q-Web/src/main/webapp/script-edit.jsp
|
2014-04-02 09:50:21 +08:00 |
|
fanfuxiaoran
|
d1841dcd8c
|
refactor register jsp
|
2014-03-31 23:24:15 +08:00 |
|
coderfengyun
|
ec89f4a969
|
add new log for stop agent
add new log for stop agent
|
2014-03-31 16:15:41 +08:00 |
|
coderfengyun
|
f402cfc575
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
|
2014-03-31 16:09:10 +08:00 |
|
coderfengyun
|
b209177720
|
add finish for script brief
add finish for script brief
|
2014-03-31 16:08:58 +08:00 |
|
fanfuxiaoran
|
2866bd973e
|
add testStatus to monitor doAfterRun
|
2014-03-31 15:59:10 +08:00 |
|
coderfengyun
|
a368444412
|
remove the bug for not stop quering the status
remove the bug for not stop quering the status
|
2014-03-31 15:53:38 +08:00 |
|
coderfengyun
|
5475ef7112
|
add try catch
add try catch
|
2014-03-31 14:50:51 +08:00 |
|
fanfuxiaoran
|
efb6e56141
|
to find bug notStart
|
2014-03-31 14:23:40 +08:00 |
|
coderfengyun
|
dea67a7a85
|
edit load lazy
edit load lazy
|
2014-03-31 11:07:46 +08:00 |
|
fanfuxiaoran
|
fbd59fd03f
|
fix the bug load testplan when testPlan is empty
|
2014-03-28 16:15:28 +08:00 |
|
fanfuxiaoran
|
111666f3e4
|
add some log
|
2014-03-27 21:07:07 +08:00 |
|
fanfuxiaoran
|
6400a18ec4
|
add exception log
|
2014-03-27 11:21:26 +08:00 |
|
fanfuxiaoran
|
42cf1b02bf
|
remove the bug that in save testScript result:behavior and page can not
be saved:in testPlanScript the notify is wrong
|
2014-03-26 15:40:17 +08:00 |
|
fanfuxiaoran
|
25e60bccfc
|
add test to get script result
|
2014-03-26 15:11:33 +08:00 |
|
fanfuxiaoran
|
6e7b6fbb8c
|
add test to agent messenger
|
2014-03-26 11:36:45 +08:00 |
|
coderfengyun
|
5b3dd8049a
|
remove a warnning
remove a warnning
|
2014-03-26 09:26:56 +08:00 |
|
fanfuxiaoran
|
23f5642b3b
|
add validate about the plugin is null
|
2014-03-24 10:45:51 +08:00 |
|
fanfuxiaoran
|
268f751220
|
fix the bug in load monitor reuslt in monitor result service
|
2014-03-24 10:17:08 +08:00 |
|
fanfuxiaoran
|
98525d2c7d
|
change get the script result from master
|
2014-03-21 18:05:02 +08:00 |
|
zhengyingying
|
a755c10d6c
|
update recorder name in pom.xml
|
2014-03-21 16:20:52 +08:00 |
|
coderfengyun
|
bbeae6ffb6
|
refactor
refactor
|
2014-03-21 15:54:01 +08:00 |
|
coderfengyun
|
532700d0af
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
|
2014-03-21 10:34:13 +08:00 |
|
coderfengyun
|
ab22ab6ca5
|
remove recorder from master
|
2014-03-21 10:33:19 +08:00 |
|
fanfuxiaoran
|
7d9a121849
|
fix the bug in pluginRepo
|
2014-03-21 10:33:16 +08:00 |
|
coderfengyun
|
75306de37b
|
add some dependencies to recorder
|
2014-03-21 10:16:05 +08:00 |
|
coderfengyun
|
b21400c69c
|
add monitor-sigar
|
2014-03-20 15:55:56 +08:00 |
|
fanfuxiaoran
|
0835f08787
|
update the plugin
|
2014-03-20 15:06:17 +08:00 |
|
coderfengyun
|
dc658da7c5
|
edit git ignore
|
2014-03-20 14:45:57 +08:00 |
|
coderfengyun
|
b279ff1706
|
add .gitignore
|
2014-03-20 14:10:32 +08:00 |
|
coderfengyun
|
a67fed6d79
|
add pom to web
|
2014-03-20 14:03:21 +08:00 |
|
coderfengyun
|
96459a3844
|
merge conflict
|
2014-03-20 13:43:54 +08:00 |
|
coderfengyun
|
02bd1f5b89
|
Merge Bench4Q-Monitor
|
2014-03-20 11:27:12 +08:00 |
|
coderfengyun
|
b4df36bfed
|
Merge Bench4Q-Master
|
2014-03-20 11:21:05 +08:00 |