From fdacf883679a8cf893ba4b4ae57093d68e54046f Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Fri, 18 May 2018 12:44:22 -0400 Subject: [PATCH] restructued, some tests --- {anonymize-it => anonymize_it}/__init__.py | 0 {anonymize-it => anonymize_it}/anonymize.py | 0 {anonymize-it => anonymize_it}/anonymizers.py | 0 {anonymize-it => anonymize_it}/config.json | 0 .../output/output.json | 0 {anonymize-it => anonymize_it}/readers.py | 2 +- {anonymize-it => anonymize_it}/utils.py | 1 + {anonymize-it => anonymize_it}/writers.py | 2 +- .../tests.py => test_anonymize_it/__init__.py | 0 test_anonymize_it/conftest.py | 0 test_anonymize_it/run_tests.py | 14 +++++++++ .../test_integration/__init__.py | 0 test_anonymize_it/test_output/.DS_Store | Bin 0 -> 6148 bytes test_anonymize_it/test_readers.py | 4 +++ test_anonymize_it/test_utils.py | 17 +++++++++++ test_anonymize_it/test_writers.py | 27 ++++++++++++++++++ 16 files changed, 65 insertions(+), 2 deletions(-) rename {anonymize-it => anonymize_it}/__init__.py (100%) rename {anonymize-it => anonymize_it}/anonymize.py (100%) rename {anonymize-it => anonymize_it}/anonymizers.py (100%) rename {anonymize-it => anonymize_it}/config.json (100%) rename {anonymize-it => anonymize_it}/output/output.json (100%) rename {anonymize-it => anonymize_it}/readers.py (98%) rename {anonymize-it => anonymize_it}/utils.py (99%) rename {anonymize-it => anonymize_it}/writers.py (94%) rename anonymize-it/tests.py => test_anonymize_it/__init__.py (100%) create mode 100644 test_anonymize_it/conftest.py create mode 100644 test_anonymize_it/run_tests.py create mode 100644 test_anonymize_it/test_integration/__init__.py create mode 100644 test_anonymize_it/test_output/.DS_Store create mode 100644 test_anonymize_it/test_readers.py create mode 100644 test_anonymize_it/test_utils.py create mode 100644 test_anonymize_it/test_writers.py diff --git a/anonymize-it/__init__.py b/anonymize_it/__init__.py similarity index 100% rename from anonymize-it/__init__.py rename to anonymize_it/__init__.py diff --git a/anonymize-it/anonymize.py b/anonymize_it/anonymize.py similarity index 100% rename from anonymize-it/anonymize.py rename to anonymize_it/anonymize.py diff --git a/anonymize-it/anonymizers.py b/anonymize_it/anonymizers.py similarity index 100% rename from anonymize-it/anonymizers.py rename to anonymize_it/anonymizers.py diff --git a/anonymize-it/config.json b/anonymize_it/config.json similarity index 100% rename from anonymize-it/config.json rename to anonymize_it/config.json diff --git a/anonymize-it/output/output.json b/anonymize_it/output/output.json similarity index 100% rename from anonymize-it/output/output.json rename to anonymize_it/output/output.json diff --git a/anonymize-it/readers.py b/anonymize_it/readers.py similarity index 98% rename from anonymize-it/readers.py rename to anonymize_it/readers.py index 91f689c..3c97a93 100644 --- a/anonymize-it/readers.py +++ b/anonymize_it/readers.py @@ -1,5 +1,5 @@ from abc import ABCMeta, abstractmethod -from elasticsearch import Elasticsearch, helpers +from elasticsearch import Elasticsearch from elasticsearch_dsl import Search, A diff --git a/anonymize-it/utils.py b/anonymize_it/utils.py similarity index 99% rename from anonymize-it/utils.py rename to anonymize_it/utils.py index 4e7956a..37544f0 100644 --- a/anonymize-it/utils.py +++ b/anonymize_it/utils.py @@ -1,5 +1,6 @@ import collections + def flatten(d, parent_key='', sep='.'): items = [] for k, v in d.items(): diff --git a/anonymize-it/writers.py b/anonymize_it/writers.py similarity index 94% rename from anonymize-it/writers.py rename to anonymize_it/writers.py index f7395e8..0029040 100644 --- a/anonymize-it/writers.py +++ b/anonymize_it/writers.py @@ -1,7 +1,7 @@ from abc import abstractmethod, ABCMeta import json -class BaseWriter(): +class BaseWriter(metaclass=ABCMeta): def __init__(self, params): self.params = params diff --git a/anonymize-it/tests.py b/test_anonymize_it/__init__.py similarity index 100% rename from anonymize-it/tests.py rename to test_anonymize_it/__init__.py diff --git a/test_anonymize_it/conftest.py b/test_anonymize_it/conftest.py new file mode 100644 index 0000000..e69de29 diff --git a/test_anonymize_it/run_tests.py b/test_anonymize_it/run_tests.py new file mode 100644 index 0000000..ae76d33 --- /dev/null +++ b/test_anonymize_it/run_tests.py @@ -0,0 +1,14 @@ +import sys +import pytest + + +def run_all(argv=None): + if argv is None: + argv = ['--cov', 'anonymize_it', '--verbose', '--junitxml', 'junit.xml', '--cov-report', 'xml'] + else: + argv = argv[1:] + + sys.exit(pytest.main(argv)) + +if __name__ == "__main__": + run_all(sys.argv) \ No newline at end of file diff --git a/test_anonymize_it/test_integration/__init__.py b/test_anonymize_it/test_integration/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/test_anonymize_it/test_output/.DS_Store b/test_anonymize_it/test_output/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..626a24356fc617d5d4b56886a7b7ba923691a51d GIT binary patch literal 6148 zcmeHK!A`?441IweChf8#$NT_H{6ST1w+SI3&SStNK+sKVdVo_uoo72klogIJAzO-{ zDTjp|+f z)h6A}n>uY7QR13=T475)!3!R7hX*X_d1n8T{xx^KqBm*85*0laUN!cOBd5$sj7_v_ z>IJjE#w_+?KG!w*vC@lN={I{hMC!dJXTTY72AqLEVt{wH$Z%xn+8J;LoPiGp&8OeF6{%bgR&ow}j-xj77%QkRy~}sYFW+`H2xMo&K2Pij1wHr6cIdoF}im zd%Of)o&Kod2!)|*XTTZgGH`6&vE2VNelop}{BDZ(oB?OxpD_>y)2nI8P360FZ+mjr vMz$L^5s7QXpwRC81h6CL$cYZxcods)MaI@pW)Z)p6a7a(3325N`~m~-gZ?|& literal 0 HcmV?d00001 diff --git a/test_anonymize_it/test_readers.py b/test_anonymize_it/test_readers.py new file mode 100644 index 0000000..96d12b1 --- /dev/null +++ b/test_anonymize_it/test_readers.py @@ -0,0 +1,4 @@ +from anonymize_it import readers + +def test_esreader(): + pass \ No newline at end of file diff --git a/test_anonymize_it/test_utils.py b/test_anonymize_it/test_utils.py new file mode 100644 index 0000000..c434357 --- /dev/null +++ b/test_anonymize_it/test_utils.py @@ -0,0 +1,17 @@ +from anonymize_it import utils + + +def test_flatten(): + old = { + "this": { + "is": { + "a": { + "test": True + } + } + } + } + + flattened = utils.flatten(old) + new = {"this.is.a.test": True} + assert new == flattened \ No newline at end of file diff --git a/test_anonymize_it/test_writers.py b/test_anonymize_it/test_writers.py new file mode 100644 index 0000000..cf36f75 --- /dev/null +++ b/test_anonymize_it/test_writers.py @@ -0,0 +1,27 @@ +from anonymize_it import writers +import json +import os + + +def test_fswriter(): + params = { + "directory": "test_output" + } + + data = { + "test": "this is a test".split() + } + + fswriter = writers.FSWriter(params) + fswriter.write_data(data) + file_name = "test_output/output.json" + with open(file_name, 'r') as f: + in_data = json.load(f) + + os.remove(file_name) + + assert data == in_data + + +def test_ESWriter(): + pass \ No newline at end of file