From a80caa236148b4b2f205aa76c496903c5259befe Mon Sep 17 00:00:00 2001 From: frankknoll Date: Wed, 31 May 2023 00:36:02 +0200 Subject: [PATCH] Revert "adding CountriesColumnMerger" This reverts commit 2b45597d08962c4bb2c5ee36b1b35d39e49ce2bf. --- src/CountriesColumnMerger.py | 10 ------ src/CountriesColumnMergerTest.py | 53 -------------------------------- 2 files changed, 63 deletions(-) delete mode 100644 src/CountriesColumnMerger.py delete mode 100644 src/CountriesColumnMergerTest.py diff --git a/src/CountriesColumnMerger.py b/src/CountriesColumnMerger.py deleted file mode 100644 index 748fa2a7182..00000000000 --- a/src/CountriesColumnMerger.py +++ /dev/null @@ -1,10 +0,0 @@ -from CountriesMerger import CountriesMerger - -class CountriesColumnMerger: - - @staticmethod - def mergeCountriesColumnOfSrcIntoCountriesColumnOfDst(src, dst): - COUNTRIES = 'Countries' - dst[COUNTRIES] = CountriesMerger.mergeSrcIntoDst( - dst = dst[COUNTRIES], - src = src[COUNTRIES]) diff --git a/src/CountriesColumnMergerTest.py b/src/CountriesColumnMergerTest.py deleted file mode 100644 index af242e0e5ac..00000000000 --- a/src/CountriesColumnMergerTest.py +++ /dev/null @@ -1,53 +0,0 @@ -import unittest -import pandas as pd -from pandas.testing import assert_frame_equal -from TestHelper import TestHelper -from src.CountriesColumnMerger import CountriesColumnMerger - -class CountriesColumnMergerTest(unittest.TestCase): - - def test_mergeCountriesColumnOfSrcIntoCountriesColumnOfDst(self): - # Given - dst = TestHelper.createDataFrame( - columns = ['Countries'], - data = [ [[]], - [['France', 'United Kingdom']], - [['France']]], - index = pd.Index( - [ - '016M20A', - '030L20B', - '030L20A' - ], - name = 'VAX_LOT')) - - src = TestHelper.createDataFrame( - columns = ['Countries'], - data = [ [['Germany']], - [['DummyCountry']]], - index = pd.Index( - [ - '030L20B', - 'dummyVaxLot' - ], - name = 'VAX_LOT')) - - # When - CountriesColumnMerger.mergeCountriesColumnOfSrcIntoCountriesColumnOfDst(dst = dst, src = src) - - # Then - assert_frame_equal( - dst, - TestHelper.createDataFrame( - columns = ['Countries'], - data = [ [[]], - [['France', 'Germany', 'United Kingdom']], - [['France']]], - index = pd.Index( - [ - '016M20A', - '030L20B', - '030L20A' - ], - name = 'VAX_LOT')), - check_dtype = True)