Skip to content

Commit

Permalink
Merge pull request #45 from drdanz/YARP_3_1
Browse files Browse the repository at this point in the history
Port to YARP 3.1 and clean licenses
  • Loading branch information
drdanz authored Mar 25, 2019
2 parents 62a35c6 + cc5fd43 commit 8008de3
Show file tree
Hide file tree
Showing 106 changed files with 2,200 additions and 652 deletions.
24 changes: 18 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,30 @@
# iCub Robot test units (Robot Testing Framework)
# Copyright: (C) 2015 iCub Facility, Istituto Italiano di Tecnologia
# Authors: Ali Paikan <[email protected]>
# iCub Robot Unit Tests (Robot Testing Framework)
#
# Copy Policy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
# Copyright (C) 2015-2019 Istituto Italiano di Tecnologia (IIT)
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA


cmake_minimum_required(VERSION 3.5)

cmake_minimum_required(VERSION 3.0)
project(iCub-Tests)

# find a version of RTF higher then 1.3.2
# and with yarp support enabled
find_package(RTF 1.3.3 COMPONENTS DLL REQUIRED)
find_package(YARP 3.0 COMPONENTS rtf manager math REQUIRED)
find_package(YARP 3.1 COMPONENTS rtf manager math REQUIRED)

# set the output plugin directory to collect all the shared libraries
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins)
Expand Down
20 changes: 16 additions & 4 deletions example/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
# Robot Testing Framework (RTF)
# Copyright: (C) 2015 Ali Paikan
# Authors: Ali Paikan <[email protected]>
# iCub Robot Unit Tests (Robot Testing Framework)
#
# Copy Policy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
# Copyright (C) 2015-2019 Istituto Italiano di Tecnologia (IIT)
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA


add_subdirectory(ExampleTest)
add_subdirectory(ExampleFixture)
Expand Down
24 changes: 19 additions & 5 deletions example/cpp/ExampleFixture/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
# Robot Testing Framework (RTF)
# Copyright: (C) 2015 Ali Paikan
# Authors: Ali Paikan <[email protected]>
# iCub Robot Unit Tests (Robot Testing Framework)
#
# Copy Policy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
# Copyright (C) 2015-2019 Istituto Italiano di Tecnologia (IIT)
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA


cmake_minimum_required(VERSION 3.0)
if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
cmake_minimum_required(VERSION 3.5)
endif()

# set the project name
set(PROJECTNAME ExampleFixture)
Expand Down
21 changes: 16 additions & 5 deletions example/cpp/ExampleFixture/ExampleFixture.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
// -*- mode:C++ { } tab-width:4 { } c-basic-offset:4 { } indent-tabs-mode:nil -*-

