X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fslc%2Fws%2FTreeTestResultWsIntegrationTest.java;h=b3c2a7cb9f6ffe3ed78a7c4aed524019c6c8a91b;hb=37a53e4b259d7455b3406ecb8ddc868cfc86f920;hp=7796c26d75414c6a3723470aeb45051298d1ece5;hpb=76006ca3802dcc6ba6b94e62b13f572ed6a06e76;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java
index 7796c26d7..b3c2a7cb9 100644
--- a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java
+++ b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java
@@ -17,54 +17,44 @@ import org.argeo.slc.unit.AbstractSpringTestCase;
 public class TreeTestResultWsIntegrationTest extends AbstractSpringTestCase {
 	private Log log = LogFactory.getLog(getClass());
 
-	public void testCreateTreeTestResultRequest() {
-		WebServiceTemplate template = getBean(WebServiceTemplate.class);
-		CreateTreeTestResultRequest req = new CreateTreeTestResultRequest(
-				createCompleteTreeTestResult());
-		req.getTreeTestResult().close();// in order to avoid unclosed in test db
+	private WebServiceTemplate template;
 
-		log.info("Send CreateTreeTestResultRequest for result "
-				+ req.getTreeTestResult().getUuid());
+	public void setUp() {
+		template = getBean(WebServiceTemplate.class);
+	}
 
-		Object resp = template.marshalSendAndReceive(req);
-		log.info("Resp: " + resp);
+	public void testCreateTreeTestResultRequest() {
+		createAndSendTreeTestResult(true);
 	}
 
 	public void testResultPartRequest() {
-		WebServiceTemplate template = getBean(WebServiceTemplate.class);
-		TreeTestResult ttr = createCompleteTreeTestResult();
-		ttr.close();// in order to avoid unclosed in test db
-		CreateTreeTestResultRequest reqCreate = new CreateTreeTestResultRequest(
-				ttr);
-		log.info("Send CreateTreeTestResultRequest for result "
-				+ reqCreate.getTreeTestResult().getUuid());
-		template.marshalSendAndReceive(reqCreate);
+		TreeTestResult ttr = createAndSendTreeTestResult(true);
 
 		ResultPartRequest req = createSimpleResultPartRequest(ttr);
 
 		log.info("Send ResultPartRequest for result " + req.getResultUuid());
-		Object resp = template.marshalSendAndReceive(req);
-		log.info("Resp: " + resp);
+		template.marshalSendAndReceive(req);
 	}
 
 	public void testCloseTreeTestResultRequest() {
-		WebServiceTemplate template = getBean(WebServiceTemplate.class);
-
-		TreeTestResult ttr = createCompleteTreeTestResult();
-		CreateTreeTestResultRequest reqCreate = new CreateTreeTestResultRequest(
-				ttr);
-		log.info("Send CreateTreeTestResultRequest for result "
-				+ reqCreate.getTreeTestResult().getUuid());
-		template.marshalSendAndReceive(reqCreate);
+		TreeTestResult ttr = createAndSendTreeTestResult(false);
 
 		ttr.close();
 		CloseTreeTestResultRequest req = new CloseTreeTestResultRequest(ttr
 				.getUuid(), ttr.getCloseDate());
-
 		log.info("Send CloseTreeTestResultRequest for result "
 				+ req.getResultUuid());
+		template.marshalSendAndReceive(req);
+	}
+
+	protected TreeTestResult createAndSendTreeTestResult(boolean close) {
+		TreeTestResult ttr = createCompleteTreeTestResult();
+		log.info("Send CreateTreeTestResultRequest for result #"
+				+ ttr.getUuid());
+		template.marshalSendAndReceive(new CreateTreeTestResultRequest(ttr));
 
-		Object resp = template.marshalSendAndReceive(req);
-		log.info("Resp: " + resp);
+		if (close)
+			ttr.close();
+		return ttr;
 	}
 }