diff --git a/api/pytest/test_api_tester.py b/api/pytest/test_api_tester.py index 87eb233..d037400 100644 --- a/api/pytest/test_api_tester.py +++ b/api/pytest/test_api_tester.py @@ -1,6 +1,8 @@ #Importing pytest is not required unless using markers, as demonstrated below import pytest import ECNQueue +import random +import unittest @pytest.mark.ECNQueue_getValidQueuesTest def test_ECNQueue_getQueueCounts(): @@ -24,10 +26,13 @@ def test_ECNQueue_getQueueCounts(): assert "number_of_items" in queue.keys() assert type(queue['number_of_items']) is int -@pytest.mark.ECNQueue_loadQueues -def test_ECNQueue_loadQueues(): +# This function within ECNQueue has changed to load only necessary metadata of items, and not the full item +# These changes have not been implemented on this branch yet - queues = ECNQueue.loadQueues() +# @pytest.mark.ECNQueue_loadQueues +# def test_ECNQueue_loadQueues(): + + # queues = ECNQueue.loadQueues() @pytest.mark.ECNQueue_getValidQueues def test_ECNQueue_getValidQueues(): @@ -39,4 +44,26 @@ def test_ECNQueue_getValidQueues(): # ensure that the ECNQueue.getValidQueues returns a list of strings for queue in validQueues: - assert type(queue) is str \ No newline at end of file + assert type(queue) is str + +@pytest.mark.ECNQueue_isValidItemName +def test_ECNQueue_isValidItemName(): + #itemPattern = re.compile("^[0123456789]{1,3}$") + + assert ECNQueue.isValidItemName("12") == True + assert ECNQueue.isValidItemName("5") == True + assert ECNQueue.isValidItemName("five") == False + assert ECNQueue.isValidItemName("ece12") == False + + # This test at present fails due to error handeling not being implemented for this function + #assert unittest.TestCase.assertRaises(TypeError, ECNQueue.isValidItemName(1)) + + assert ECNQueue.isValidItemName("1111") == True + +@pytest.mark.ECNQueue_Item +def test_ECNQueue_Item(): + + validQueues = ECNQueue.getValidQueues() + + random.choice(validQueues) +