diff --git a/test_extract_otp_secret_keys_pytest.py b/test_extract_otp_secret_keys_pytest.py index 0fd86a8..87e8cf9 100644 --- a/test_extract_otp_secret_keys_pytest.py +++ b/test_extract_otp_secret_keys_pytest.py @@ -18,9 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import csv -import json -import os +from utils import read_csv, read_json, remove_file import extract_otp_secret_keys @@ -61,23 +59,3 @@ def test_extract_json(): def cleanup(): remove_file('test_example_output.csv') remove_file('test_example_output.json') - - -def remove_file(filename): - if os.path.exists(filename): os.remove(filename) - - -def read_csv(filename): - """Returns a list of lines.""" - with open(filename, "r") as infile: - lines = [] - reader = csv.reader(infile) - for line in reader: - lines.append(line) - return lines - - -def read_json(filename): - """Returns a list or a dictionary.""" - with open(filename, "r") as infile: - return json.load(infile) diff --git a/test_extract_otp_secret_keys_unittest.py b/test_extract_otp_secret_keys_unittest.py index e07a1fd..5e03120 100644 --- a/test_extract_otp_secret_keys_unittest.py +++ b/test_extract_otp_secret_keys_unittest.py @@ -19,9 +19,7 @@ # along with this program. If not, see . import unittest -import csv -import json -import os +from utils import read_csv, read_json, remove_file import extract_otp_secret_keys @@ -55,25 +53,5 @@ class TestExtract(unittest.TestCase): remove_file('test_example_output.json') -def remove_file(filename): - if os.path.exists(filename): os.remove(filename) - - -def read_csv(filename): - """Returns a list of lines.""" - with open(filename, "r") as infile: - lines = [] - reader = csv.reader(infile) - for line in reader: - lines.append(line) - return lines - - -def read_json(filename): - """Returns a list or a dictionary.""" - with open(filename, "r") as infile: - return json.load(infile) - - if __name__ == '__main__': unittest.main() diff --git a/utils.py b/utils.py new file mode 100644 index 0000000..19f4437 --- /dev/null +++ b/utils.py @@ -0,0 +1,37 @@ +# Author: Scito (https://scito.ch) + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import csv +import json +import os + +def remove_file(filename): + if os.path.exists(filename): os.remove(filename) + + +def read_csv(filename): + """Returns a list of lines.""" + with open(filename, "r") as infile: + lines = [] + reader = csv.reader(infile) + for line in reader: + lines.append(line) + return lines + + +def read_json(filename): + """Returns a list or a dictionary.""" + with open(filename, "r") as infile: + return json.load(infile)