Author: hansbak
Date: Sun Aug 11 06:25:12 2013
New Revision: 1512877
URL: http://svn.apache.org/r1512877
Log:
fixed some errors in the component test list screen
Modified:
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/RunTestEvents.java
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/TestSuiteInfo.groovy
ofbiz/trunk/framework/webtools/widget/ArtifactInfoForms.xml
ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml
Modified:
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/RunTestEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/RunTestEvents.java?rev=1512877&r1=1512876&r2=1512877&view=diff
==============================================================================
---
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/RunTestEvents.java
(original)
+++
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/RunTestEvents.java
Sun Aug 11 06:25:12 2013
@@ -33,16 +33,16 @@ public class RunTestEvents {
public static String runTest(HttpServletRequest request,
HttpServletResponse response) throws ContainerException {
- String componentName = request.getParameter("compName");
+ String component = request.getParameter("compName");
String suiteName = request.getParameter("suiteName");
String caseName = request.getParameter("caseName");
String result = null;
String[] args = null;
if (caseName == null) {
- args = new String[]{"-componentname=" + componentName,
"-suitename=" + suiteName + "-loglevel=info"};
+ args = new String[]{"-component=" + component, " -suitename=" +
suiteName + " -loglevel=info"};
} else {
- args = new String[]{"-componentname=" + componentName,
"-suitename=" + suiteName, "-case=" + caseName, "-loglevel=info"};
+ args = new String[]{"-component=" + component, " -suitename=" +
suiteName, " -case=" + caseName, " -loglevel=info"};
}
TestRunContainer testRunContainer = new TestRunContainer();
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/TestSuiteInfo.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/TestSuiteInfo.groovy?rev=1512877&r1=1512876&r2=1512877&view=diff
==============================================================================
---
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/TestSuiteInfo.groovy
(original)
+++
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/TestSuiteInfo.groovy
Sun Aug 11 06:25:12 2013
@@ -45,10 +45,10 @@ for (ComponentConfig.TestSuiteInfo testS
testMap = FastMap.newInstance();
String caseName = testCaseElement.getAttribute("case-name");
if (firstLine == true) {
- testMap = UtilMisc.toMap("suiteName", suiteName, "caseName",
caseName);
+ testMap = UtilMisc.toMap("suiteName", suiteName,
"suiteNameSave", suiteName, "caseName", caseName);
firstLine = false;
} else {
- testMap = UtilMisc.toMap("caseName", caseName);
+ testMap = UtilMisc.toMap("suiteNameSave", suiteName,
"caseName", caseName);
}
testList.add(testMap);
}
Modified: ofbiz/trunk/framework/webtools/widget/ArtifactInfoForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ArtifactInfoForms.xml?rev=1512877&r1=1512876&r2=1512877&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ArtifactInfoForms.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ArtifactInfoForms.xml Sun Aug 11
06:25:12 2013
@@ -36,12 +36,12 @@
odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<field name="compName"><hidden value="${parameters.compName}"/></field>
<field name="suiteName"><display/></field>
- <!-- field name="runSuite" use-when="suiteName!=void">
- <hyperlink
target="RunTest?compName=${parameters.compName}&suiteName=${suiteName}"
description="run suite"/>
- </field-->
+ <field name="runSuite" use-when="suiteName!=void">
+ <hyperlink
target="RunTest?compName=${parameters.compName}&suiteName=${suiteNameSave}"
description="run suite"/>
+ </field>
<field name="caseName"><display/></field>
<field name="runCase">
- <hyperlink
target="RunTest?compName=${parameters.compName}&suiteName=${suiteName}&caseName=${caseName}"
description="run case"/>
+ <hyperlink
target="RunTest?compName=${parameters.compName}&suiteName=${suiteNameSave}&caseName=${caseName}"
description="run case"/>
</field>
</form>
</forms>
Modified: ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml?rev=1512877&r1=1512876&r2=1512877&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml Sun Aug 11
06:25:12 2013
@@ -49,6 +49,7 @@ under the License.
<set field="titleProperty" value="WebtoolsViewComponents"/>
<set field="tabButtonItem" value="viewents"/>
<script
location="component://webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ComponentList.groovy"/>
+ <set field="viewSize" value="30"/>
</actions>
<widgets>
<decorator-screen name="CommonArtifactDecorator"
location="${parameters.mainDecoratorLocation}">
