fix uuid reimplemntation

Change-Id: I2a3fea06b026a450b3c334706c386424e00f07e0
Issue-ID: TEST-174
Signed-off-by: DR695H <dr695h@att.com>

diff --git a/robotframework-onap/ONAPLibrary/UUIDKeywords.py b/robotframework-onap/ONAPLibrary/UUIDKeywords.py
index 3e85779..ae92637 100644 (file)
--- a/robotframework-onap/ONAPLibrary/UUIDKeywords.py
+++ b/robotframework-onap/ONAPLibrary/UUIDKeywords.py
@@ -13,12 +13,12 @@ class UUIDKeywords(object):
     @keyword
     def generate_uuid4(self):
         """generate a uuid"""
-        return uuid.uuid4()
+        return str(uuid.uuid4())
 
     @keyword
     def generate_uuid1(self):
         """generate a timestamp uuid"""
-        return uuid.uuid1()
+        return str(uuid.uuid1())
 
     @keyword
     def generate_timestamp(self):

diff --git a/robotframework-onap/setup.py b/robotframework-onap/setup.py
index 9d58595..2718b40 100644 (file)
--- a/robotframework-onap/setup.py
+++ b/robotframework-onap/setup.py
@@ -41,7 +41,7 @@ setup(
         'robotframework-requests',
         'six',
         'urllib3'
-    ],  # what we need
+    ],  # what we need to run library
     packages=['loadtest', 'vcpeutils', 'ONAPLibrary'],       # The name of your scripts package
     package_dir={
         'loadtest': 'loadtest',

diff --git a/robotframework-onap/tests/ONAPLibrary/UUIDKeywordsTest.py b/robotframework-onap/tests/ONAPLibrary/UUIDKeywordsTest.py
new file mode 100644 (file)
index 0000000..ae8e86a
--- /dev/null
+++ b/robotframework-onap/tests/ONAPLibrary/UUIDKeywordsTest.py
@@ -0,0 +1,32 @@
+# Copyright 2019 AT&T Intellectual Property. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from unittest import TestCase
+
+from ONAPLibrary.UUIDKeywords import UUIDKeywords
+
+
+class UUIDKeywordsTest(TestCase):
+
+    def test_uuid4(self):
+        uuid = UUIDKeywords()
+        self.assertGreater(len(uuid.generate_uuid4()), 0)
+
+    def test_uuid1(self):
+        uuid = UUIDKeywords()
+        self.assertGreater(len(uuid.generate_uuid1()), 0)
+
+    def test_timestamp(self):
+        uuid = UUIDKeywords()
+        self.assertGreater(uuid.generate_timestamp(), 0)

diff --git a/robotframework-onap/tests/runner.py b/robotframework-onap/tests/runner.py
index 3422dfe..63487ff 100644 (file)
--- a/robotframework-onap/tests/runner.py
+++ b/robotframework-onap/tests/runner.py
@@ -5,7 +5,7 @@ from unittest import TestSuite
 # import your test modules
 from tests.vcpeutils.SoUtils_test import SoUtilsTest
 from tests.ONAPLibrary.ProtobufKeywordsTest import ProtobufKeywordsTest
-
+from tests.ONAPLibrary.UUIDKeywordsTest import UUIDKeywordsTest
 
 # initialize the test suite
 loader = TestLoader()
@@ -14,6 +14,7 @@ suite = TestSuite()
 # add tests to the test suite
 suite.addTests(loader.loadTestsFromTestCase(ProtobufKeywordsTest))
 suite.addTests(loader.loadTestsFromTestCase(SoUtilsTest))
+suite.addTests(loader.loadTestsFromTestCase(UUIDKeywordsTest))
 
 # initialize a runner, pass it your suite and run it
 runner = TextTestRunner(verbosity=3)