Revert polling

SceneMaker · Jan 7, 2018 · 1c00501 · 1c00501
1 parent 7bafdb6
commit 1c00501
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 46 deletions.
diff --git a/prj/build.xml b/prj/build.xml
@@ -155,7 +155,7 @@
     <target name="debug">
 
         <java classname="de.dfki.vsm.SceneMaker3" fork="true">
-            <jvmarg line="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"/>
+            <jvmarg line="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006"/>
             <classpath refid="clspath"/>
         </java>
     </target>

diff --git a/src/de/dfki/vsm/xtension/decad/commands/DecadCommand.java b/src/de/dfki/vsm/xtension/decad/commands/DecadCommand.java
@@ -39,4 +39,8 @@ protected void post(PostParametersBuilder parameters) throws IOException, Interr
     public void setHttpClient(HttpClient httpClient) {
         this.httpClient = httpClient;
     }
+
+    public String getResponse() {
+        return httpClient.getResponse();
+    }
 }
diff --git a/src/de/dfki/vsm/xtension/decad/utils/DECADLongPoller.java b/src/de/dfki/vsm/xtension/decad/utils/DECADLongPoller.java
@@ -1,18 +1,6 @@
 package de.dfki.vsm.xtension.decad.utils;
 
-import de.dfki.vsm.runtime.activity.executor.ActivityExecutor;
-import de.dfki.vsm.xtension.decad.commands.DecadCommand;
 
 public class DECADLongPoller {
-    public DECADLongPoller(ActivityExecutor fakeExecutor) {
 
-    }
-
-    public DECADLongPoller(ActivityExecutor fakeExecutor, DecadCommand isSpeakingCommand) {
-
-    }
-
-    public void startPolling() {
-
-    }
 }
diff --git a/tests/de/dfki/vsm/xtension/decad/sender/HTTPClientTest.java b/tests/de/dfki/vsm/xtension/decad/sender/HTTPClientTest.java
@@ -34,7 +34,7 @@ public void testSpeakToLocalhost() throws InterruptedException, IOException {
         PostParametersBuilder parameters = new PostParametersBuilder();
         parameters.addParameter("text", "Hello world");
         client
-                .openUrl("http://localhost:5005/speak")
+                .openUrl("http://localhost:5005/speech/speak")
                 .post(parameters)
                 .read();
         assertEquals("Speaking...", client.getResponse());

diff --git a/tests/de/dfki/vsm/xtension/decad/utils/DECADLongPollerTest.java b/tests/de/dfki/vsm/xtension/decad/utils/DECADLongPollerTest.java
diff --git a/tests/fakes/FakeIsSpeakingCommand.java b/tests/fakes/FakeIsSpeakingCommand.java
@@ -4,8 +4,10 @@
 import de.dfki.vsm.xtension.decad.commands.DecadCommand;
 
 public class FakeIsSpeakingCommand extends DecadCommand {
+    public boolean isSpeakingResponse;
     public FakeIsSpeakingCommand(AbstractActivity activity) {
         super(activity);
+        isSpeakingResponse = false;
     }
 
     @Override
@@ -17,4 +19,8 @@ protected String buildUrl() {
     public void execute() {
 
     }
+
+    public String getResponse() {
+        return isSpeakingResponse ? "1" : "0";
+    }
 }