Merge branch 'vogtmarv-master-patch-88004' into 'master'

Deleted build/test/testfaelle/ACT3.uml/0/config.ini,...

See merge request !7

build/test/testfaelle/ACT3.uml/0/config.ini

-
-# At <time> the distance between <object1> and <object2> should be within <rangeLeftBorder> and <rangeRightBorder>
-time=10
-objectId1=f
-objectId2=s
-rangeLeftBorder=0.5
-rangeRightBorder=2
-timeout=30

build/test/testfaelle/ACT3.uml/0/test.world

-<?xml version="1.0" encoding="utf-8"?>
-<sdf version="1.6">
-  <world name="default">
-    <!-- Ground Plane -->
-    <include>
-      <uri>model://ground_plane</uri>
-    </include>
-    <include>
-      <uri>model://sun</uri>
-    </include>
-    <model name="cylinder_s_R_0.1">
-      <pose>1 3 -0 0</pose>
-      <link name="link">
-        <collision name="collision">
-          <geometry>
-            <cylinder>
-              <radius>0.1</radius>
-              <length>1</length>
-            </cylinder>
-          </geometry>
-        </collision>
-        <visual name="visual">
-          <geometry>
-            <cylinder>
-              <radius>0.1</radius>
-              <length>1</length>
-            </cylinder>
-          </geometry>
-        </visual>
-      </link>
-    </model>
-  </world>
-</sdf>
\ No newline at end of file

build/test/testfaelle/ACT4.uml/0/config.ini

-
-# At <time> the distance between <object1> and <object2> should be within <rangeLeftBorder> and <rangeRightBorder>
-time=10
-objectId1=f
-objectId2=s
-rangeLeftBorder=0.5
-rangeRightBorder=2
-timeout=30

build/test/testfaelle/ACT4.uml/0/test.world

-<?xml version="1.0" encoding="utf-8"?>
-<sdf version="1.6">
-  <world name="default">
-    <!-- Ground Plane -->
-    <include>
-      <uri>model://ground_plane</uri>
-    </include>
-    <include>
-      <uri>model://sun</uri>
-    </include>
-    <model name="sphere_s_R_1">
-      <pose>1 1 0.5 0</pose>
-      <link name="link">
-        <collision name="collision">
-          <geometry>
-            <sphere>
-              <radius>1</radius>
-            </sphere>
-          </geometry>
-        </collision>
-        <visual name="visual">
-          <geometry>
-            <sphere>
-              <radius>1</radius>
-            </sphere>
-          </geometry>
-        </visual>
-      </link>
-    </model>
-  </world>
-</sdf>
\ No newline at end of file

build/test/testfaelle/ACT5.uml/0/config.ini

-
-# At <time> the distance between <object1> and <object2> should be within <rangeLeftBorder> and <rangeRightBorder>
-time=10
-objectId1=f
-objectId2=s
-rangeLeftBorder=0.5
-rangeRightBorder=2
-timeout=30

build/test/testfaelle/ACT5.uml/0/test.world

-<?xml version="1.0" encoding="utf-8"?>
-<sdf version="1.6">
-  <world name="default">
-    <!-- Ground Plane -->
-    <include>
-      <uri>model://ground_plane</uri>
-    </include>
-    <include>
-      <uri>model://sun</uri>
-    </include>
-    <model name="box_s_R_1">
-      <pose>1 3 0 0</pose>
-      <link name="link">
-        <collision name="collision">
-          <geometry>
-            <box>
-              <size>1 1 1</size>
-            </box>
-          </geometry>
-        </collision>
-        <visual name="visual">
-          <geometry>
-            <box>
-              <size>1 1 1</size>
-            </box>
-          </geometry>
-        </visual>
-      </link>
-    </model>
-  </world>
-</sdf>
\ No newline at end of file