p05617423
/
bench4q
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
hmm 2014-08-25 17:32:22 +08:00
parent 247de8b4ce 0f947557cc
commit 4c53ba8ccd
11 changed files with 77 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/basic/http/ui.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE ui SYSTEM "../../dtd/ui.dtd"> <!DOCTYPE ui SYSTEM "../../dtd/ui.dtd">
<ui> <ui>
<plugin name="Http"> <plugin name="Http">
<params> <params>
@ -19,15 +19,16 @@
<param name="respVarsToSaveInSession" <param name="respVarsToSaveInSession"
label="The regular expression of extracting variables from response" required="false"> label="The regular expression of extracting variables from response" required="false">
<table cols="varName|varRegularExpression|leftBoundry|rightBoundry" /> <table cols="varName|varRegularExpression|leftBoundry|rightBoundry" />
</param> </param>
</params> </params>
</behavior> </behavior>
<behavior name="Delete"> <behavior name="Delete">
<params> <params>
<param name="url" label="The Url to request"> <param name="url" label="The Url to request" required="true">
<field size="7" /> <field size="7" />
</param> </param>
<param name="queryParams" label="The query params of this request"> <param name="queryParams" label="The query params of this request" required="false">
<nfield /> <nfield />
</param> </param>
<param name="headers" label="The headers of this request"> <param name="headers" label="The headers of this request">
@ -41,19 +42,19 @@
</behavior> </behavior>
<behavior name="Post"> <behavior name="Post">
<params> <params>
<param name="url" label="The Url to request"> <param name="url" label="The Url to request" required="true">
<field size="7" /> <field size="7" />
</param> </param>
<param name="queryParams" label="The query params of this request"> <param name="queryParams" label="The query params of this request" required="false">
<nfield /> <nfield />
</param> </param>
<param name="headers" label="The headers of this request"> <param name="headers" label="The headers of this request">
<table cols="header|value" /> <table cols="header|value" />
</param> </param>
<param name="bodyContent" label="The body that will be post"> <param name="bodyContent" label="The body that will be post" required="false">
<field size="7" /> <field size="7" />
</param> </param>
<param name="bodyParameters" label="The parameters will be post in the body"> <param name="bodyParameters" label="The parameters will be post in the body" required="false">
<nfield /> <nfield />
</param> </param>
<param name="respVarsToSaveInSession" <param name="respVarsToSaveInSession"
@ -64,19 +65,19 @@
</behavior> </behavior>
<behavior name="Put"> <behavior name="Put">
<params> <params>
<param name="url" label="The Url to request"> <param name="url" label="The Url to request" required="true">
<field size="7" /> <field size="7" />
</param> </param>
<param name="queryParams" label="The query params of this request"> <param name="queryParams" label="The query params of this request" required="false">
<nfield /> <nfield />
</param> </param>
<param name="headers" label="The headers of this request"> <param name="headers" label="The headers of this request">
<table cols="header|value" /> <table cols="header|value" />
</param> </param>
<param name="bodyContent" label="The body that will be put"> <param name="bodyContent" label="The body that will be put" required="false">
<field size="7" /> <field size="7" />
</param> </param>
<param name="bodyParameters" label="The parameters will be put in the body"> <param name="bodyParameters" label="The parameters will be put in the body" required="false">
<nfield /> <nfield />
</param> </param>
<param name="respVarsToSaveInSession" <param name="respVarsToSaveInSession"

6
Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/basic/random/ui.xml
View File

@ -3,13 +3,13 @@
<ui> <ui>
<plugin name="Random"> <plugin name="Random">
<params> <params>
<param name="begin" label="The Beginning of the range"> <param name="begin" label="The Beginning of the range" required="true">
<field size="5"></field> <field size="5"></field>
</param> </param>
<param name="end" label="The end of the range"> <param name="end" label="The end of the range" required="true">
<field size="5"></field> <field size="5"></field>
</param> </param>
<param name="format" label="The format of the value"> <param name="format" label="The format of the value" required="false">
<field size="5"></field> <field size="5"></field>
</param> </param>
</params> </params>

2
Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/basic/timer/ui.xml
View File

@ -6,7 +6,7 @@
</plugin> </plugin>
<timer name="Sleep"> <timer name="Sleep">
<params> <params>
<param name="time"> <param name="time" required="true">
<field size="6" /> <field size="6" />
</param> </param>
</params> </params>

2
Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/dtd/ui.dtd
View File

@ -20,7 +20,7 @@
<!ATTLIST param <!ATTLIST param
name CDATA #REQUIRED name CDATA #REQUIRED
label CDATA #IMPLIED label CDATA #IMPLIED
required CDATA #IMPLIED required CDATA #REQUIRED
> >
<!ELEMENT group (param|group)*> <!ELEMENT group (param|group)*>
<!ATTLIST group <!ATTLIST group

11
Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/ParamInfoModel.java
View File

