Merge branch 'master' into devel

doc/release/v1_6_0.md

@@ -1,4 +1,4 @@
-Robot Testing Framework 1.6.0 (2018-9-09) Release Notes
+Robot Testing Framework 1.6.0 (2018-9-09) Release Notes  {#v1_6_0}
 ========================================================
 
 Important Changes

doc/release/v1_6_1.md

@@ -0,0 +1,7 @@
+Robot Testing Framework 1.6.1 (UNRELEASED) Release Notes               {#v1_6_1}
+========================================================
+
+Bug Fixes
+---------
+
+*

examples/lua-plugin/mytest.lua

@@ -1,52 +1,52 @@
---
--- Copyright (C) 2015 iCub Facility
--- Authors: Ali Paikan
--- CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
---
-
---
--- The TestCase table is used by the lua plugin loader
--- to invoke the corresponding methods:
---
--- TestCase.setup = function(options) ... return true end
--- TestCase.run = function() ... end 
--- TestCase.tearDown = function() ... end 
---
--- The following methods are for reporting, failures or assertions: 
---
--- RTF.setName(name)              : sets the test name (defualt is the test filename)
--- RTF.testReport(msg)            : reports a informative message
--- RTF.testCheck(condition, msg)  : reports the test message and marks the test as failed if condition is false 
--- RTF.testFailIf(condition, msg) : marks the test as failed and reports failure message (the reason) if condition is false
--- RTF.assertError(msg)           : throws an error exception with message
--- RTF.asserFail(msg)             : throws a failure exception with message
--- RTF.getEnvironment()           : returns the test environment params
---
-
---
--- setup is called before the test's run to setup 
--- the user defined fixture
--- @return Boolean (true/false uppon success or failure)
---
-TestCase.setup = function(parameter)
-    RTF.testReport("Preparing setup...")
-    return true;
-end
-
---
--- The implementation of the test goes here
---
-TestCase.run = function()
-    RTF.testCheck(5>3, "5 is bigger than 3")
-    RTF.testCheck(5<3, "5 is less than 3")
-end
-
-
---
--- tearDown is called after the test's run to tear down
--- the user defined fixture
---
-TestCase.tearDown = function()
-    RTF.testReport("Tearing down...")
-end
-
+--
+-- Copyright (C) 2015 iCub Facility
+-- Authors: Ali Paikan
+-- CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
+--
+
+--
+-- The TestCase table is used by the lua plugin loader
+-- to invoke the corresponding methods:
+--
+-- TestCase.setup = function(options) ... return true end
+-- TestCase.run = function() ... end 
+-- TestCase.tearDown = function() ... end 
+--
+-- The following methods are for reporting, failures or assertions: 
+--
+-- RTF.setName(name)              : sets the test name (defualt is the test filename)
+-- RTF.testReport(msg)            : reports a informative message
+-- RTF.testCheck(condition, msg)  : reports the test message and marks the test as failed if condition is false 
+-- RTF.testFailIf(condition, msg) : marks the test as failed and reports failure message (the reason) if condition is false
+-- RTF.assertError(msg)           : throws an error exception with message
+-- RTF.asserFail(msg)             : throws a failure exception with message
+-- RTF.getEnvironment()           : returns the test environment params
+--
+
+--
+-- setup is called before the test's run to setup 
+-- the user defined fixture
+-- @return Boolean (true/false uppon success or failure)
+--
+TestCase.setup = function(parameter)
+    RTF.testReport("Preparing setup...")
+    return true;
+end
+
+--
+-- The implementation of the test goes here
+--
+TestCase.run = function()
+    RTF.testCheck(5>3, "5 is bigger than 3")
+    RTF.testCheck(5<3, "5 is less than 3")
+end
+
+
+--
+-- tearDown is called after the test's run to tear down
+-- the user defined fixture
+--
+TestCase.tearDown = function()
+    RTF.testReport("Tearing down...")
+end
+

examples/python-plugin/mytest.py

@@ -1,50 +1,50 @@
-'''
- Copyright (C) 2015 iCub Facility
- Authors: Ali Paikan
- CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
-'''
-
-'''
- RTF module is automatically imported by the python plugin loader
- to invoke the corresponding test case methods. To develop a new 
- test case simply implement the following class; (setup and tearDown 
- methods are optional) :
-
- class TestCase:
-     def setup(self, param):
-         return True
-
-     def run(self):
-
-     def tearDown(self):
-
-
- The following methods are for reporting, failure or assertions: 
-
- RTF.setName(name)             : sets the test name (defualt is the test filename)
- RTF.testReport(msg)           : reports a informative message
- RTF.testCheck(condition, msg) : reports the test message and marks the test as failed if condition is false
- RTF.assertError(msg)          : throws an error exception with message
- RTF.asserFail(msg)            : throws a failure exception with message
-'''
-
-class TestCase:
-    # setup is called before the test's run to setup 
-    # the user defined fixture
-    # @return Boolean (True/False uppon success or failure)
-    def setup(self, param):
-        RTF.testReport("Preparing setup...")
-        return True
-
-    # The implementation of the test goes here
-    def run(self):
-        RTF.testCheck(5>3, "5 is bigger than 3.")
-        RTF.testCheck(5<3, "5 is smaller than 3.")
-
-    # tearDown is called after the test's run to tear down
-    # the user defined fixture
-    def tearDown(self):
-        RTF.testReport("Tearing down...")
-
-
-
+'''
+ Copyright (C) 2015 iCub Facility
+ Authors: Ali Paikan
+ CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
+'''
+
+'''
+ RTF module is automatically imported by the python plugin loader
+ to invoke the corresponding test case methods. To develop a new 
+ test case simply implement the following class; (setup and tearDown 
+ methods are optional) :
+
+ class TestCase:
+     def setup(self, param):
+         return True
+
+     def run(self):
+
+     def tearDown(self):
+
+
+ The following methods are for reporting, failure or assertions: 
+
+ RTF.setName(name)             : sets the test name (defualt is the test filename)
+ RTF.testReport(msg)           : reports a informative message
+ RTF.testCheck(condition, msg) : reports the test message and marks the test as failed if condition is false
+ RTF.assertError(msg)          : throws an error exception with message
+ RTF.asserFail(msg)            : throws a failure exception with message
+'''
+
+class TestCase:
+    # setup is called before the test's run to setup 
+    # the user defined fixture
+    # @return Boolean (True/False uppon success or failure)
+    def setup(self, param):
+        RTF.testReport("Preparing setup...")
+        return True
+
+    # The implementation of the test goes here
+    def run(self):
+        RTF.testCheck(5>3, "5 is bigger than 3.")
+        RTF.testCheck(5<3, "5 is smaller than 3.")
+
+    # tearDown is called after the test's run to tear down
+    # the user defined fixture
+    def tearDown(self):
+        RTF.testReport("Tearing down...")
+
+
+

examples/ruby-plugin/mytest.rb

@@ -1,51 +1,51 @@
-# Copyright (C) 2015 iCub Facility
-# Authors: Ali Paikan
-# CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
-
-# RTF module is automatically imported by the ruby plugin loader
-# to invoke the corresponding test case methods. To develop a new 
-# test case simply implement the following class; (setup and tearDown 
-# methods are optional) :
-#
-# class TestCase
-#     def setup(param)
-#         ...
-#         return true
-#     end
-#
-#     def run ... end
-#
-#     def tearDown ... end
-# end
-#
-# The following methods are for reporting, failure or assertions: 
-#
-# RTF::setName(name)             : sets the test name (defualt is the test filename)
-# RTF::testReport(msg)           : reports a informative message
-# RTF::testCheck(condition, msg) : reports the test message and marks the test as failed if condition is false
-# RTF::assertError(msg)          : throws an error exception with message
-# RTF::asserFail(msg)            : throws a failure exception with message
-#
-
-class TestCase
-    # setup is called before the test's run to setup 
-    # the user defined fixture
-    # @return Boolean (True/False uppon success or failure)
-    def setup(param)
-        RTF::testReport("Preparing setup...")
-        return true
-    end
-
-    # The implementation of the test goes here
-    def run
-        RTF::testCheck(5>3, "5 is bigger than 3.")
-        RTF::testCheck(5<3, "5 is smaller than 3.")
-    end
-
-    # tearDown is called after the test's run to tear down
-    # the user defined fixture
-    def tearDown
-        RTF::testReport("Tearing down...")
-    end
-end
-
+# Copyright (C) 2015 iCub Facility
+# Authors: Ali Paikan
+# CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
+
+# RTF module is automatically imported by the ruby plugin loader
+# to invoke the corresponding test case methods. To develop a new 
+# test case simply implement the following class; (setup and tearDown 
+# methods are optional) :
+#
+# class TestCase
+#     def setup(param)
+#         ...
+#         return true
+#     end
+#
+#     def run ... end
+#
+#     def tearDown ... end
+# end
+#
+# The following methods are for reporting, failure or assertions: 
+#
+# RTF::setName(name)             : sets the test name (defualt is the test filename)
+# RTF::testReport(msg)           : reports a informative message
+# RTF::testCheck(condition, msg) : reports the test message and marks the test as failed if condition is false
+# RTF::assertError(msg)          : throws an error exception with message
+# RTF::asserFail(msg)            : throws a failure exception with message
+#
+
+class TestCase
+    # setup is called before the test's run to setup 
+    # the user defined fixture
+    # @return Boolean (True/False uppon success or failure)
+    def setup(param)
+        RTF::testReport("Preparing setup...")
+        return true
+    end
+
+    # The implementation of the test goes here
+    def run
+        RTF::testCheck(5>3, "5 is bigger than 3.")
+        RTF::testCheck(5<3, "5 is smaller than 3.")
+    end
+
+    # tearDown is called after the test's run to tear down
+    # the user defined fixture
+    def tearDown
+        RTF::testReport("Tearing down...")
+    end
+end
+

src/rtf/include/rtf/WebProgressListener.h

@@ -1,4 +1,4 @@
-// -*- mode:C++; tab-width:4; c-basic-offset:4; indent-tabs-mode:nil -*-
+// -*- mode:C++; tab-width:4; c-basic-offset:4; indent-tabs-mode:nil -*-
 
 /*
  * Copyright (C) 2015 iCub Facility

src/rtf/include/rtf/impl/WebProgressListener_impl.h

@@ -1,4 +1,4 @@
-// -*- mode:C++; tab-width:4; c-basic-offset:4; indent-tabs-mode:nil -*-
+// -*- mode:C++; tab-width:4; c-basic-offset:4; indent-tabs-mode:nil -*-
 
 /*
  * Copyright (C) 2015 iCub Facility