refactoring

This commit is contained in:
frankknoll
2022-02-01 10:48:48 +01:00
parent a97068a0ae
commit 978bf3d4f8

View File

@@ -226,11 +226,13 @@
"source": [
"from pandas.testing import assert_frame_equal\n",
"\n",
"class CreateAndFilterDataFrameTest(unittest.TestCase):\n",
"class DataFrameFilterTest(unittest.TestCase):\n",
"\n",
" def test_createAndFilterDataFrameFromDescrs(self):\n",
" def test_filterBy(self):\n",
" # Given\n",
" vaersDescrs = [\n",
" dataFrameFilter = DataFrameFilter(\n",
" VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n",
" [\n",
" {\n",
" 'VAERSDATA': self.createDataFrame(\n",
" columns = ['DIED', 'L_THREAT', 'DISABLE'],\n",
@@ -265,11 +267,10 @@
" \"1996874\"],\n",
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" }\n",
" ]\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
" ]))\n",
" \n",
" # When\n",
" dataFrame = DataFrameFilter(dataFrame).filterBy(manufacturer = \"MODERNA\", dose = '1')\n",
" dataFrame = dataFrameFilter.filterBy(manufacturer = \"MODERNA\", dose = '1')\n",
" \n",
" # Then\n",
" dataFrameExpected = self.createDataFrame(\n",
@@ -284,9 +285,11 @@
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" assert_frame_equal(dataFrame, dataFrameExpected, check_dtype = False)\n",
"\n",
" def test_createDataFrameFromForSevereEffects(self):\n",
" def test_filterForSevereEffects(self):\n",
" # Given\n",
" vaersDescrs = [\n",
" dataFrameFilter = DataFrameFilter(\n",
" VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n",
" [\n",
" {\n",
" 'VAERSDATA': self.createDataFrame(\n",
" columns = ['DIED', 'L_THREAT', 'DISABLE', 'HOSPITAL', 'ER_VISIT'],\n",
@@ -304,11 +307,10 @@
" \"0916601\"],\n",
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" }\n",
" ]\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
" \n",
" ]))\n",
"\n",
" # When\n",
" dataFrame = DataFrameFilter(dataFrame).filterForSevereEffects(dose = '1')\n",
" dataFrame = dataFrameFilter.filterForSevereEffects(dose = '1')\n",
" \n",
" # Then\n",
" dataFrameExpected = self.createDataFrame(\n",
@@ -323,7 +325,9 @@
"\n",
" def test_createAndFilterDataFrameFromDescrsWithFirstDose(self):\n",
" # Given\n",
" vaersDescrs = [\n",
" dataFrameFilter = DataFrameFilter(\n",
" VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n",
" [\n",
" {\n",
" 'VAERSDATA': self.createDataFrame(\n",
" columns = ['DIED', 'L_THREAT', 'DISABLE'],\n",
@@ -339,11 +343,10 @@
" \"1048786\"],\n",
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" }\n",
" ]\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
" ]))\n",
" \n",
" # When\n",
" dataFrame = DataFrameFilter(dataFrame).filterBy(manufacturer = \"MODERNA\", dose = '1')\n",
" dataFrame = dataFrameFilter.filterBy(manufacturer = \"MODERNA\", dose = '1')\n",
" \n",
" # Then\n",
" dataFrameExpected = self.createDataFrame(\n",
@@ -356,7 +359,9 @@
"\n",
" def test_createAndFilterDataFrameFromDescrsWithSecondDose(self):\n",
" # Given\n",
" vaersDescrs = [\n",
" dataFrameFilter = DataFrameFilter(\n",
" VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n",
" [\n",
" {\n",
" 'VAERSDATA': self.createDataFrame(\n",
" columns = ['DIED', 'L_THREAT', 'DISABLE'],\n",
@@ -372,11 +377,10 @@
" \"1048786\"],\n",
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" }\n",
" ]\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
" \n",
" ]))\n",
"\n",
" # When\n",
" dataFrame = DataFrameFilter(dataFrame).filterBy(manufacturer = \"MODERNA\", dose = '2')\n",
" dataFrame = dataFrameFilter.filterBy(manufacturer = \"MODERNA\", dose = '2')\n",
" \n",
" # Then\n",
" dataFrameExpected = self.createDataFrame(\n",