Use ObjectList everywhere

[gpl/argeo-slc.git] / integration-tests / org.argeo.slc.it.webapp / src / test / java / org / argeo / slc / it / webapp / SimpleScenarioTest.java

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 1d751f3cb9e3b373b69e15477fbe92a5538700c0..1659e80954e8f2fbd0593e01d4b9d0300c2558d8 100644 (file)
--- 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
@@ -1,26 +1,28 @@
 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.msg.ObjectList;
+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";
+               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<ObjectList>() {
 
-               getHttpClient().callServiceSafe("listResults.service", null,
-                               new Condition<TreeTestResultList>() {
+                                       public Boolean check(ObjectList obj) {
+                                               return obj.getObjects().size() == 3;
+                                       }
+                               }, null);
+
+               getHttpClient().callServiceSafe(SlcServerHttpClient.LIST_RESULTS, null,
+                               new Condition<ObjectList>() {
 
-                                       public Boolean check(TreeTestResultList obj) {
-                                               return obj.getList().size() == 3;
+                                       public Boolean check(ObjectList obj) {
+                                               return obj.getObjects().size() == 3;
                                        }
                                }, null);
        }