refactoring

This commit is contained in:
frankknoll
2023-10-03 20:39:32 +02:00
parent 165b3ab190
commit 41d7141f36
2 changed files with 7 additions and 7 deletions

View File

@@ -2,7 +2,7 @@ import glob
from GoogleAnalytics.ResolutionProvider import ResolutionProvider
class GoogleAnalyticsReader:
class FilesProvider:
def __init__(self, dataDir):
self.dataDir = dataDir

View File

@@ -1,25 +1,25 @@
import unittest
from GoogleAnalytics.ResolutionProvider import Resolution
from GoogleAnalytics.GoogleAnalyticsReader import GoogleAnalyticsReader
from GoogleAnalytics.FilesProvider import FilesProvider
class GoogleAnalyticsReaderTest(unittest.TestCase):
class FilesProviderTest(unittest.TestCase):
def test_getFilesHavingCityResolution(self):
# Given
googleAnalyticsReader = GoogleAnalyticsReader(dataDir = 'src/testdata/GoogleAnalytics')
filesProvider = FilesProvider(dataDir = 'src/testdata/GoogleAnalytics')
# When
files = googleAnalyticsReader.getFilesHavingResolution(Resolution.CITY)
files = filesProvider.getFilesHavingResolution(Resolution.CITY)
# Then
self.assertEqual(files, ['src/testdata/GoogleAnalytics/CountryByBatchcode 20230730-20230929.csv'])
def test_getFilesHavingCountryResolution(self):
# Given
googleAnalyticsReader = GoogleAnalyticsReader(dataDir = 'src/testdata/GoogleAnalytics')
filesProvider = FilesProvider(dataDir = 'src/testdata/GoogleAnalytics')
# When
files = googleAnalyticsReader.getFilesHavingResolution(Resolution.COUNTRY)
files = filesProvider.getFilesHavingResolution(Resolution.COUNTRY)
# Then
self.assertEqual(