@ -9,6 +9,7 @@ public class ParamInfoModel {
private String name; private String name;
private String label; private String label;
private String required;
private String value; private String value;
private ParamTypeModel paramTypeModel; private ParamTypeModel paramTypeModel;
@ -31,6 +32,16 @@ public class ParamInfoModel {
this.label = label; this.label = label;
} }
@XmlElement
public String getRequired() {
return required;
}
public void setRequired(String required) {
this.required = required;
}
@XmlElements({ @XmlElement(name = "field", type = FieldModel.class), @XmlElements({ @XmlElement(name = "field", type = FieldModel.class),
@XmlElement(name = "table", type = TableModel.class), @XmlElement(name = "table", type = TableModel.class),
@XmlElement(name = "checkbox", type = CheckBoxModel.class), @XmlElement(name = "checkbox", type = CheckBoxModel.class),

2
Bench4Q-Web/src/main/resources/ipConfig.properties
View File

@ -1 +1 @@
masterAddress=localhost:8901 masterAddress=133.133.2.100:8901

1
Bench4Q-Web/src/main/webapp/createScript.jsp
View File

@ -257,6 +257,7 @@ body {
<script src="script/scriptManager/usePlugin.js"></script> <script src="script/scriptManager/usePlugin.js"></script>
<script src="script/scriptManager/submitScript.js"></script> <script src="script/scriptManager/submitScript.js"></script>
<script src="script/scriptManager/createScript.js"></script> <script src="script/scriptManager/createScript.js"></script>
<script src="script/scriptManager/contentVerification.js"></script>
</fmt:bundle> </fmt:bundle>

32
Bench4Q-Web/src/main/webapp/css/result.css
View File

@ -68,12 +68,38 @@
} }
.testHeader { .testHeader {
margin-top: 20px;
margin-bottom: 20px;
background-color: #fff; background-color: #fff;
border: 1px solid #ccc; border: 1px solid #ccc;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
border-top: 3px solid #ccc; border-top: 3px solid;
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#f3f3f3');
background:-webkit-gradient(linear,left top,left bottom,from(#fcfcfc),to(#f3f3f3));
background:-moz-linear-gradient(top,#fcfcfc,#f3f3f3);
background:-o-linear-gradient(top,#fcfcfc,#f3f3f3);
background:linear-gradient(to bottom,#fcfcfc,#f3f3f3)
}
.testHeader-top {
margin-top:20px;
border-top-color:#369bd7
}
.testHeader-middle {
margin-bottom:20px;
border-top-width:0
}
.testHeader .span-brief h6{
font-size:14px;
margin-bottom:5px
}
.testHeader .span-brief h4{
font-size:24px
}
.testHeader .span-brief-last h6{
font-size:14px;
} }
.innerTable { .innerTable {

1
Bench4Q-Web/src/main/webapp/editScript.jsp
View File

@ -254,6 +254,7 @@
<script src="script/scriptManager/jstreeFactory.js"></script> <script src="script/scriptManager/jstreeFactory.js"></script>
<script src="script/scriptManager/scriptEditor.js"></script> <script src="script/scriptManager/scriptEditor.js"></script>
<script src="script/scriptManager/scriptModels.js"></script> <script src="script/scriptManager/scriptModels.js"></script>
<script src="script/scriptManager/contentVerification.js"></script>
</fmt:bundle> </fmt:bundle>
</body> </body>
</html> </html>

25
Bench4Q-Web/src/main/webapp/result.jsp
View File

@ -43,20 +43,17 @@ body {
<li><a href="#"><fmt:message key="result" /></a></li> <li><a href="#"><fmt:message key="result" /></a></li>
</ul> </ul>
</div> </div>
<div class="row-fluid testHeader"> <div class="row-fluid testHeader testHeader-top">
<div class="span4 span-brief"> <div class="span4 span-brief">
<fmt:message key="testPlanName" /> <h6><fmt:message key="testPlanName" /></h6><br>
<br> <br>
<div id="testplanName"></div> <div id="testplanName"></div>
</div> </div>
<div class="span4 span-brief"> <div class="span4 span-brief">
<fmt:message key="createdatetime" /> <h6><fmt:message key="createdatetime" /></h6><br>
<br> <br>
<div id="createTime"></div> <div id="createTime"></div>
</div> </div>
<div class="span4 span-brief"> <div class="span4 span-brief">
<fmt:message key="testExecuteTime" /> <h6><fmt:message key="testExecuteTime" /></h6><br>
<br> <br>
<div id="testTime"></div> <div id="testTime"></div>
</div> </div>
<%-- </div> <%-- </div>
@ -66,27 +63,23 @@ body {
<div id="scripts"></div> <div id="scripts"></div>
</div> --%> </div> --%>
</div> </div>
<div class="row-fluid testHeader" id="test"> <div class="row-fluid testHeader testHeader-middle" id="test">
<div class="span3 span-brief"> <div class="span3 span-brief">
<fmt:message key="result-testStatus" /> <h6><fmt:message key="result-testStatus" /></h6><br>
<br> <br>
<div id="status"></div> <div id="status"></div>
</div> </div>
<div class="span3 span-brief"> <div class="span3 span-brief">
<fmt:message key="result-vuser" /> <h6><fmt:message key="result-vuser" /></h6><br>
<br> <br>
<div> <div>
<span id="vu"></span> <span id="vu"></span>
</div> </div>
</div> </div>
<div class="span3 span-brief"> <div class="span3 span-brief">
<fmt:message key="result-request" /> <h6><fmt:message key="result-request" /></h6><br>
<br> <br>
<div id="request"></div> <div id="request"></div>
</div> </div>
<div class="span3 span-brief-last"> <div class="span3 span-brief-last">
<fmt:message key="stopTestPlan" /> <h6><fmt:message key="stopTestPlan" /></h6><br>
<br> <br>
<button type="button" class="btn btn-primary " id="stop-testplan"><fmt:message key="stop" /></button> <button type="button" class="btn btn-primary " id="stop-testplan"><fmt:message key="stop" /></button>
</div> </div>
</div> </div>

6
Bench4Q-Web/src/main/webapp/script/scriptManager/contentVerification.js Normal file
View File

@ -0,0 +1,6 @@
$(document).ready(function(){
$("#behaviorEditor").on("focusout",".editor input",function(){
console.log(this);
alert("This input field has lost its focus.");
})
});