X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fslc%2Fit%2Fwebapp%2FSimpleScenarioTest.java;h=16e4239226af2cb6beaadcb6383a8a9017b1a91f;hb=171d606f8c2ba89c9bdc518f39aa88662c4d942a;hp=1d751f3cb9e3b373b69e15477fbe92a5538700c0;hpb=986352111d5b552eeb478547df58928b9351025f;p=gpl%2Fargeo-slc.git

diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/it/webapp/SimpleScenarioTest.java b/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/it/webapp/SimpleScenarioTest.java
index 1d751f3cb..16e423922 100644
--- a/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/it/webapp/SimpleScenarioTest.java
+++ b/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/it/webapp/SimpleScenarioTest.java
@@ -2,21 +2,26 @@ package org.argeo.slc.it.webapp;
 
 import org.argeo.slc.Condition;
 import org.argeo.slc.core.test.tree.TreeTestResultList;
-import org.argeo.slc.runtime.SlcAgentDescriptor;
+import org.argeo.slc.process.SlcExecution;
+import org.argeo.slc.server.client.SlcServerHttpClient;
 import org.argeo.slc.server.unit.AbstractHttpClientTestCase;
 
 public class SimpleScenarioTest extends AbstractHttpClientTestCase {
 	public void testSimpleScenario() throws Exception {
-		// Get agent
-		SlcAgentDescriptor agentDescriptor = getHttpClient().waitForOneAgent();
-		assertNotNull(agentDescriptor);
+		String moduleName = "org.argeo.slc.demo.basic";
+		SlcExecution slcExecution = getHttpClient().startFlowDefault(
+				moduleName, "main", null);
 
-		// Launch SLC Execution
-		// TODO: don't hardcode tested version
-		assertAnswerOk(getHttpClient().startFlow(agentDescriptor.getUuid(),
-				"org.argeo.slc.demo.basic", "0.11.4.SNAPSHOT", "main"));
+		getHttpClient().callServiceSafe(SlcServerHttpClient.LIST_RESULTS, null,
+				new Condition<TreeTestResultList>() {
 
-		getHttpClient().callServiceSafe("listResults.service", null,
+					public Boolean check(TreeTestResultList obj) {
+						return obj.getList().size() == 3;
+					}
+				}, null);
+		
+		
+		getHttpClient().callServiceSafe(SlcServerHttpClient.LIST_RESULTS, null,
 				new Condition<TreeTestResultList>() {
 
 					public Boolean check(TreeTestResultList obj) {