rm ev3lejosv0 resources

Author: rbudde

OpenRobertaRobot/src/main/java/de/fhg/iais/roberta/robotCommunication/RobotCommunicator.java

@@ -224,10 +224,6 @@ private boolean checkRobotMatchesClient(String robot, RobotCommunicationData sta
         if ( robot.equals("botnroll") || robot.equals("arduino") ) {
             robot = "ardu";
         }
-        // the old ev3 robots (ev3lejosv0) use a deprecated robot name "lejos", the new ev3 robots (ev3lejosv1) use "ev3"
-        if ( robot.equals("ev3lejosv0") ) {
-            robot = "lejos";
-        }
         // until we remove the xNN plugin (this will happen, if sometimes in the future we implement a new start page), we have to treat the "robot" xNN as ev3
         if ( robot.equalsIgnoreCase("xNN") ) {
             robot = "ev3";

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

@@ -312,8 +312,8 @@ public void testAllRobotSpecificProgramsAsUnitTests() throws Exception {
     @Test
     @Ignore
     public void testOneRobotSpecificProgramAsUnitTests() throws Exception {
-        String robotName = "botnroll";
-        String programName = "control_logic";
+        String robotName = "edison";
+        String programName = "action";
         LOG.info("========= testing program " + programName + " for robot " + robotName);
         final String resourceDirectory = setupRobotFactoryAndGetResourceDirForRobotSpecificTests(robotName);
         runRegenerateAndCodeGenerationForOneRobotSpecificProgram(resourceDirectory, programName + ".xml", robotName, Collections.emptyList());

OpenRobertaServer/src/test/java/de/fhg/iais/roberta/util/HttpSessionStateTest.java

@@ -26,7 +26,6 @@ public void setup() {
 
         Map<String, RobotFactory> robotPluginMap = new HashMap<>();
         robotPluginMap.put("ev3lejosv1", new RobotFactory(new PluginProperties("ev3lejosv1", "", "", Util.loadPropertiesRecursively("classpath:/ev3lejosv1.properties"))));
-        robotPluginMap.put("ev3lejosv0", new RobotFactory(new PluginProperties("ev3lejosv0", "", "", Util.loadPropertiesRecursively("classpath:/ev3lejosv0.properties"))));
         robotPluginMap
             .put("calliope2017", new RobotFactory(new PluginProperties("calliope2017", "", "", Util.loadPropertiesRecursively("classpath:/calliope2017.properties"))));
         robotPluginMap