Cleanup

README copyright
test config file
strip '-SNAPSHOT' from version if present in test comparison
Add JsonNone to deserialization for query testing

Author: gmfeinberg

README.md

@@ -81,7 +81,7 @@ that the *borneo* package has been installed.
 ``` python
 
 #
-# Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at
 #  https://oss.oracle.com/licenses/upl/

src/borneo/serdeutil.py

@@ -835,6 +835,8 @@ def get_type(value):
             return SerdeUtil.FIELD_VALUE_TYPE.NULL
         elif isinstance(value, Empty):
             return SerdeUtil.FIELD_VALUE_TYPE.EMPTY
+        elif isinstance(value, JsonNone):
+            return SerdeUtil.FIELD_VALUE_TYPE.JSON_NULL
         else:
             raise IllegalStateException(
                 'Unknown value type ' + str(type(value)))

test/config.py

@@ -1,3 +1,30 @@
-endpoint = 'http://localhost:8080'
-version = '22.4.10'
+#
+# Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Universal Permissive License v 1.0 as shown at
+#  https://oss.oracle.com/licenses/upl/
+
+#
+# Parameters used by test code -- Cloud Simulator Configuration
+#
+# This file is configured for the unit tests to be run against a Cloud Simulator
+# instance. The simulator is used so that limits that exist in the cloud service
+# are not involved and there is no cost involved in running the unit tests.
+#
+# The default settings below are sufficient if the Cloud Simulator has been
+# started on the endpoint, localhost:8080, which is its default. If not, the
+# parameters in this file should be changed as needed. This is a backup of
+# config.py, when config.py is overwritten by other config*.py, the default
+# config.py of Cloud Simulator is back up in this file.
+#
+
+# The endpoint to use to connect to the service. This endpoint is for a Cloud
+# Simulator running on its default port (8080) on the local machine.
+endpoint = 'localhost:8080'
+
+# The server type, please don't change it.
 server_type = 'cloudsim'
+
+# Cloud Simulator version. Use None to test with the latest Cloud Simulator
+# version, a specified version should be like "1.4.0".
+version = None

test/testutils.py

@@ -93,6 +93,8 @@ def compare_version(specified, internal):
     If the user specified version is newer than internal check version return 1,
     older return -1, same return 0.
     """
+    #if version is a snapshot, strip that portion
+    specified = specified.strip('-SNAPSHOT')
     specified_check = match('\d+(\.\d+){0,2}', specified)
     internal_check = match('\d+(\.\d+){0,2}', internal)
     if (specified_check is None or internal_check is None or