add extension property to IT

Author: rbudde

OpenRobertaServer/src/test/java/de/fhg/iais/roberta/javaServer/integrationTest/CompilerWorkflowRobotCommonIT.java

@@ -73,7 +73,7 @@ public class CompilerWorkflowRobotCommonIT {
             "server.log.configfile=/logback-test.xml"
         };
 
-    private static final boolean CROSSCOMPILER_CALL = true;
+    private static final boolean CROSSCOMPILER_CALL = false;
     private static final boolean SHOW_SUCCESS = true;
 
     private static final String RESOURCE_BASE = "/crossCompilerTests/common/";
@@ -472,7 +472,7 @@ private Pair<Result, String> executeWorkflowShowSource(String programXml, String
      * @param robotName ...
      */
     private void setRobotTo(String robotName) throws Exception {
-        Response response = this.restAdmin.setRobot(JSONUtilForServer.mkFRR("{'cmd':'setRobot','robot':'" + robotName + "'}"));
+        Response response = this.restAdmin.setRobot(JSONUtilForServer.mkFRR("{'cmd':'setRobot','robot':'" + robotName + "', 'extensions':{}}"));
         JSONUtilForServer.assertEntityRc(response, "ok", Key.ROBOT_SET_SUCCESS);
     }
 

OpenRobertaServer/src/test/java/de/fhg/iais/roberta/javaServer/integrationTest/CompilerWorkflowRobotSpecificIT.java

@@ -77,7 +77,7 @@ public class CompilerWorkflowRobotSpecificIT {
             "server.log.configfile=/logback-test.xml"
         };
 
-    private static final boolean CROSSCOMPILER_CALL = true;
+    private static final boolean CROSSCOMPILER_CALL = false;
     private static final boolean SHOW_SUCCESS = true;
 
     private static JSONObject robotsFromTestSpec;
@@ -335,7 +335,7 @@ private void log(boolean result, String name, String fullResource, Throwable thw
     }
 
     private void setRobotTo(String robot) throws Exception {
-        Response response = this.restAdmin.setRobot(JSONUtilForServer.mkFRR("{'cmd':'setRobot','robot':'" + robot + "'}"));
+        Response response = this.restAdmin.setRobot(JSONUtilForServer.mkFRR("{'cmd':'setRobot','robot':'" + robot + "', 'extensions':{}}"));
         JSONUtilForServer.assertEntityRc(response, "ok", Key.ROBOT_SET_SUCCESS);
     }
 

OpenRobertaServer/src/test/java/de/fhg/iais/roberta/javaServer/integrationTest/DockerIT.java

@@ -19,8 +19,8 @@
 
 import de.fhg.iais.roberta.testutil.HttpClientWrapper;
 import de.fhg.iais.roberta.testutil.JSONUtilForServer;
-import de.fhg.iais.roberta.util.basic.Clock;
 import de.fhg.iais.roberta.util.Key;
+import de.fhg.iais.roberta.util.basic.Clock;
 
 /**
  * run a workflow concurrently against a docker container<br>
@@ -136,7 +136,7 @@ private void workflow(final int userNumber) throws Exception {
         thinkTimeInMillisec += step(httpClientWrapper, "program", request, Key.PROGRAM_SAVE_SUCCESS, 2, 6);
 
         // set robot type, then think 10-14 sec
-        request = JSONUtilForServer.mkD("{'cmd':'setRobot';'robot':'calliope2017'}");
+        request = JSONUtilForServer.mkD("{'cmd':'setRobot';'robot':'calliope2017', 'extensions':{}}");
         thinkTimeInMillisec += step(httpClientWrapper, "admin", request, Key.ROBOT_SET_SUCCESS, 10, 14);
 
         // compile a program 5 times, think 5-10 sec

RobotNXT/src/main/resources/nxt.program.toolbox.expert.xml

@@ -297,7 +297,7 @@
         <block type="robSensors_get_weight"></block>
         <block type="robSensors_get_bias"></block>
     </category>
-    #ifdef nn
+    #end
     <category name="TOOLBOX_TEXT" svg="true">
         <block type="text"/>
         <block type="text_comment"/>