From 7b8def9fafe6a52a6a31d0d35dd132e0dd4bacda Mon Sep 17 00:00:00 2001 From: Nikolaus Vahrenkamp <vahrenkamp@kit.edu> Date: Tue, 25 Nov 2014 18:01:57 +0100 Subject: [PATCH] moved to deprecated and test folders --- scenarios/CMakeLists.txt | 6 +++--- scenarios/{ => deprecated}/MotionControlTest/CMakeLists.txt | 0 .../MotionControlTest/MotionControlTestGui.ini | 0 .../MotionControlTest/MotionControlTestGuiDavid.ini | 0 .../{ => deprecated}/MotionControlTest/config/ArmarXGui.cfg | 0 .../MotionControlTest/config/ArmarXLogger.cfg | 0 .../MotionControlTest/config/ConditionHandler.cfg | 0 .../config/DummyObjectRecognitionConfig.txt | 0 .../{ => deprecated}/MotionControlTest/config/Global.cfg | 0 .../{ => deprecated}/MotionControlTest/config/GuiConfig.ini | 0 .../{ => deprecated}/MotionControlTest/config/HeadUnit.cfg | 0 .../MotionControlTest/config/HeadUnitObserver.cfg | 0 .../MotionControlTest/config/KinematicUnitObserver.cfg | 0 .../MotionControlTest/config/KinematicUnitSimulation.cfg | 0 .../MotionControlTest/config/MotionControlTest.cfg | 0 .../{ => deprecated}/MotionControlTest/config/ObjectDB.txt | 0 .../MotionControlTest/config/ObjectMemory.cfg | 0 .../MotionControlTest/config/ObjectMemoryObserver.cfg | 0 .../MotionControlTest/config/RobotControl.cfg | 0 .../MotionControlTest/config/RobotHandLocalization.cfg | 0 .../MotionControlTest/config/RobotStateComponent.cfg | 0 .../MotionControlTest/config/SystemObserver.cfg | 0 .../MotionControlTest/motioncontrol.armarxgui | 0 scenarios/{ => deprecated}/MotionControlTest/startGui.sh | 0 scenarios/{ => deprecated}/MotionControlTest/startLogger.sh | 0 scenarios/{ => deprecated}/MotionControlTest/stopGui.sh | 0 .../{ => deprecated}/TCPMoverScenario/configs/ArmarXGui.cfg | 0 .../TCPMoverScenario/configs/ConditionHandler.cfg | 0 .../{ => deprecated}/TCPMoverScenario/configs/Gui.armarxgui | 0 .../{ => deprecated}/TCPMoverScenario/configs/HeadUnit.cfg | 0 .../{ => deprecated}/TCPMoverScenario/configs/RobotUnit.cfg | 0 .../TCPMoverScenario/configs/RobotUnitObserver.cfg | 0 scenarios/tests/CMakeLists.txt | 6 ++++++ .../RemoteRobotTest/RemoteRobotTestProject/CMakeLists.txt | 0 .../RemoteRobotTestProject/RemoteRobotTestProject.cpp | 0 .../RemoteRobotTestProject/RemoteRobotTestProject.h | 0 .../RemoteRobotTestProject/RemoteRobotTestProjectApp.h | 0 .../RemoteRobotTest/RemoteRobotTestProject/build/.gitkeep | 0 .../test/RemoteRobotTestProjectTest.cpp | 0 scenarios/{ => tests}/RemoteRobotTest/configs/ArmarXGui.cfg | 0 .../RemoteRobotTest/configs/ConditionHandler.cfg | 0 .../configs/DummyObjectRecognitionConfig.txt | 0 scenarios/{ => tests}/RemoteRobotTest/configs/HeadUnit.cfg | 0 .../RemoteRobotTest/configs/HeadUnitObserver.cfg | 0 .../RemoteRobotTest/configs/ObjectMemoryConfig.txt | 0 .../RemoteRobotTest/configs/ObjectMemoryObserverConfig.txt | 0 .../RemoteRobotTest/configs/RobotStateComponent.cfg | 0 .../{ => tests}/WeissHapticSensorsUnitTest/CMakeLists.txt | 0 .../WeissHapticSensorsUnitTest/config/HapticObserverApp.cfg | 0 .../config/WeissHapticSensorApp.cfg | 0 .../config/WeissHapticSensorsUnitApp.cfg | 0 .../{ => tests}/WeissHapticSensorsUnitTest/jquery.min.js | 0 .../WeissHapticSensorsUnitTest/jquery.sparkline.js | 0 .../{ => tests}/WeissHapticSensorsUnitTest/startGui.sh | 0 .../{ => tests}/WeissHapticSensorsUnitTest/tactile.html | 0 scenarios/{ => tests}/statecharttestscenario/CMakeLists.txt | 0 .../statecharttestscenario/config/ConditionHandler.cfg | 0 .../statecharttestscenario/config/RobotControl.cfg | 0 .../statecharttestscenario/config/SystemObserver.cfg | 0 source/RobotAPI/applications/CMakeLists.txt | 2 +- 60 files changed, 10 insertions(+), 4 deletions(-) rename scenarios/{ => deprecated}/MotionControlTest/CMakeLists.txt (100%) rename scenarios/{ => deprecated}/MotionControlTest/MotionControlTestGui.ini (100%) rename scenarios/{ => deprecated}/MotionControlTest/MotionControlTestGuiDavid.ini (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/ArmarXGui.cfg (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/ArmarXLogger.cfg (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/ConditionHandler.cfg (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/DummyObjectRecognitionConfig.txt (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/Global.cfg (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/GuiConfig.ini (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/HeadUnit.cfg (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/HeadUnitObserver.cfg (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/KinematicUnitObserver.cfg (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/KinematicUnitSimulation.cfg (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/MotionControlTest.cfg (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/ObjectDB.txt (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/ObjectMemory.cfg (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/ObjectMemoryObserver.cfg (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/RobotControl.cfg (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/RobotHandLocalization.cfg (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/RobotStateComponent.cfg (100%) rename scenarios/{ => deprecated}/MotionControlTest/config/SystemObserver.cfg (100%) rename scenarios/{ => deprecated}/MotionControlTest/motioncontrol.armarxgui (100%) rename scenarios/{ => deprecated}/MotionControlTest/startGui.sh (100%) rename scenarios/{ => deprecated}/MotionControlTest/startLogger.sh (100%) rename scenarios/{ => deprecated}/MotionControlTest/stopGui.sh (100%) rename scenarios/{ => deprecated}/TCPMoverScenario/configs/ArmarXGui.cfg (100%) rename scenarios/{ => deprecated}/TCPMoverScenario/configs/ConditionHandler.cfg (100%) rename scenarios/{ => deprecated}/TCPMoverScenario/configs/Gui.armarxgui (100%) rename scenarios/{ => deprecated}/TCPMoverScenario/configs/HeadUnit.cfg (100%) rename scenarios/{ => deprecated}/TCPMoverScenario/configs/RobotUnit.cfg (100%) rename scenarios/{ => deprecated}/TCPMoverScenario/configs/RobotUnitObserver.cfg (100%) create mode 100644 scenarios/tests/CMakeLists.txt rename scenarios/{ => tests}/RemoteRobotTest/RemoteRobotTestProject/CMakeLists.txt (100%) rename scenarios/{ => tests}/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.cpp (100%) rename scenarios/{ => tests}/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.h (100%) rename scenarios/{ => tests}/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProjectApp.h (100%) rename scenarios/{ => tests}/RemoteRobotTest/RemoteRobotTestProject/build/.gitkeep (100%) rename scenarios/{ => tests}/RemoteRobotTest/RemoteRobotTestProject/test/RemoteRobotTestProjectTest.cpp (100%) rename scenarios/{ => tests}/RemoteRobotTest/configs/ArmarXGui.cfg (100%) rename scenarios/{ => tests}/RemoteRobotTest/configs/ConditionHandler.cfg (100%) rename scenarios/{ => tests}/RemoteRobotTest/configs/DummyObjectRecognitionConfig.txt (100%) rename scenarios/{ => tests}/RemoteRobotTest/configs/HeadUnit.cfg (100%) rename scenarios/{ => tests}/RemoteRobotTest/configs/HeadUnitObserver.cfg (100%) rename scenarios/{ => tests}/RemoteRobotTest/configs/ObjectMemoryConfig.txt (100%) rename scenarios/{ => tests}/RemoteRobotTest/configs/ObjectMemoryObserverConfig.txt (100%) rename scenarios/{ => tests}/RemoteRobotTest/configs/RobotStateComponent.cfg (100%) rename scenarios/{ => tests}/WeissHapticSensorsUnitTest/CMakeLists.txt (100%) rename scenarios/{ => tests}/WeissHapticSensorsUnitTest/config/HapticObserverApp.cfg (100%) rename scenarios/{ => tests}/WeissHapticSensorsUnitTest/config/WeissHapticSensorApp.cfg (100%) rename scenarios/{ => tests}/WeissHapticSensorsUnitTest/config/WeissHapticSensorsUnitApp.cfg (100%) rename scenarios/{ => tests}/WeissHapticSensorsUnitTest/jquery.min.js (100%) rename scenarios/{ => tests}/WeissHapticSensorsUnitTest/jquery.sparkline.js (100%) rename scenarios/{ => tests}/WeissHapticSensorsUnitTest/startGui.sh (100%) rename scenarios/{ => tests}/WeissHapticSensorsUnitTest/tactile.html (100%) rename scenarios/{ => tests}/statecharttestscenario/CMakeLists.txt (100%) rename scenarios/{ => tests}/statecharttestscenario/config/ConditionHandler.cfg (100%) rename scenarios/{ => tests}/statecharttestscenario/config/RobotControl.cfg (100%) rename scenarios/{ => tests}/statecharttestscenario/config/SystemObserver.cfg (100%) diff --git a/scenarios/CMakeLists.txt b/scenarios/CMakeLists.txt index 3b942c248..6b4016fb2 100644 --- a/scenarios/CMakeLists.txt +++ b/scenarios/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(WeissHapticSensorsUnitTest) -add_subdirectory(MotionControlTest) -add_subdirectory(statecharttestscenario) +add_subdirectory(tests) + + diff --git a/scenarios/MotionControlTest/CMakeLists.txt b/scenarios/deprecated/MotionControlTest/CMakeLists.txt similarity index 100% rename from scenarios/MotionControlTest/CMakeLists.txt rename to scenarios/deprecated/MotionControlTest/CMakeLists.txt diff --git a/scenarios/MotionControlTest/MotionControlTestGui.ini b/scenarios/deprecated/MotionControlTest/MotionControlTestGui.ini similarity index 100% rename from scenarios/MotionControlTest/MotionControlTestGui.ini rename to scenarios/deprecated/MotionControlTest/MotionControlTestGui.ini diff --git a/scenarios/MotionControlTest/MotionControlTestGuiDavid.ini b/scenarios/deprecated/MotionControlTest/MotionControlTestGuiDavid.ini similarity index 100% rename from scenarios/MotionControlTest/MotionControlTestGuiDavid.ini rename to scenarios/deprecated/MotionControlTest/MotionControlTestGuiDavid.ini diff --git a/scenarios/MotionControlTest/config/ArmarXGui.cfg b/scenarios/deprecated/MotionControlTest/config/ArmarXGui.cfg similarity index 100% rename from scenarios/MotionControlTest/config/ArmarXGui.cfg rename to scenarios/deprecated/MotionControlTest/config/ArmarXGui.cfg diff --git a/scenarios/MotionControlTest/config/ArmarXLogger.cfg b/scenarios/deprecated/MotionControlTest/config/ArmarXLogger.cfg similarity index 100% rename from scenarios/MotionControlTest/config/ArmarXLogger.cfg rename to scenarios/deprecated/MotionControlTest/config/ArmarXLogger.cfg diff --git a/scenarios/MotionControlTest/config/ConditionHandler.cfg b/scenarios/deprecated/MotionControlTest/config/ConditionHandler.cfg similarity index 100% rename from scenarios/MotionControlTest/config/ConditionHandler.cfg rename to scenarios/deprecated/MotionControlTest/config/ConditionHandler.cfg diff --git a/scenarios/MotionControlTest/config/DummyObjectRecognitionConfig.txt b/scenarios/deprecated/MotionControlTest/config/DummyObjectRecognitionConfig.txt similarity index 100% rename from scenarios/MotionControlTest/config/DummyObjectRecognitionConfig.txt rename to scenarios/deprecated/MotionControlTest/config/DummyObjectRecognitionConfig.txt diff --git a/scenarios/MotionControlTest/config/Global.cfg b/scenarios/deprecated/MotionControlTest/config/Global.cfg similarity index 100% rename from scenarios/MotionControlTest/config/Global.cfg rename to scenarios/deprecated/MotionControlTest/config/Global.cfg diff --git a/scenarios/MotionControlTest/config/GuiConfig.ini b/scenarios/deprecated/MotionControlTest/config/GuiConfig.ini similarity index 100% rename from scenarios/MotionControlTest/config/GuiConfig.ini rename to scenarios/deprecated/MotionControlTest/config/GuiConfig.ini diff --git a/scenarios/MotionControlTest/config/HeadUnit.cfg b/scenarios/deprecated/MotionControlTest/config/HeadUnit.cfg similarity index 100% rename from scenarios/MotionControlTest/config/HeadUnit.cfg rename to scenarios/deprecated/MotionControlTest/config/HeadUnit.cfg diff --git a/scenarios/MotionControlTest/config/HeadUnitObserver.cfg b/scenarios/deprecated/MotionControlTest/config/HeadUnitObserver.cfg similarity index 100% rename from scenarios/MotionControlTest/config/HeadUnitObserver.cfg rename to scenarios/deprecated/MotionControlTest/config/HeadUnitObserver.cfg diff --git a/scenarios/MotionControlTest/config/KinematicUnitObserver.cfg b/scenarios/deprecated/MotionControlTest/config/KinematicUnitObserver.cfg similarity index 100% rename from scenarios/MotionControlTest/config/KinematicUnitObserver.cfg rename to scenarios/deprecated/MotionControlTest/config/KinematicUnitObserver.cfg diff --git a/scenarios/MotionControlTest/config/KinematicUnitSimulation.cfg b/scenarios/deprecated/MotionControlTest/config/KinematicUnitSimulation.cfg similarity index 100% rename from scenarios/MotionControlTest/config/KinematicUnitSimulation.cfg rename to scenarios/deprecated/MotionControlTest/config/KinematicUnitSimulation.cfg diff --git a/scenarios/MotionControlTest/config/MotionControlTest.cfg b/scenarios/deprecated/MotionControlTest/config/MotionControlTest.cfg similarity index 100% rename from scenarios/MotionControlTest/config/MotionControlTest.cfg rename to scenarios/deprecated/MotionControlTest/config/MotionControlTest.cfg diff --git a/scenarios/MotionControlTest/config/ObjectDB.txt b/scenarios/deprecated/MotionControlTest/config/ObjectDB.txt similarity index 100% rename from scenarios/MotionControlTest/config/ObjectDB.txt rename to scenarios/deprecated/MotionControlTest/config/ObjectDB.txt diff --git a/scenarios/MotionControlTest/config/ObjectMemory.cfg b/scenarios/deprecated/MotionControlTest/config/ObjectMemory.cfg similarity index 100% rename from scenarios/MotionControlTest/config/ObjectMemory.cfg rename to scenarios/deprecated/MotionControlTest/config/ObjectMemory.cfg diff --git a/scenarios/MotionControlTest/config/ObjectMemoryObserver.cfg b/scenarios/deprecated/MotionControlTest/config/ObjectMemoryObserver.cfg similarity index 100% rename from scenarios/MotionControlTest/config/ObjectMemoryObserver.cfg rename to scenarios/deprecated/MotionControlTest/config/ObjectMemoryObserver.cfg diff --git a/scenarios/MotionControlTest/config/RobotControl.cfg b/scenarios/deprecated/MotionControlTest/config/RobotControl.cfg similarity index 100% rename from scenarios/MotionControlTest/config/RobotControl.cfg rename to scenarios/deprecated/MotionControlTest/config/RobotControl.cfg diff --git a/scenarios/MotionControlTest/config/RobotHandLocalization.cfg b/scenarios/deprecated/MotionControlTest/config/RobotHandLocalization.cfg similarity index 100% rename from scenarios/MotionControlTest/config/RobotHandLocalization.cfg rename to scenarios/deprecated/MotionControlTest/config/RobotHandLocalization.cfg diff --git a/scenarios/MotionControlTest/config/RobotStateComponent.cfg b/scenarios/deprecated/MotionControlTest/config/RobotStateComponent.cfg similarity index 100% rename from scenarios/MotionControlTest/config/RobotStateComponent.cfg rename to scenarios/deprecated/MotionControlTest/config/RobotStateComponent.cfg diff --git a/scenarios/MotionControlTest/config/SystemObserver.cfg b/scenarios/deprecated/MotionControlTest/config/SystemObserver.cfg similarity index 100% rename from scenarios/MotionControlTest/config/SystemObserver.cfg rename to scenarios/deprecated/MotionControlTest/config/SystemObserver.cfg diff --git a/scenarios/MotionControlTest/motioncontrol.armarxgui b/scenarios/deprecated/MotionControlTest/motioncontrol.armarxgui similarity index 100% rename from scenarios/MotionControlTest/motioncontrol.armarxgui rename to scenarios/deprecated/MotionControlTest/motioncontrol.armarxgui diff --git a/scenarios/MotionControlTest/startGui.sh b/scenarios/deprecated/MotionControlTest/startGui.sh similarity index 100% rename from scenarios/MotionControlTest/startGui.sh rename to scenarios/deprecated/MotionControlTest/startGui.sh diff --git a/scenarios/MotionControlTest/startLogger.sh b/scenarios/deprecated/MotionControlTest/startLogger.sh similarity index 100% rename from scenarios/MotionControlTest/startLogger.sh rename to scenarios/deprecated/MotionControlTest/startLogger.sh diff --git a/scenarios/MotionControlTest/stopGui.sh b/scenarios/deprecated/MotionControlTest/stopGui.sh similarity index 100% rename from scenarios/MotionControlTest/stopGui.sh rename to scenarios/deprecated/MotionControlTest/stopGui.sh diff --git a/scenarios/TCPMoverScenario/configs/ArmarXGui.cfg b/scenarios/deprecated/TCPMoverScenario/configs/ArmarXGui.cfg similarity index 100% rename from scenarios/TCPMoverScenario/configs/ArmarXGui.cfg rename to scenarios/deprecated/TCPMoverScenario/configs/ArmarXGui.cfg diff --git a/scenarios/TCPMoverScenario/configs/ConditionHandler.cfg b/scenarios/deprecated/TCPMoverScenario/configs/ConditionHandler.cfg similarity index 100% rename from scenarios/TCPMoverScenario/configs/ConditionHandler.cfg rename to scenarios/deprecated/TCPMoverScenario/configs/ConditionHandler.cfg diff --git a/scenarios/TCPMoverScenario/configs/Gui.armarxgui b/scenarios/deprecated/TCPMoverScenario/configs/Gui.armarxgui similarity index 100% rename from scenarios/TCPMoverScenario/configs/Gui.armarxgui rename to scenarios/deprecated/TCPMoverScenario/configs/Gui.armarxgui diff --git a/scenarios/TCPMoverScenario/configs/HeadUnit.cfg b/scenarios/deprecated/TCPMoverScenario/configs/HeadUnit.cfg similarity index 100% rename from scenarios/TCPMoverScenario/configs/HeadUnit.cfg rename to scenarios/deprecated/TCPMoverScenario/configs/HeadUnit.cfg diff --git a/scenarios/TCPMoverScenario/configs/RobotUnit.cfg b/scenarios/deprecated/TCPMoverScenario/configs/RobotUnit.cfg similarity index 100% rename from scenarios/TCPMoverScenario/configs/RobotUnit.cfg rename to scenarios/deprecated/TCPMoverScenario/configs/RobotUnit.cfg diff --git a/scenarios/TCPMoverScenario/configs/RobotUnitObserver.cfg b/scenarios/deprecated/TCPMoverScenario/configs/RobotUnitObserver.cfg similarity index 100% rename from scenarios/TCPMoverScenario/configs/RobotUnitObserver.cfg rename to scenarios/deprecated/TCPMoverScenario/configs/RobotUnitObserver.cfg diff --git a/scenarios/tests/CMakeLists.txt b/scenarios/tests/CMakeLists.txt new file mode 100644 index 000000000..8aec5dbf1 --- /dev/null +++ b/scenarios/tests/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_subdirectory(statecharttestscenario) +add_subdirectory(WeissHapticSensorsUnitTest) + + + diff --git a/scenarios/RemoteRobotTest/RemoteRobotTestProject/CMakeLists.txt b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/CMakeLists.txt similarity index 100% rename from scenarios/RemoteRobotTest/RemoteRobotTestProject/CMakeLists.txt rename to scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/CMakeLists.txt diff --git a/scenarios/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.cpp b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.cpp similarity index 100% rename from scenarios/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.cpp rename to scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.cpp diff --git a/scenarios/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.h b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.h similarity index 100% rename from scenarios/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.h rename to scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.h diff --git a/scenarios/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProjectApp.h b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProjectApp.h similarity index 100% rename from scenarios/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProjectApp.h rename to scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProjectApp.h diff --git a/scenarios/RemoteRobotTest/RemoteRobotTestProject/build/.gitkeep b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/build/.gitkeep similarity index 100% rename from scenarios/RemoteRobotTest/RemoteRobotTestProject/build/.gitkeep rename to scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/build/.gitkeep diff --git a/scenarios/RemoteRobotTest/RemoteRobotTestProject/test/RemoteRobotTestProjectTest.cpp b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/test/RemoteRobotTestProjectTest.cpp similarity index 100% rename from scenarios/RemoteRobotTest/RemoteRobotTestProject/test/RemoteRobotTestProjectTest.cpp rename to scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/test/RemoteRobotTestProjectTest.cpp diff --git a/scenarios/RemoteRobotTest/configs/ArmarXGui.cfg b/scenarios/tests/RemoteRobotTest/configs/ArmarXGui.cfg similarity index 100% rename from scenarios/RemoteRobotTest/configs/ArmarXGui.cfg rename to scenarios/tests/RemoteRobotTest/configs/ArmarXGui.cfg diff --git a/scenarios/RemoteRobotTest/configs/ConditionHandler.cfg b/scenarios/tests/RemoteRobotTest/configs/ConditionHandler.cfg similarity index 100% rename from scenarios/RemoteRobotTest/configs/ConditionHandler.cfg rename to scenarios/tests/RemoteRobotTest/configs/ConditionHandler.cfg diff --git a/scenarios/RemoteRobotTest/configs/DummyObjectRecognitionConfig.txt b/scenarios/tests/RemoteRobotTest/configs/DummyObjectRecognitionConfig.txt similarity index 100% rename from scenarios/RemoteRobotTest/configs/DummyObjectRecognitionConfig.txt rename to scenarios/tests/RemoteRobotTest/configs/DummyObjectRecognitionConfig.txt diff --git a/scenarios/RemoteRobotTest/configs/HeadUnit.cfg b/scenarios/tests/RemoteRobotTest/configs/HeadUnit.cfg similarity index 100% rename from scenarios/RemoteRobotTest/configs/HeadUnit.cfg rename to scenarios/tests/RemoteRobotTest/configs/HeadUnit.cfg diff --git a/scenarios/RemoteRobotTest/configs/HeadUnitObserver.cfg b/scenarios/tests/RemoteRobotTest/configs/HeadUnitObserver.cfg similarity index 100% rename from scenarios/RemoteRobotTest/configs/HeadUnitObserver.cfg rename to scenarios/tests/RemoteRobotTest/configs/HeadUnitObserver.cfg diff --git a/scenarios/RemoteRobotTest/configs/ObjectMemoryConfig.txt b/scenarios/tests/RemoteRobotTest/configs/ObjectMemoryConfig.txt similarity index 100% rename from scenarios/RemoteRobotTest/configs/ObjectMemoryConfig.txt rename to scenarios/tests/RemoteRobotTest/configs/ObjectMemoryConfig.txt diff --git a/scenarios/RemoteRobotTest/configs/ObjectMemoryObserverConfig.txt b/scenarios/tests/RemoteRobotTest/configs/ObjectMemoryObserverConfig.txt similarity index 100% rename from scenarios/RemoteRobotTest/configs/ObjectMemoryObserverConfig.txt rename to scenarios/tests/RemoteRobotTest/configs/ObjectMemoryObserverConfig.txt diff --git a/scenarios/RemoteRobotTest/configs/RobotStateComponent.cfg b/scenarios/tests/RemoteRobotTest/configs/RobotStateComponent.cfg similarity index 100% rename from scenarios/RemoteRobotTest/configs/RobotStateComponent.cfg rename to scenarios/tests/RemoteRobotTest/configs/RobotStateComponent.cfg diff --git a/scenarios/WeissHapticSensorsUnitTest/CMakeLists.txt b/scenarios/tests/WeissHapticSensorsUnitTest/CMakeLists.txt similarity index 100% rename from scenarios/WeissHapticSensorsUnitTest/CMakeLists.txt rename to scenarios/tests/WeissHapticSensorsUnitTest/CMakeLists.txt diff --git a/scenarios/WeissHapticSensorsUnitTest/config/HapticObserverApp.cfg b/scenarios/tests/WeissHapticSensorsUnitTest/config/HapticObserverApp.cfg similarity index 100% rename from scenarios/WeissHapticSensorsUnitTest/config/HapticObserverApp.cfg rename to scenarios/tests/WeissHapticSensorsUnitTest/config/HapticObserverApp.cfg diff --git a/scenarios/WeissHapticSensorsUnitTest/config/WeissHapticSensorApp.cfg b/scenarios/tests/WeissHapticSensorsUnitTest/config/WeissHapticSensorApp.cfg similarity index 100% rename from scenarios/WeissHapticSensorsUnitTest/config/WeissHapticSensorApp.cfg rename to scenarios/tests/WeissHapticSensorsUnitTest/config/WeissHapticSensorApp.cfg diff --git a/scenarios/WeissHapticSensorsUnitTest/config/WeissHapticSensorsUnitApp.cfg b/scenarios/tests/WeissHapticSensorsUnitTest/config/WeissHapticSensorsUnitApp.cfg similarity index 100% rename from scenarios/WeissHapticSensorsUnitTest/config/WeissHapticSensorsUnitApp.cfg rename to scenarios/tests/WeissHapticSensorsUnitTest/config/WeissHapticSensorsUnitApp.cfg diff --git a/scenarios/WeissHapticSensorsUnitTest/jquery.min.js b/scenarios/tests/WeissHapticSensorsUnitTest/jquery.min.js similarity index 100% rename from scenarios/WeissHapticSensorsUnitTest/jquery.min.js rename to scenarios/tests/WeissHapticSensorsUnitTest/jquery.min.js diff --git a/scenarios/WeissHapticSensorsUnitTest/jquery.sparkline.js b/scenarios/tests/WeissHapticSensorsUnitTest/jquery.sparkline.js similarity index 100% rename from scenarios/WeissHapticSensorsUnitTest/jquery.sparkline.js rename to scenarios/tests/WeissHapticSensorsUnitTest/jquery.sparkline.js diff --git a/scenarios/WeissHapticSensorsUnitTest/startGui.sh b/scenarios/tests/WeissHapticSensorsUnitTest/startGui.sh similarity index 100% rename from scenarios/WeissHapticSensorsUnitTest/startGui.sh rename to scenarios/tests/WeissHapticSensorsUnitTest/startGui.sh diff --git a/scenarios/WeissHapticSensorsUnitTest/tactile.html b/scenarios/tests/WeissHapticSensorsUnitTest/tactile.html similarity index 100% rename from scenarios/WeissHapticSensorsUnitTest/tactile.html rename to scenarios/tests/WeissHapticSensorsUnitTest/tactile.html diff --git a/scenarios/statecharttestscenario/CMakeLists.txt b/scenarios/tests/statecharttestscenario/CMakeLists.txt similarity index 100% rename from scenarios/statecharttestscenario/CMakeLists.txt rename to scenarios/tests/statecharttestscenario/CMakeLists.txt diff --git a/scenarios/statecharttestscenario/config/ConditionHandler.cfg b/scenarios/tests/statecharttestscenario/config/ConditionHandler.cfg similarity index 100% rename from scenarios/statecharttestscenario/config/ConditionHandler.cfg rename to scenarios/tests/statecharttestscenario/config/ConditionHandler.cfg diff --git a/scenarios/statecharttestscenario/config/RobotControl.cfg b/scenarios/tests/statecharttestscenario/config/RobotControl.cfg similarity index 100% rename from scenarios/statecharttestscenario/config/RobotControl.cfg rename to scenarios/tests/statecharttestscenario/config/RobotControl.cfg diff --git a/scenarios/statecharttestscenario/config/SystemObserver.cfg b/scenarios/tests/statecharttestscenario/config/SystemObserver.cfg similarity index 100% rename from scenarios/statecharttestscenario/config/SystemObserver.cfg rename to scenarios/tests/statecharttestscenario/config/SystemObserver.cfg diff --git a/source/RobotAPI/applications/CMakeLists.txt b/source/RobotAPI/applications/CMakeLists.txt index 305c1d3e9..7f12f2afe 100644 --- a/source/RobotAPI/applications/CMakeLists.txt +++ b/source/RobotAPI/applications/CMakeLists.txt @@ -22,4 +22,4 @@ add_subdirectory(HandUnitSimulation) add_subdirectory(ForceTorqueUnitSimulation) -add_subdirectory(MMMPlayer) \ No newline at end of file +add_subdirectory(MMMPlayer) -- GitLab