test(multiple) : adding tests to the main

* build: rename package name and pyproject toml * docs: modified name in license * 11 modify the module name from dcm anon to dcm anon (#17) * fix(modulename): update to dcm_anon * added a dummy test to ci pipeline * test: Added stubs for missing tests * refactor: Modified date and time from datetime more library based than using string manipulation * test: added tests for datetime after modifying datetime but tests dont run on local * test: added type annotation * build: added dicom_Csv and corrected imports tests now run * test: added tests for hash and datetime * test: added tests for utils * build: rename package name and pyproject toml * docs: modified name in license * 11 modify the module name from dcm anon to dcm anon (#17) * fix(modulename): update to dcm_anon * added a dummy test to ci pipeline * test: Added stubs for missing tests * refactor: Modified date and time from datetime more library based than using string manipulation * test: added tests for datetime after modifying datetime but tests dont run on local * test: added type annotation * build: added dicom_Csv and corrected imports tests now run * test: added tests for hash and datetime * refactor: Made relative imports * test: added tests for hash and datetime * build: rename package name and pyproject toml * docs: modified name in license * 11 modify the module name from dcm anon to dcm anon (#17) * fix(modulename): update to dcm_anon * added a dummy test to ci pipeline * test: Added stubs for missing tests * refactor: Modified date and time from datetime more library based than using string manipulation * test: added tests for datetime after modifying datetime but tests dont run on local * test: added type annotation * build: added dicom_Csv and corrected imports tests now run * test: added tests for hash and datetime * refactor: Made relative imports * refactor: made change to datetime * test: added tests for datetime * test: added tests for utils * build: rename package name and pyproject toml * docs: modified name in license * 11 modify the module name from dcm anon to dcm anon (#17) * fix(modulename): update to dcm_anon * added a dummy test to ci pipeline * test: Added stubs for missing tests * refactor: Modified date and time from datetime more library based than using string manipulation * test: added tests for datetime after modifying datetime but tests dont run on local * test: added type annotation * build: added dicom_Csv and corrected imports tests now run * test: added tests for hash and datetime * test: added tests for hash and datetime * build: rename package name and pyproject toml * docs: modified name in license * 11 modify the module name from dcm anon to dcm anon (#17) * fix(modulename): update to dcm_anon * added a dummy test to ci pipeline * test: Added stubs for missing tests * refactor: Modified date and time from datetime more library based than using string manipulation * test: added tests for datetime after modifying datetime but tests dont run on local * test: added type annotation * build: added dicom_Csv and corrected imports tests now run * test: added tests for hash and datetime * refactor: Made relative imports * changed datetime (#21) * build: rename package name and pyproject toml * docs: modified name in license * test: Added stubs for missing tests * refactor: Modified date and time from datetime more library based than using string manipulation * test: added tests for datetime after modifying datetime but tests dont run on local * test: added type annotation * build: added dicom_Csv and corrected imports tests now run * test: added tests for hash and datetime * refactor: Made relative imports * refactor: made change to datetime * test: added test stubs for dcm.py * test: Added test for reading dicom --------- Co-authored-by: Abhijeet Parida <abhijeet.parida@tum.de>
a-parida12 · Jan 31, 2024 · a6e0e9d · a6e0e9d
1 parent 88123ec
commit a6e0e9d
Show file tree

Hide file tree

Showing 18 changed files with 297 additions and 25 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/workflows/build-doc.yml b/.github/workflows/build-doc.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Build Doc ✅
         run: |
-          poetry run pdoc --html -o build dcm-anon
+          poetry run pdoc --html -o build dcm_anon
       
       - name: Deploy 🚀
         uses: JamesIves/github-pages-deploy-action@v4

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ on:
 
 env:
   PYTHON_VERSION: "3.8.15"
-  PROJECT_FOLDER: dcm-anon
+  PROJECT_FOLDER: dcm_anon
   TEST_FOLDER: tests
 
 jobs:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ on: [push]
 
 env:
   PYTHON_VERSION: "3.8.15"
-  PROJECT_FOLDER: dcm-anon
+  PROJECT_FOLDER: dcm_anon
   TEST_FOLDER: tests
   COVERAGE_LIMIT: 0
 

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ pip install dcm_anon
 To the check the setup, simply check the version number of the `dcm-anon` package by
 
 ```bash
-python -c 'import dcm-anon; print(dcm_anon.__version__)'
+python -c 'import dcm_anon; print(dcm_anon.__version__)'
 ```
 
 ## Usage

diff --git a/dcm_anon/anonimizer.py b/dcm_anon/anonimizer.py
@@ -3,7 +3,7 @@
 import tqdm
 import os
 import pydicom
-from utils.dcm import check_valid_dcm
+from .utils.dcm import check_valid_dcm
 import glob
 
 

diff --git a/dcm_anon/base.py b/dcm_anon/base.py
@@ -1,8 +1,8 @@
 from abc import ABC, abstractmethod
-from utils.datetime import get_date, get_datetime, get_time
-from utils.dcm import bare_bones_ui
-from utils.hash import get_digits, get_non_digits, encrypt_string
-from utils.tags import anon_tags
+from .utils.datetime import get_date, get_datetime, get_time
+from .utils.dcm import bare_bones_ui
+from .utils.hash import get_digits, get_non_digits, encrypt_string
+from .utils.tags import anon_tags
 from pydicom.dataelem import DataElement
 
 

diff --git a/dcm_anon/utils/datetime.py b/dcm_anon/utils/datetime.py
@@ -1,5 +1,3 @@
-import re
-import string
 import datetime
 
 
@@ -9,8 +7,8 @@ def get_datetime() -> str:
     Returns:
         str: datetime
     """
-    x = str(datetime.datetime.now()).replace(" ", "")
-    return re.sub("[%s]" % re.escape(string.punctuation), "", x)[:14]
+    dt = str(datetime.datetime.now().strftime("%Y%m%d%H%M%S"))
+    return dt
 
 
 def get_date() -> str:
@@ -19,7 +17,8 @@ def get_date() -> str:
     Returns:
         str: date
     """
-    return get_datetime()[:8]
+    date = str(datetime.datetime.now().strftime("%Y%m%d"))
+    return date
 
 
 def get_time() -> str:
@@ -28,4 +27,5 @@ def get_time() -> str:
     Returns:
         str: time
     """
-    return get_datetime()[8:]
+    time = str(datetime.datetime.now().strftime("%H%M%S"))
+    return time
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,6 +11,7 @@ keywords = ["dicom anonimization", "anonimized-data", "dicom", "dcm", "GDPR", "H
 [tool.poetry.dependencies]
 python = "^3.8"
 pydicom = "^2.3.0"
+dicom-csv = "^0.2.8"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.3.1"

diff --git a/tests/.DS_Store b/tests/.DS_Store
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,8 +1,9 @@
 # add root-dir to sys path for tests
 import sys
-import pytest
 from os.path import abspath
 from os.path import dirname as d
 
 parent_dir = f"{d(d(abspath(__file__)))}"
 sys.path.append(parent_dir)
+
+print(parent_dir)
diff --git a/tests/data/.DS_Store b/tests/data/.DS_Store
diff --git a/tests/data/test1 b/tests/data/test1
diff --git a/tests/data/test2 b/tests/data/test2
diff --git a/tests/data/test_dcm.txt b/tests/data/test_dcm.txt
diff --git a/tests/pytest.ini b/tests/pytest.ini
@@ -6,4 +6,5 @@ junit_family=xunit2
 ; log_cli_format = %(asctime)s [%(name)s:%(levelname)s] %(message)s (%(filename)s:%(lineno)s)
 ; log_cli_date_format=%Y-%m-%d %H:%M:%S
 markers =
-    base: only for dev testing not ci (deselect with '-m "not base"')
+    base: only for dev testing not ci (deselect with '-m "not base"')
+    utils: utils module (deselect with '-m not utils')
diff --git a/tests/test_00_utils.py b/tests/test_00_utils.py
@@ -1,9 +1,79 @@
-# import pytest
+import pytest
+from dcm_anon.utils.datetime import get_datetime, get_date, get_time
+from dcm_anon.utils.hash import encrypt_string, get_digits, get_non_digits
+from dcm_anon.utils.dcm import check_valid_dcm  # , bare_bones_ui, get_dicom_csv
 
-# from hapy_pypi import bool_val
 
-# @pytest.mark.base
-# def test_00_1_base_test():
-#     assert type(bool_val) == bool
-#     assert bool_val == True
+@pytest.fixture
+def tests_data():
+    yield "./tests/data/"
 
+
+@pytest.mark.utils
+def test_get_datetime() -> None:
+    dt_string = get_datetime()
+    assert type(dt_string) == str
+    assert len(dt_string) == 14
+
+
+@pytest.mark.utils
+def test_get_date() -> None:
+    date = get_date()
+    assert type(date) == str
+    assert len(date) == 8
+
+
+@pytest.mark.utils
+def test_get_time() -> None:
+    time = get_time()
+    assert type(time) == str
+    assert len(time) == 6
+
+
+@pytest.mark.utils
+def test_encrypt_string() -> None:
+    test_string = "test_string"
+    hash = encrypt_string(test_string)
+    hex_value = "4b641e9a923d1ea57e18fe41dcb543e2c4005c41ff210864a710b0fbb2654c11"
+    assert hash == hex_value
+
+
+@pytest.mark.utils
+def test_get_digits() -> None:
+    test_string = "1a2b3c"
+    op = get_digits(test_string)
+    assert op == "123"
+    assert type(op) == str
+
+
+@pytest.mark.utils
+def test_get_non_digits() -> None:
+    test_string = "1a2b3c"
+    op = get_non_digits(test_string)
+    assert op == "abc"
+    assert type(op) == str
+
+
+@pytest.mark.utils
+def test_check_valid_dcm(tests_data):
+    dicom_file = tests_data + "test1"
+    assert check_valid_dcm(dicom_file) is True
+
+    dicom_file = tests_data + "test2"
+    assert check_valid_dcm(dicom_file) is True
+
+
+@pytest.mark.utils
+def test_check_invalid_dcm(tests_data):
+    file = tests_data + "test_dcm.txt"
+    assert check_valid_dcm(file) is False
+
+
+@pytest.mark.utils
+def test_bare_bones_ui():
+    pass
+
+
+@pytest.mark.utils
+def test_get_dicom_csv():
+    pass