refactoring
This commit is contained in:
@@ -2,7 +2,7 @@ import glob
|
|||||||
from GoogleAnalytics.ResolutionProvider import ResolutionProvider
|
from GoogleAnalytics.ResolutionProvider import ResolutionProvider
|
||||||
|
|
||||||
|
|
||||||
class GoogleAnalyticsReader:
|
class FilesProvider:
|
||||||
|
|
||||||
def __init__(self, dataDir):
|
def __init__(self, dataDir):
|
||||||
self.dataDir = dataDir
|
self.dataDir = dataDir
|
||||||
@@ -1,25 +1,25 @@
|
|||||||
import unittest
|
import unittest
|
||||||
from GoogleAnalytics.ResolutionProvider import Resolution
|
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):
|
def test_getFilesHavingCityResolution(self):
|
||||||
# Given
|
# Given
|
||||||
googleAnalyticsReader = GoogleAnalyticsReader(dataDir = 'src/testdata/GoogleAnalytics')
|
filesProvider = FilesProvider(dataDir = 'src/testdata/GoogleAnalytics')
|
||||||
|
|
||||||
# When
|
# When
|
||||||
files = googleAnalyticsReader.getFilesHavingResolution(Resolution.CITY)
|
files = filesProvider.getFilesHavingResolution(Resolution.CITY)
|
||||||
|
|
||||||
# Then
|
# Then
|
||||||
self.assertEqual(files, ['src/testdata/GoogleAnalytics/CountryByBatchcode 20230730-20230929.csv'])
|
self.assertEqual(files, ['src/testdata/GoogleAnalytics/CountryByBatchcode 20230730-20230929.csv'])
|
||||||
|
|
||||||
def test_getFilesHavingCountryResolution(self):
|
def test_getFilesHavingCountryResolution(self):
|
||||||
# Given
|
# Given
|
||||||
googleAnalyticsReader = GoogleAnalyticsReader(dataDir = 'src/testdata/GoogleAnalytics')
|
filesProvider = FilesProvider(dataDir = 'src/testdata/GoogleAnalytics')
|
||||||
|
|
||||||
# When
|
# When
|
||||||
files = googleAnalyticsReader.getFilesHavingResolution(Resolution.COUNTRY)
|
files = filesProvider.getFilesHavingResolution(Resolution.COUNTRY)
|
||||||
|
|
||||||
# Then
|
# Then
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
Reference in New Issue
Block a user