/*
* Copyright (C) 2015 iCub Facility
* Authors: Ali Paikan
* CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
* iCub Robot Unit Tests (Robot Testing Framework)
*
* Copyright (C) 2015-2019 Istituto Italiano di Tecnologia (IIT)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#include <cstdio>
Expand Down
21 changes: 16 additions & 5 deletions example/cpp/ExampleFixture/ExampleFixture.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
// -*- mode:C++ { } tab-width:4 { } c-basic-offset:4 { } indent-tabs-mode:nil -*-

/*
* Copyright (C) 2015 iCub Facility
* Authors: Ali Paikan
* CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
* iCub Robot Unit Tests (Robot Testing Framework)
*
* Copyright (C) 2015-2019 Istituto Italiano di Tecnologia (IIT)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#ifndef _EXAMPLE_FIXTURE_H_
Expand Down
24 changes: 19 additions & 5 deletions example/cpp/ExampleTest/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
# Robot Testing Framework (RTF)
# Copyright: (C) 2015 Ali Paikan
# Authors: Ali Paikan <[email protected]>
# iCub Robot Unit Tests (Robot Testing Framework)
#
# Copy Policy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
# Copyright (C) 2015-2019 Istituto Italiano di Tecnologia (IIT)
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA


cmake_minimum_required(VERSION 3.0)
if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
cmake_minimum_required(VERSION 3.5)
endif()

# set the project name
set(PROJECTNAME ExampleTest)
Expand Down
21 changes: 16 additions & 5 deletions example/cpp/ExampleTest/ExampleTest.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
// -*- mode:C++ { } tab-width:4 { } c-basic-offset:4 { } indent-tabs-mode:nil -*-

/*
* Copyright (C) 2015 iCub Facility
* Authors: Ali Paikan
* CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
* iCub Robot Unit Tests (Robot Testing Framework)
*
* Copyright (C) 2015-2019 Istituto Italiano di Tecnologia (IIT)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#include "ExampleTest.h"
Expand Down
21 changes: 16 additions & 5 deletions example/cpp/ExampleTest/ExampleTest.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
// -*- mode:C++ { } tab-width:4 { } c-basic-offset:4 { } indent-tabs-mode:nil -*-

/*
* Copyright (C) 2015 iCub Facility
* Authors: Ali Paikan
* CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
* iCub Robot Unit Tests (Robot Testing Framework)
*
* Copyright (C) 2015-2019 Istituto Italiano di Tecnologia (IIT)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#ifndef _EXAMPLE_TEST_H_
Expand Down
20 changes: 16 additions & 4 deletions example/lua/example-test.lua
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
-- iCub Robot Unit Tests (Robot Testing Framework)
--
-- Copyright (C) 2015 iCub Facility
-- Authors: Ali Paikan
-- CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
-- Copyright (C) 2015-2019 Istituto Italiano di Tecnologia (IIT)
--

-- This library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- This library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with this library; if not, write to the Free Software
-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

--
-- The TestCase table is used by the lua plugin loader
-- to invoke the corresponding methods:
Expand Down
18 changes: 18 additions & 0 deletions scripts/icub_tests.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
#!/bin/bash

# iCub Robot Unit Tests (Robot Testing Framework)
#
# Copyright (C) 2015-2019 Istituto Italiano di Tecnologia (IIT)
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

size=`xrandr -q | awk -F'current' -F',' 'NR==1 {gsub("( |current)","");print $2}'`
w=`echo $size | cut -f1 -d'x'`
h=`echo $size | cut -f2 -d'x'`
Expand Down
24 changes: 19 additions & 5 deletions src/camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
# RTF
# Copyright: (C) 2015 Ali Paikan
# Authors: Ali Paikan <[email protected]>
# iCub Robot Unit Tests (Robot Testing Framework)
#
# Copy Policy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
# Copyright (C) 2015-2019 Istituto Italiano di Tecnologia (IIT)
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA


if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
cmake_minimum_required(VERSION 3.5)
endif()

cmake_minimum_required(VERSION 3.0)
set(PROJECTNAME CameraTest)
project(${PROJECTNAME})

Expand Down
23 changes: 18 additions & 5 deletions src/camera/CameraTest.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
// -*- mode:C++ { } tab-width:4 { } c-basic-offset:4 { } indent-tabs-mode:nil -*-

/*
* Copyright (C) 2015 iCub Facility
* Authors: Ali Paikan and Lorenzo Natale
* CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
* iCub Robot Unit Tests (Robot Testing Framework)
*
* Copyright (C) 2015-2019 Istituto Italiano di Tecnologia (IIT)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/


#include <iostream>
#include <stdlib.h> // for abs()
#include <rtf/TestAssert.h>
Expand Down
21 changes: 16 additions & 5 deletions src/camera/CameraTest.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
// -*- mode:C++ { } tab-width:4 { } c-basic-offset:4 { } indent-tabs-mode:nil -*-

/*
* Copyright (C) 2015 iCub Facility
* Authors: Ali Paikan
* CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
* iCub Robot Unit Tests (Robot Testing Framework)
*
* Copyright (C) 2015-2019 Istituto Italiano di Tecnologia (IIT)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#ifndef _CAMERATEST_H_
Expand Down
21 changes: 18 additions & 3 deletions src/cartesian-control/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
# Copyright: (C) 2016 iCub Facility - Istituto Italiano di Tecnologia
# Authors: Ugo Pattacini <[email protected]>
# CopyPolicy: Released under the terms of the GNU GPL v2.0.
# iCub Robot Unit Tests (Robot Testing Framework)
#
# Copyright (C) 2015-2019 Istituto Italiano di Tecnologia (IIT)
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA


add_subdirectory(simple-p2p-movement)
add_subdirectory(reaching-tolerance)
Expand Down
Loading

0 comments on commit 8008de3

Please sign in to comment.