update the test for api

Author: khadijeh.alibabaei

.sqa/config.yml

@@ -26,8 +26,8 @@ sqa_criteria:
             - qc.sec
 
 environment:
-  GIT_COMMITTER_NAME: "Lara Lloret (CSIC)"
-  GIT_COMMITTER_EMAIL: "lloret@ifca.unican.es"
+  GIT_COMMITTER_NAME: "Ignacio Heredia (CSIC)"
+  GIT_COMMITTER_EMAIL: "iheredia@ifca.unican.es"
   LANG: C.UTF-8
 
 timeout: 600

imgclas/__pycache__/api.cpython-37.pyc

@@ -38,7 +38,9 @@
 from imgclas import paths, utils, config, test_utils
 from imgclas.data_utils import load_class_names, load_class_info, mount_nextcloud
 from imgclas.train_runfile import train_fn
+from pathlib import Path
 
+BASE_DIR = Path(__file__).resolve().parents[1]
 
 # TODO: Move to proper marshalling for arguments
 # The point is that some fields need additional information than the one that is contained in the config.yaml
@@ -448,33 +450,33 @@ def get_predict_args():
     return populate_parser(parser, default_conf)
 
 
-def get_metadata(distribution_name='imgclas'):
+def get_metadata():
     """
-    Function to read metadata
+    DO NOT REMOVE - All modules should have a get_metadata() function
+    with appropriate keys.
     """
-
-    pkg = pkg_resources.get_distribution(distribution_name)
-    meta = {
-        'Name': None,
-        'Version': None,
-        'Summary': None,
-        'Home-page': None,
-        'Author': None,
-        'Author-email': None,
-        'License': None,
+    distros = list(pkg_resources.find_distributions(str(BASE_DIR), only=True))
+    if len(distros) == 0:
+        raise Exception("No package found.")
+    pkg = distros[0]  # if several select first
+
+    meta_fields = {
+        "Name": None,
+        "Version": None,
+        "Summary": None,
+        "Home-page": None,
+        "Author": None,
+        "Author-email": None,
+        "License": None,
     }
-
+    meta = {}
     for line in pkg.get_metadata_lines("PKG-INFO"):
-        for par in meta:
-            if line.startswith(par):
+       # line_low = line.lower()  # to avoid inconsistency due to letter cases
+        for k in meta_fields:
+            if line.startswith(k + ":"):
                 _, value = line.split(": ", 1)
-                meta[par] = value
-
-    # Update information with Docker info (provided as 'CONTAINER_*' env variables)
-    r = re.compile("^CONTAINER_(.*?)$")
-    container_vars = list(filter(r.match, list(os.environ)))
-    for var in container_vars:
-        meta[var.capitalize()] = os.getenv(var)
+                meta[k] = value
+    print(meta)            
 
     return meta
 

imgclas/api.py

@@ -0,0 +1,10 @@
+pytest
+pytest-xdist
+pytest-cov
+pytest-mock
+pytest-env
+flake8
+bandit
+tensorflow==1.14
+
+protobuf<=3.20.1

requirements-test.txt

@@ -4,7 +4,7 @@ python-dotenv>=0.5.1
 numpy>=1.14.5
 tensorboardX>=1.4
 opencv-python>=3.4.1.4
-albumentations>=0.1.8
+albumentations[imgaug]>=0.1.8
 tqdm>=4.25.0
 requests>=2.18.4
 PyYAML>=3.12

requirements.txt

@@ -0,0 +1,47 @@
+
+# -*- coding: utf-8 -*-
+"""
+Its good practice to have tests checking your code runs correctly.
+Here we included a dummy test checking the api correctly returns
+expected metadata. We suggest to extend this file to include, for
+example, test for checking the predict() function is indeed working
+as expected.
+
+These tests will run in the Jenkins pipeline after each change
+you make to the code.
+"""
+
+import unittest
+
+import imgclas.api as api
+
+
+class TestModelMethods(unittest.TestCase):
+    def setUp(self):
+        self.meta = api.get_metadata()
+
+    def test_model_metadata_type(self):
+        """
+        Test that get_metadata() returns dict
+        """
+        self.assertTrue(type(self.meta) is dict)
+
+    def test_model_metadata_values(self):
+        """
+        Test that get_metadata() returns right values (subset)
+        """
+        self.assertEqual(
+            self.meta["Name"].lower().replace("-", "_"),
+            "imgclas".lower().replace("-", "_"),
+        )
+        self.assertEqual(
+            self.meta["Author"].lower(), "ignacio heredia (csic)".lower()
+        )
+        self.assertEqual(
+            self.meta["License"].lower(),
+            "apache".lower(),
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()

test-requirements.txt

@@ -25,7 +25,7 @@ setenv =
    OS_TEST_TIMEOUT=240
 deps =
     -r{toxinidir}/requirements-test.txt
-    -r{toxinidir}/test-requirements.txt
+    -r{toxinidir}/requirements.txt
 
 [testenv:qc.sty]
 commands =