Merge pull request #47 from Hi-Fi/release/4.0.0

Release/4.0.0

Author: Hi-Fi

.github/workflows/maven.yml

@@ -0,0 +1,40 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        # test against LTS java versions:
+        java: [ 8 ]
+    name: Test with Java ${{ matrix.java }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK ${{ matrix.java }}
+      uses: actions/setup-java@v1.2.0
+      with:
+        java-version: ${{ matrix.java }}
+    - name: Build with Maven
+      run: mvn -B verify --file pom.xml
+  release:
+    needs: [build_and_test]
+    if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    name: Release package
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK
+      uses: actions/setup-java@v1.2.0
+      with:
+        java-version: 8
+    - name: Release Maven package
+      uses: samuelmeuli/action-maven-publish@1221d1fa792cab948a772c5e7c1f3abe84aec3bf
+      with:
+        gpg_private_key: ${{ secrets.gpg_private_key }}
+        gpg_passphrase: ${{ secrets.gpg_passphrase }}
+        nexus_username: ${{ secrets.nexus_username }}
+        nexus_password: ${{ secrets.nexus_password }}
+        maven_args: -DskipTests

.gitignore

@@ -6,4 +6,7 @@ test-output
 atest/results
 *.pyc
 *.class
-.pydevproject
+.pydevproject
+.vscode
+.idea
+*.iml

atest/run.py

@@ -63,7 +63,7 @@
         args.extend(['--exclude', 'kwargs'])
     args.extend(['--loglevel','DEBUG'])
     args.extend([join(BASE, 'tests')])
-    print 'Running tests with command:\n%s' % ' '.join(args)
+    print('Running tests with command:\n%s' % ' '.join(args))
     subprocess.call(args)
 
     print
@@ -72,6 +72,6 @@
 servercontroller.stop(8270, "/Static")
 rc = robot.rebot(*outputs, outputdir=RESULTS)
 if rc == 0:
-    print 'All tests passed'
+    print('All tests passed')
 else:
-    print '%d test%s failed' % (rc, 's' if rc != 1 else '')
+    print('%d test%s failed' % (rc, 's' if rc != 1 else ''))

atest/servercontroller.py

@@ -18,7 +18,8 @@
 """
 
 from __future__ import with_statement
-import xmlrpclib
+import xmlrpc
+import xmlrpc.client
 import time
 import subprocess
 import socket
@@ -37,23 +38,23 @@ def start(libraries=
         'org.robotframework.examplelib.Static:/Static' ):
     if not os.path.exists(os.path.join(BASE, 'libs', 'target', 'examplelib-jar-with-dependencies.jar')):
         cmd = 'mvn -f "%s" clean package' % os.path.join(BASE, 'libs', 'pom.xml')
-        print 'Building the test libraries with command:\n%s' % cmd
+        print('Building the test libraries with command:\n%s' % cmd)
         subprocess.call(cmd, shell=True)
     files = glob.glob(os.path.join(dirname(BASE), 'target') + os.sep + '*jar-with-dependencies.jar')
     if not files:
         raise Exception('Build jrobotremoteserver including the standalone jar first')
     rs_path = os.path.join(dirname(BASE), 'target', files[0])
     tl_path = os.path.join(BASE, 'libs', 'target', 'examplelib-jar-with-dependencies.jar')
     os.environ['CLASSPATH'] = rs_path + os.pathsep + tl_path
-    print 'CLASSPATH: %s' % os.environ['CLASSPATH']
+    print('CLASSPATH: %s' % os.environ['CLASSPATH'])
     results = _get_result_directory()
     port = "8270"
     args = ['java', 'org.robotframework.remoteserver.RemoteServer', '--port', port]
     libraries = [x.strip() for x in libraries.split(',')]
     paths = [x.partition(':')[2] for x in libraries]
     for lib in libraries:
         args.extend(['--library', lib])
-        print 'adding library %s on path %s' % (lib.split(':')[0], lib.split(':')[1])
+        print('adding library %s on path %s' % (lib.split(':')[0], lib.split(':')[1]))
     with open(join(results, 'server.txt'), 'w') as output:
         server = subprocess.Popen(args,
                                   stdout=output, stderr=subprocess.STDOUT,
@@ -82,24 +83,24 @@ def test(port, path, attempts=1):
         if i > 0:
             time.sleep(1)
         try:
-            ret = xmlrpclib.ServerProxy(url).run_keyword('get_server_language', [])
-        except socket.error, (errno, errmsg):
+            ret = xmlrpc.client.ServerProxy(url).run_keyword('get_server_language', [])
+        except socket.error:
             pass
-        except xmlrpclib.Error, err:
+        except xmlrpc.Error:
             errmsg = err.faultString
             break
         else:
-            print "Remote server running on port %s, path %s" % (port, path)
+            print("Remote server running on port %s, path %s" % (port, path))
             return True
-    print "Failed to connect to remote server on port %s path %s: %s" % (port, path, errmsg)
+    print("Failed to connect to remote server on port %s path %s: %s" % (port, path, errmsg))
     return False
 
 
 def stop(port=8270, path="/"):
     if test(port, path):
         server = xmlrpclib.ServerProxy('http://localhost:%s%s' % (port, path))
         server.stop_remote_server()
-        print "Remote server on port %s path %s stopped" % (port, path)
+        print("Remote server on port %s path %s stopped" % (port, path))
 
 
 if __name__ == '__main__':

atest/statuschecker.py

@@ -177,14 +177,14 @@ def _get_log_message(self, msg_str):
     import os
 
     if not 2 <= len(sys.argv) <= 3 or '--help' in sys.argv:
-        print __doc__
+        print(__doc__)
         sys.exit(1)
     infile = sys.argv[1]
     outfile = sys.argv[2] if len(sys.argv) == 3 else None
-    print  "Checking %s" % os.path.abspath(infile)
+    print("Checking %s" % os.path.abspath(infile))
     rc = process_output(infile, outfile)
     if outfile:
-        print "Output: %s" % os.path.abspath(outfile)
+        print("Output: %s" % os.path.abspath(outfile))
     if rc > 255:
         rc = 255
     sys.exit(rc)

atest/tests/Z_LAST__special_failures.txt …est/tests/Z_LAST__special_failures.robotatest/tests/Z_LAST__special_failures.txt renamed to atest/tests/Z_LAST__special_failures.robot atest/tests/Z_LAST__special_failures.txt renamed to atest/tests/Z_LAST__special_failures.robot

@@ -1,5 +1,5 @@
 *** Settings ***
-Resource          resource.txt
+Resource          resource.robot
 
 *** Test Cases ***
 Not special

atest/tests/argument_counts.txt atest/tests/argument_counts.robotatest/tests/argument_counts.txt renamed to atest/tests/argument_counts.robot

@@ -1,5 +1,5 @@
 *** Settings ***
-Resource         resource.txt
+Resource         resource.robot
 Test Template    Arguments Should Be Accepted
 
 *** Test Cases ***

atest/tests/argument_types.robot

@@ -0,0 +1,79 @@
+*** Settings ***
+Resource          resource.txt
+
+*** Test Cases ***
+String As Argument
+    String As Argument    ${BYTE STRING}
+
+Non-ASCII String As Argument
+    Unicode String As Argument    ${UNICODE STRING}
+
+Control Char As Argument
+    [Documentation]    Fails with ExpatError when server runs on Jython 2.5.
+    Control Char As Argument    ${CONTROL CHAR}
+
+Empty String As Argument
+    Empty String As Argument    ${EMPTY}
+
+Integer As Argument
+    Integer As Argument    ${42}
+    Negative Integer As Argument    ${-1}
+
+Int As Argument Conversion From String
+    [Documentation]    JavalibCore does the conversion, this is just a sanity check
+    ${number}=    Int As Argument    42
+    Should Be Equal    ${number}    ${42}
+
+Double As Argument
+    Double As Argument    ${9.34}
+    Double Object As Argument    ${4.2}
+
+Zero As Argument
+    Zero As Argument    ${0}
+
+Boolean As Argument
+    Boolean True As Argument    ${True}
+    Boolean False As Argument    ${False}
+    Boolean Object As Argument    ${False}
+
+Null As Argument
+    [Documentation]    None is converted to empty string because it is not supported by all XML-RPC versions.
+    Null As Argument    ${None}
+
+Arbitrary Object As Argument
+    [Documentation]    Arbitrary objects cannot be transferred over XML-RPC and thus only their string presentation is used
+    Object As Argument    ${MyObject()}
+
+List As Argument
+    List As Argument    ${LIST}
+    Empty List As Argument    ${EMPTY LIST}
+
+List Containing None As Argument
+    List Containing None As Argument    ${LIST WITH NONE}
+
+List Containing Arbitrary Objects As Argument
+    List Containing Objects As Argument    ${LIST WITH OBJECTS}
+
+Nested List As Argument
+    Nested List As Argument    ${NESTED LIST}
+
+Map As Argument
+    Map As Argument    ${DICT}
+    Empty Map As Argument    ${EMPTY DICT}
+
+Map With Non-String Keys As Argument
+    [Documentation]    XML-RPC supports only strings as keys so must convert them
+    Map With Non String Keys As Argument    ${DICT WITH NON STRING KEYS}
+
+Map Containing None As Argument
+    Map Containing None As Argument    ${DICT WITH NONE}
+
+Map Containing Objects As Argument
+    Map Containing Objects As Argument    ${DICT WITH OBJECTS}
+
+Nested Map As Argument
+    Nested Map As Argument    ${NESTED DICT}
+
+Array As Argument
+    Array As Argument    ${LIST_WITH_INTEGERS}    ${-2}
+

atest/tests/argument_types.txt

@@ -1,5 +1,5 @@
 *** Settings ***
-Resource         resource.txt
+Resource         resource.robot
 
 *** Variables ***
 ${COUNT}    100