Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1218 - in trunk/labs/kosmos/web-portlet: WEB-INF/classes/hu/midori/kosmos/portlet/cc pages pages/images pages/includes
|
From: <jbo...@li...> - 2005-09-27 06:25:24
|
Author: aron.gombas
Date: 2005-09-27 02:25:06 -0400 (Tue, 27 Sep 2005)
New Revision: 1218
Added:
trunk/labs/kosmos/web-portlet/pages/images/green_light.gif
trunk/labs/kosmos/web-portlet/pages/images/red_light.gif
trunk/labs/kosmos/web-portlet/pages/images/yellow_light.gif
Modified:
trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet.properties
trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet_hu.properties
trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp
trunk/labs/kosmos/web-portlet/pages/cc_monitoring_help.jsp
trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp
trunk/labs/kosmos/web-portlet/pages/images/error.gif
trunk/labs/kosmos/web-portlet/pages/images/success.gif
trunk/labs/kosmos/web-portlet/pages/includes/legend.jsp
Log:
Testcase details 99% done
Modified: trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet.properties
===================================================================
--- trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet.properties 2005-09-27 06:24:30 UTC (rev 1217)
+++ trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet.properties 2005-09-27 06:25:06 UTC (rev 1218)
@@ -18,14 +18,14 @@
ccproject.tests=Tests Total
ccproject.testsPerCategory=Tests Success Rate
-status.success=Successful build with successful tests.
-status.failure=Failed build or successful build with test failures, errors.
-
legend.title=Legend
+legend.success=Successful build and tests.
+legend.warning=Successful build with test failures, errors.
+legend.error=Failed build.
legend.buildSuccess=Successful build.
legend.buildError=Failed build.
legend.testSuccess=Succesful test.
-legend.testFailure=Failed test.
+legend.testWarning=Failed test.
legend.testError=Test error.
lastupdate=Last Update
Modified: trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet_hu.properties
===================================================================
--- trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet_hu.properties 2005-09-27 06:24:30 UTC (rev 1217)
+++ trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet_hu.properties 2005-09-27 06:25:06 UTC (rev 1218)
@@ -18,14 +18,14 @@
ccproject.tests=Unit Tesztek szesen
ccproject.testsPerCategory=Unit Teszt Eloszl
-status.success=Sikeres build sikeres tesztekkel.
-status.failure=Sikertelen build vagy sikeres build sikertelen tesztekkel.
-
legend.title=Jelmagyart
+legend.success=Sikeres build sikeres tesztekkel.
+legend.warning=Sikeres build sikertelen vagy hibtesztekkel.
+legend.error=Sikertelen build.
legend.buildSuccess=Sikeres build.
legend.buildError=Sikertelen build.
legend.testSuccess=Sikeres unit teszt.
-legend.testFailure=Sikertelen unit teszt.
+legend.testWarning=Sikertelen unit teszt.
legend.testError=Hibunit teszt.
lastupdate=Utolsisss
Modified: trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp 2005-09-27 06:24:30 UTC (rev 1217)
+++ trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp 2005-09-27 06:25:06 UTC (rev 1218)
@@ -8,10 +8,13 @@
<display:column style="width:20px">
<c:choose>
<c:when test="${(projectsIt.status == 1) && (projectsIt.failures == 0) && (projectsIt.errors == 0)}">
- <img src="<%= renderRequest.getContextPath() %>/pages/images/success.gif" title="<fmt:message key="status.success"/>"/>
+ <img src="<%= renderRequest.getContextPath() %>/pages/images/success.gif" title="<fmt:message key="legend.success"/>"/>
</c:when>
+ <c:when test="${(projectsIt.status == 1)}">
+ <img src="<%= renderRequest.getContextPath() %>/pages/images/warning.gif" title="<fmt:message key="legend.warning"/>"/>
+ </c:when>
<c:otherwise>
- <img src="<%= renderRequest.getContextPath() %>/pages/images/error.gif" title="<fmt:message key="status.failure"/>"/>
+ <img src="<%= renderRequest.getContextPath() %>/pages/images/error.gif" title="<fmt:message key="legend.error"/>"/>
</c:otherwise>
</c:choose>
</display:column>
Modified: trunk/labs/kosmos/web-portlet/pages/cc_monitoring_help.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/cc_monitoring_help.jsp 2005-09-27 06:24:30 UTC (rev 1217)
+++ trunk/labs/kosmos/web-portlet/pages/cc_monitoring_help.jsp 2005-09-27 06:25:06 UTC (rev 1218)
@@ -8,7 +8,11 @@
<%@include file="includes/help.jsp"%>
<c:set var="legend_success" value="1"/>
+<c:set var="legend_warning" value="1"/>
<c:set var="legend_error" value="1"/>
+<c:set var="legend_test_success" value="1"/>
+<c:set var="legend_test_warning" value="1"/>
+<c:set var="legend_test_error" value="1"/>
<%@include file="includes/legend.jsp"%>
<form action="<portlet:renderURL portletMode="view"/>" method="post">
Modified: trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp 2005-09-27 06:24:30 UTC (rev 1217)
+++ trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp 2005-09-27 06:25:06 UTC (rev 1218)
@@ -42,38 +42,56 @@
</td>
</tr>
<tr class="portlet-section-alternate">
- <td><fmt:message key="ccproject.testsPerCategory"/>:</td>
- <td><img src="<c:out value="${project.testsPerCategoryChartUrl}"/>" title="<fmt:message key="ccproject.testsPerCategory"/>"/></td>
+ <td valign="top"><fmt:message key="ccproject.testsPerCategory"/>:</td>
+ <td valign="top"><img src="<c:out value="${project.testsPerCategoryChartUrl}"/>" title="<fmt:message key="ccproject.testsPerCategory"/>"/></td>
<td valign="top">
+
+
+
+<!-- TODO ezt csak ilyen benan lehet? -->
+<c:forEach items="${project.testCases}" varStatus="status">
+ <c:set var="listSize" value="${status.index}"/>
+</c:forEach>
+
+<%@include file="includes/table_expander.jsp" %>
+
+
+
+
<table>
<c:forEach var="testcase" items="${project.testCases}" varStatus="status">
- <c:if test="${status.index < 138}"><!-- TODO 8, tooltips, result ordered by type? -->
- <tr class="portlet-section-body">
- <td>
- <c:choose>
- <c:when test="${testcase.result == 1}">
- <img src="<%= renderRequest.getContextPath() %>/pages/images/success.gif" title="<fmt:message key="legend.testSuccess"/>"/>
- </c:when>
- <c:when test="${testcase.result == -1}">
- <img src="<%= renderRequest.getContextPath() %>/pages/images/failure.gif" title="<fmt:message key="legend.testFailure"/>"/>
- </c:when>
- <c:otherwise>
- <img src="<%= renderRequest.getContextPath() %>/pages/images/error.gif" title="<fmt:message key="legend.testError"/>"/>
- </c:otherwise>
- </c:choose>
- </td>
- <td>
- <c:if test="${testcase.result != 1}"><span class="portlet-msg-error"></c:if>
- <c:out value="${testcase.className}"/>
- <c:if test="${testcase.result != 1}"></span></c:if>
- </td>
- <td>
- <c:if test="${testcase.result != 1}"><span class="portlet-msg-error"></c:if>
- <c:out value="${testcase.testCaseName}"/>
- <c:if test="${testcase.result != 1}"></span></c:if>
- </td>
- </tr>
- </c:if>
+ <c:choose>
+ <c:when test="${status.index < 10}">
+ <tr id="row-<portlet:namespace/>-<c:out value="${status.index}"/>" class="portlet-section-body">
+ </c:when>
+ <c:otherwise>
+ <tr id="row-<portlet:namespace/>-<c:out value="${status.index}"/>" style="display: none" class="portlet-section-body">
+ </c:otherwise>
+ </c:choose>
+ <td>
+ <c:choose>
+ <c:when test="${testcase.result == 1}">
+ <img src="<%= renderRequest.getContextPath() %>/pages/images/green_light.gif" title="<fmt:message key="legend.testSuccess"/>"/>
+ </c:when>
+ <c:when test="${testcase.result == -1}">
+ <img src="<%= renderRequest.getContextPath() %>/pages/images/yellow_light.gif" title="<fmt:message key="legend.testWarning"/>"/>
+ </c:when>
+ <c:otherwise>
+ <img src="<%= renderRequest.getContextPath() %>/pages/images/red_light.gif" title="<fmt:message key="legend.testError"/>"/>
+ </c:otherwise>
+ </c:choose>
+ </td>
+ <td>
+ <c:if test="${testcase.result != 1}"><span class="portlet-msg-error"></c:if>
+ <c:out value="${testcase.className}"/>
+ <c:if test="${testcase.result != 1}"></span></c:if>
+ </td>
+ <td>
+ <c:if test="${testcase.result != 1}"><span class="portlet-msg-error"></c:if>
+ <c:out value="${testcase.testCaseName}"/>
+ <c:if test="${testcase.result != 1}"></span></c:if>
+ </td>
+ </tr>
</c:forEach>
</table>
</td>
Modified: trunk/labs/kosmos/web-portlet/pages/images/error.gif
===================================================================
(Binary files differ)
Added: trunk/labs/kosmos/web-portlet/pages/images/green_light.gif
===================================================================
(Binary files differ)
Property changes on: trunk/labs/kosmos/web-portlet/pages/images/green_light.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/labs/kosmos/web-portlet/pages/images/red_light.gif
===================================================================
(Binary files differ)
Property changes on: trunk/labs/kosmos/web-portlet/pages/images/red_light.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/labs/kosmos/web-portlet/pages/images/success.gif
===================================================================
(Binary files differ)
Added: trunk/labs/kosmos/web-portlet/pages/images/yellow_light.gif
===================================================================
(Binary files differ)
Property changes on: trunk/labs/kosmos/web-portlet/pages/images/yellow_light.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/labs/kosmos/web-portlet/pages/includes/legend.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/includes/legend.jsp 2005-09-27 06:24:30 UTC (rev 1217)
+++ trunk/labs/kosmos/web-portlet/pages/includes/legend.jsp 2005-09-27 06:25:06 UTC (rev 1218)
@@ -15,14 +15,29 @@
<td><img src="<%= renderRequest.getContextPath() %>/pages/images/success.gif"/></td><td><fmt:message key="legend.success"/></td>
</tr>
</c:if>
+ <c:if test="${legend_warning == '1'}">
+ <tr class="portlet-section-alternate">
+ <td><img src="<%= renderRequest.getContextPath() %>/pages/images/warning.gif"/></td><td><fmt:message key="legend.warning"/></td>
+ </tr>
+ </c:if>
<c:if test="${legend_error == '1'}">
- <tr class="portlet-section-alternate">
+ <tr class="portlet-section-body">
<td><img src="<%= renderRequest.getContextPath() %>/pages/images/error.gif"/></td><td><fmt:message key="legend.error"/></td>
</tr>
</c:if>
- <c:if test="${legend_warning == '1'}">
+ <c:if test="${legend_test_success == '1'}">
+ <tr class="portlet-section-alternate">
+ <td><img src="<%= renderRequest.getContextPath() %>/pages/images/red_light.gif"/></td><td><fmt:message key="legend.testSuccess"/></td>
+ </tr>
+ </c:if>
+ <c:if test="${legend_test_warning == '1'}">
<tr class="portlet-section-body">
- <td><img src="<%= renderRequest.getContextPath() %>/pages/images/warning.gif"/></td><td><fmt:message key="legend.warning"/></td>
+ <td><img src="<%= renderRequest.getContextPath() %>/pages/images/yellow_light.gif"/></td><td><fmt:message key="legend.testWarning"/></td>
</tr>
</c:if>
+ <c:if test="${legend_test_error == '1'}">
+ <tr class="portlet-section-alternate">
+ <td><img src="<%= renderRequest.getContextPath() %>/pages/images/green_light.gif"/></td><td><fmt:message key="legend.testError"/></td>
+ </tr>
+ </c:if>
</table>
|
