From a213e0a05934c7b9223e461bd087fcde3360fbfd Mon Sep 17 00:00:00 2001 From: frankknoll Date: Wed, 31 May 2023 19:28:43 +0200 Subject: [PATCH] Revert "Revert "adding CountriesColumnMerger"" This reverts commit a80caa236148b4b2f205aa76c496903c5259befe. --- src/CountriesColumnMerger.py | 10 ++++++ src/CountriesColumnMergerTest.py | 53 ++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 src/CountriesColumnMerger.py create mode 100644 src/CountriesColumnMergerTest.py diff --git a/src/CountriesColumnMerger.py b/src/CountriesColumnMerger.py new file mode 100644 index 00000000000..748fa2a7182 --- /dev/null +++ b/src/CountriesColumnMerger.py @@ -0,0 +1,10 @@ +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 new file mode 100644 index 00000000000..af242e0e5ac --- /dev/null +++ b/src/CountriesColumnMergerTest.py @@ -0,0 +1,53 @@ +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)