Commit 91f6d36e authored by Malo Toudic's avatar Malo Toudic
Browse files
parent 406175ef
......@@ -20,6 +20,13 @@ public class GwtTestStepDao {
}
public static GwtTestStep getGwtTestStep(TestStepResult result, String projectLabel) {
return GwtTestStepDao.getGwtTestStep(result.getTestStep().getLabel(), result.getTestStep().getTestCase().getLabel(), result.getTestStep().getTestCase().getTestSuite().getLabel(), projectLabel);
return GwtTestStepDao.getGwtTestStep(removeDisabledInLabel(result.getTestStep().getLabel()), removeDisabledInLabel(result.getTestStep().getTestCase().getLabel()), removeDisabledInLabel(result.getTestStep().getTestCase().getTestSuite().getLabel()), projectLabel);
}
private static String removeDisabledInLabel(String label){
if(label.contains(" (disabled)")){
label = label.replace(" (disabled)", "");
}
return label;
}
}
......@@ -250,4 +250,14 @@ public class GwtTestStepResult implements Serializable {
DownloadFile.exportToFile("text/xml", content, fileName);
}
public String getFullLabel(){
StringBuilder label = new StringBuilder();
label.append(testStep.getTestCase().getTestSuite().getLabel());
label.append(" / ");
label.append(testStep.getTestCase().getLabel());
label.append(" / ");
label.append(testStep.getLabel());
return label.toString();
}
}
package net.ihe.gazelle.wstester.model;
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;
import javax.persistence.CascadeType;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
......@@ -20,11 +23,13 @@ public class GwtTestSuite extends TestComponent implements Serializable {
private GwtProject gwtProject;
@OneToMany(
fetch = FetchType.EAGER,
targetEntity = GwtTestCase.class,
mappedBy = "testSuite",
cascade = CascadeType.ALL,
orphanRemoval = true
)
@Fetch(value = FetchMode.SUBSELECT)
private List<GwtTestCase> testCases;
@OneToMany(
......
......@@ -98,9 +98,9 @@
<rich:dataTable value="#{executionResult.execution.testStepResults}"
var="testStepResult">
<g:column>
<ui:define name="header">Transaction</ui:define>
<ui:define name="header">Transaction (TestSuite / TestCase / TestStep)</ui:define>
<a href="#testStepResult#{testStepResult.id}">
<h:outputText value="#{testStepResult.testStep.label}"/>
<h:outputText value="#{testStepResult.getFullLabel()}"/>
</a>
</g:column>
<g:column>
......@@ -247,7 +247,7 @@
<c:forEach items="#{executionResult.execution.testStepResults}" var="testStepResult">
<li>
<a href="#testStepResult#{testStepResult.id}">
<h:outputText value="#{testStepResult.testStep.label}"/>
<h:outputText value="#{testStepResult.getFullLabel()}"/>
</a>
</li>
</c:forEach>
......@@ -259,7 +259,7 @@
<div id="testStepResult#{testStepResult.id}">
<gri:panel>
<f:facet name="header">
<h:outputText value="#{testStepResult.testStep.label}"/>
<h:outputText value="#{testStepResult.getFullLabel()}"/>
</f:facet>
<s:decorate template="/layout/display/_display.xhtml">
<ui:define name="label">SoapUI Validation</ui:define>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment