From 09518b1a7170c0f40ebae69ae5119afae4da216c Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Wed, 30 Apr 2025 10:05:29 +0200 Subject: [PATCH] Remove redundant Renault test fixtures (#143929) Remove redundant Renault fixtures --- tests/components/renault/conftest.py | 24 +- .../fixtures/vehicle_missing_details.json | 25 -- .../renault/fixtures/vehicle_multi.json | 291 ------------------ 3 files changed, 18 insertions(+), 322 deletions(-) delete mode 100644 tests/components/renault/fixtures/vehicle_missing_details.json delete mode 100644 tests/components/renault/fixtures/vehicle_multi.json diff --git a/tests/components/renault/conftest.py b/tests/components/renault/conftest.py index dd3c4896264..ad968358c78 100644 --- a/tests/components/renault/conftest.py +++ b/tests/components/renault/conftest.py @@ -6,7 +6,7 @@ from types import MappingProxyType from unittest.mock import AsyncMock, patch import pytest -from renault_api.kamereon import exceptions, schemas +from renault_api.kamereon import exceptions, models, schemas from renault_api.renault_account import RenaultAccount from homeassistant.components.renault.const import DOMAIN @@ -69,13 +69,25 @@ async def patch_renault_account(hass: HomeAssistant) -> AsyncGenerator[RenaultAc @pytest.fixture(name="patch_get_vehicles") def patch_get_vehicles(vehicle_type: str) -> Generator[None]: """Mock fixtures.""" + fixture_code = vehicle_type if vehicle_type in MOCK_VEHICLES else "zoe_40" + return_value: models.KamereonVehiclesResponse = ( + schemas.KamereonVehiclesResponseSchema.loads( + load_fixture(f"renault/vehicle_{fixture_code}.json") + ) + ) + + if vehicle_type == "missing_details": + return_value.vehicleLinks[0].vehicleDetails = None + elif vehicle_type == "multi": + return_value.vehicleLinks.extend( + schemas.KamereonVehiclesResponseSchema.loads( + load_fixture("renault/vehicle_captur_fuel.json") + ).vehicleLinks + ) + with patch( "renault_api.renault_account.RenaultAccount.get_vehicles", - return_value=( - schemas.KamereonVehiclesResponseSchema.loads( - load_fixture(f"renault/vehicle_{vehicle_type}.json") - ) - ), + return_value=return_value, ): yield diff --git a/tests/components/renault/fixtures/vehicle_missing_details.json b/tests/components/renault/fixtures/vehicle_missing_details.json deleted file mode 100644 index f6467e0c8f8..00000000000 --- a/tests/components/renault/fixtures/vehicle_missing_details.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "accountId": "account-id-1", - "country": "FR", - "vehicleLinks": [ - { - "brand": "RENAULT", - "vin": "VF1AAAAA555777999", - "status": "ACTIVE", - "linkType": "OWNER", - "garageBrand": "RENAULT", - "annualMileage": 16000, - "mileage": 26464, - "startDate": "2017-08-07", - "createdDate": "2019-05-23T21:38:16.409008Z", - "lastModifiedDate": "2020-11-17T08:41:40.497400Z", - "ownershipStartDate": "2017-08-01", - "cancellationReason": {}, - "connectedDriver": { - "role": "MAIN_DRIVER", - "createdDate": "2019-06-17T09:49:06.880627Z", - "lastModifiedDate": "2019-06-17T09:49:06.880627Z" - } - } - ] -} diff --git a/tests/components/renault/fixtures/vehicle_multi.json b/tests/components/renault/fixtures/vehicle_multi.json deleted file mode 100644 index 18374a8cbd1..00000000000 --- a/tests/components/renault/fixtures/vehicle_multi.json +++ /dev/null @@ -1,291 +0,0 @@ -{ - "accountId": "account-id-2", - "country": "IT", - "vehicleLinks": [ - { - "brand": "RENAULT", - "vin": "VF1AAAAA555777999", - "status": "ACTIVE", - "linkType": "OWNER", - "garageBrand": "RENAULT", - "annualMileage": 16000, - "mileage": 26464, - "startDate": "2017-08-07", - "createdDate": "2019-05-23T21:38:16.409008Z", - "lastModifiedDate": "2020-11-17T08:41:40.497400Z", - "ownershipStartDate": "2017-08-01", - "cancellationReason": {}, - "connectedDriver": { - "role": "MAIN_DRIVER", - "createdDate": "2019-06-17T09:49:06.880627Z", - "lastModifiedDate": "2019-06-17T09:49:06.880627Z" - }, - "vehicleDetails": { - "vin": "VF1AAAAA555777999", - "registrationDate": "2017-08-01", - "firstRegistrationDate": "2017-08-01", - "engineType": "5AQ", - "engineRatio": "601", - "modelSCR": "ZOE", - "deliveryCountry": { - "code": "FR", - "label": "FRANCE" - }, - "family": { - "code": "X10", - "label": "FAMILLE X10", - "group": "007" - }, - "tcu": { - "code": "TCU0G2", - "label": "TCU VER 0 GEN 2", - "group": "E70" - }, - "navigationAssistanceLevel": { - "code": "NAV3G5", - "label": "LEVEL 3 TYPE 5 NAVIGATION", - "group": "408" - }, - "battery": { - "code": "BT4AR1", - "label": "BATTERIE BT4AR1", - "group": "968" - }, - "radioType": { - "code": "RAD37A", - "label": "RADIO 37A", - "group": "425" - }, - "registrationCountry": { - "code": "FR" - }, - "brand": { - "label": "RENAULT" - }, - "model": { - "code": "X101VE", - "label": "ZOE", - "group": "971" - }, - "gearbox": { - "code": "BVEL", - "label": "BOITE A VARIATEUR ELECTRIQUE", - "group": "427" - }, - "version": { - "code": "INT MB 10R" - }, - "energy": { - "code": "ELEC", - "label": "ELECTRIQUE", - "group": "019" - }, - "registrationNumber": "REG-NUMBER", - "vcd": "SYTINC/SKTPOU/SAND41/FDIU1/SSESM/MAPSUP/SSCALL/SAND88/SAND90/SQKDRO/SDIFPA/FACBA2/PRLEX1/SSRCAR/CABDO2/TCU0G2/SWALBO/EVTEC1/STANDA/X10/B10/EA2/MB/ELEC/DG/TEMP/TR4X2/RV/ABS/CAREG/LAC/VT003/CPE/RET03/SPROJA/RALU16/CEAVRH/AIRBA1/SERIE/DRA/DRAP08/HARM02/ATAR/TERQG/SFBANA/KM/DPRPN/AVREPL/SSDECA/ASRESP/RDAR02/ALEVA/CACBL2/SOP02C/CTHAB2/TRNOR/LVAVIP/LVAREL/SASURV/KTGREP/SGSCHA/APL03/ALOUCC/CMAR3P/NAV3G5/RAD37A/BVEL/AUTAUG/RNORM/ISOFIX/EQPEUR/HRGM01/SDPCLV/TLFRAN/SPRODI/SAN613/SSAPEX/GENEV1/ELC1/SANCML/PE2012/PHAS1/SAN913/045KWH/BT4AR1/VEC153/X101VE/NBT017/5AQ", - "assets": [ - { - "assetType": "PICTURE", - "renditions": [ - { - "resolutionType": "ONE_MYRENAULT_LARGE", - "url": "https://3dv2.renault.com/ImageFromBookmark?configuration=SKTPOU%2FPRLEX1%2FSTANDA%2FB10%2FEA2%2FDG%2FVT003%2FRET03%2FRALU16%2FDRAP08%2FHARM02%2FTERQG%2FRDAR02%2FALEVA%2FSOP02C%2FTRNOR%2FLVAVIP%2FLVAREL%2FNAV3G5%2FRAD37A%2FSDPCLV%2FTLFRAN%2FGENEV1%2FSAN913%2FBT4AR1%2FNBT017&databaseId=1d514feb-93a6-4b45-8785-e11d2a6f1864&bookmarkSet=RSITE&bookmark=EXT_34_DESSUS&profile=HELIOS_OWNERSERVICES_LARGE" - }, - { - "resolutionType": "ONE_MYRENAULT_SMALL", - "url": "https://3dv2.renault.com/ImageFromBookmark?configuration=SKTPOU%2FPRLEX1%2FSTANDA%2FB10%2FEA2%2FDG%2FVT003%2FRET03%2FRALU16%2FDRAP08%2FHARM02%2FTERQG%2FRDAR02%2FALEVA%2FSOP02C%2FTRNOR%2FLVAVIP%2FLVAREL%2FNAV3G5%2FRAD37A%2FSDPCLV%2FTLFRAN%2FGENEV1%2FSAN913%2FBT4AR1%2FNBT017&databaseId=1d514feb-93a6-4b45-8785-e11d2a6f1864&bookmarkSet=RSITE&bookmark=EXT_34_DESSUS&profile=HELIOS_OWNERSERVICES_SMALL_V2" - } - ] - }, - { - "assetType": "PDF", - "assetRole": "GUIDE", - "title": "PDF Guide", - "description": "", - "renditions": [ - { - "url": "https://cdn.group.renault.com/ren/gb/myr/assets/x101ve/manual.pdf.asset.pdf/1558704861676.pdf" - } - ] - }, - { - "assetType": "URL", - "assetRole": "GUIDE", - "title": "e-guide", - "description": "", - "renditions": [ - { - "url": "http://gb.e-guide.renault.com/eng/Zoe" - } - ] - }, - { - "assetType": "VIDEO", - "assetRole": "CAR", - "title": "10 Fundamentals about getting the best out of your electric vehicle", - "description": "", - "renditions": [ - { - "url": "39r6QEKcOM4" - } - ] - }, - { - "assetType": "VIDEO", - "assetRole": "CAR", - "title": "Automatic Climate Control", - "description": "", - "renditions": [ - { - "url": "Va2FnZFo_GE" - } - ] - }, - { - "assetType": "URL", - "assetRole": "CAR", - "title": "More videos", - "description": "", - "renditions": [ - { - "url": "https://www.youtube.com/watch?v=wfpCMkK1rKI" - } - ] - }, - { - "assetType": "VIDEO", - "assetRole": "CAR", - "title": "Charging the battery", - "description": "", - "renditions": [ - { - "url": "RaEad8DjUJs" - } - ] - }, - { - "assetType": "VIDEO", - "assetRole": "CAR", - "title": "Charging the battery at a station with a flap", - "description": "", - "renditions": [ - { - "url": "zJfd7fJWtr0" - } - ] - } - ], - "yearsOfMaintenance": 12, - "connectivityTechnology": "RLINK1", - "easyConnectStore": false, - "electrical": true, - "rlinkStore": false, - "deliveryDate": "2017-08-11", - "retrievedFromDhs": false, - "engineEnergyType": "ELEC", - "radioCode": "1234" - } - }, - { - "brand": "RENAULT", - "vin": "VF1AAAAA555777123", - "status": "ACTIVE", - "linkType": "USER", - "garageBrand": "RENAULT", - "mileage": 346, - "startDate": "2020-06-12", - "createdDate": "2020-06-12T15:02:00.555432Z", - "lastModifiedDate": "2020-06-15T06:21:43.762467Z", - "cancellationReason": {}, - "connectedDriver": { - "role": "MAIN_DRIVER", - "createdDate": "2020-06-15T06:20:39.107794Z", - "lastModifiedDate": "2020-06-15T06:20:39.107794Z" - }, - "vehicleDetails": { - "vin": "VF1AAAAA555777123", - "engineType": "H5H", - "engineRatio": "470", - "modelSCR": "CP1", - "deliveryCountry": { - "code": "BE", - "label": "BELGIQUE" - }, - "family": { - "code": "XJB", - "label": "FAMILLE B+X OVER", - "group": "007" - }, - "tcu": { - "code": "AIVCT", - "label": "AVEC BOITIER CONNECT AIVC", - "group": "E70" - }, - "navigationAssistanceLevel": { - "code": "", - "label": "", - "group": "" - }, - "battery": { - "code": "SANBAT", - "label": "SANS BATTERIE", - "group": "968" - }, - "radioType": { - "code": "NA406", - "label": "A-IVIMINDL, 2BO + 2BI + 2T, MICRO-DOUBLE, FM1/DAB+FM2", - "group": "425" - }, - "registrationCountry": { - "code": "BE" - }, - "brand": { - "label": "RENAULT" - }, - "model": { - "code": "XJB1SU", - "label": "CAPTUR II", - "group": "971" - }, - "gearbox": { - "code": "BVA7", - "label": "BOITE DE VITESSE AUTOMATIQUE 7 RAPPORTS", - "group": "427" - }, - "version": { - "code": "ITAMFHA 6TH" - }, - "energy": { - "code": "ESS", - "label": "ESSENCE", - "group": "019" - }, - "registrationNumber": "REG-NUMBER", - "vcd": "ADR00/DLIGM2/PGPRT2/FEUAR3/CDVIT1/SKTPOU/SKTPGR/SSCCPC/SSPREM/FDIU2/MAPSTD/RCALL/MET04/DANGMO/ECOMOD/SSRCAR/AIVCT/AVGSI/TPRPE/TSGNE/2TON/ITPK7/MLEXP1/SPERTA/SSPERG/SPERTP/VOLCHA/SREACT/AVOSP1/SWALBO/DWGE01/AVC1A/1234Y/AEBS07/PRAHL/AVCAM/STANDA/XJB/HJB/EA3/MF/ESS/DG/TEMP/TR4X2/AFURGE/RVDIST/ABS/SBARTO/CA02/TOPAN/PBNCH/LAC/VSTLAR/CPE/RET04/2RVLG/RALU17/CEAVRH/AIRBA2/SERIE/DRA/DRAP05/HARM01/ATAR03/SGAV02/SGAR02/BIXPE/BANAL/KM/TPRM3/AVREPL/SSDECA/SFIRBA/ABLAVI/ESPHSA/FPAS2/ALEVA/SCACBA/SOP03C/SSADPC/STHPLG/SKTGRV/VLCUIR/RETIN2/TRSEV1/REPNTC/LVAVIP/LVAREI/SASURV/KTGREP/SGACHA/BEL01/APL03/FSTPO/ALOUC5/CMAR3P/FIPOU2/NA406/BVA7/ECLHB4/RDIF10/PNSTRD/ISOFIX/ENPH01/HRGM01/SANFLT/CSRGAC/SANACF/SDPCLV/TLRP00/SPRODI/SAN613/AVFAP/AIRBDE/CHC03/E06T/SAN806/SSPTLP/SANCML/SSFLEX/SDRQAR/SEXTIN/M2019/PHAS1/SPRTQT/SAN913/STHABT/SSTYAD/HYB01/SSCABA/SANBAT/VEC012/XJB1SU/SSNBT/H5H", - "assets": [ - { - "assetType": "PICTURE", - "renditions": [ - { - "resolutionType": "ONE_MYRENAULT_LARGE", - "url": "https: //3dv2.renault.com/ImageFromBookmark?configuration=ADR00%2FDLIGM2%2FPGPRT2%2FFEUAR3%2FCDVIT1%2FSSCCPC%2FRCALL%2FMET04%2FDANGMO%2FSSRCAR%2FAVGSI%2FITPK7%2FMLEXP1%2FSPERTA%2FSSPERG%2FSPERTP%2FVOLCHA%2FSREACT%2FDWGE01%2FAVCAM%2FHJB%2FEA3%2FESS%2FDG%2FTEMP%2FTR4X2%2FRVDIST%2FSBARTO%2FCA02%2FTOPAN%2FPBNCH%2FVSTLAR%2FCPE%2FRET04%2FRALU17%2FDRA%2FDRAP05%2FHARM01%2FBIXPE%2FKM%2FSSDECA%2FESPHSA%2FFPAS2%2FALEVA%2FSOP03C%2FSSADPC%2FVLCUIR%2FRETIN2%2FREPNTC%2FLVAVIP%2FLVAREI%2FSGACHA%2FALOUC5%2FNA406%2FBVA7%2FECLHB4%2FRDIF10%2FCSRGAC%2FSANACF%2FTLRP00%2FAIRBDE%2FCHC03%2FSSPTLP%2FSPRTQT%2FSAN913%2FHYB01%2FH5H&databaseId=3e814da7-766d-4039-ac69-f001a1f738c8&bookmarkSet=RSITE&bookmark=EXT_34_DESSUS&profile=HELIOS_OWNERSERVICES_LARGE" - }, - { - "resolutionType": "ONE_MYRENAULT_SMALL", - "url": "https: //3dv2.renault.com/ImageFromBookmark?configuration=ADR00%2FDLIGM2%2FPGPRT2%2FFEUAR3%2FCDVIT1%2FSSCCPC%2FRCALL%2FMET04%2FDANGMO%2FSSRCAR%2FAVGSI%2FITPK7%2FMLEXP1%2FSPERTA%2FSSPERG%2FSPERTP%2FVOLCHA%2FSREACT%2FDWGE01%2FAVCAM%2FHJB%2FEA3%2FESS%2FDG%2FTEMP%2FTR4X2%2FRVDIST%2FSBARTO%2FCA02%2FTOPAN%2FPBNCH%2FVSTLAR%2FCPE%2FRET04%2FRALU17%2FDRA%2FDRAP05%2FHARM01%2FBIXPE%2FKM%2FSSDECA%2FESPHSA%2FFPAS2%2FALEVA%2FSOP03C%2FSSADPC%2FVLCUIR%2FRETIN2%2FREPNTC%2FLVAVIP%2FLVAREI%2FSGACHA%2FALOUC5%2FNA406%2FBVA7%2FECLHB4%2FRDIF10%2FCSRGAC%2FSANACF%2FTLRP00%2FAIRBDE%2FCHC03%2FSSPTLP%2FSPRTQT%2FSAN913%2FHYB01%2FH5H&databaseId=3e814da7-766d-4039-ac69-f001a1f738c8&bookmarkSet=RSITE&bookmark=EXT_34_DESSUS&profile=HELIOS_OWNERSERVICES_SMALL_V2" - } - ] - } - ], - "yearsOfMaintenance": 12, - "connectivityTechnology": "NONE", - "easyConnectStore": false, - "electrical": false, - "rlinkStore": false, - "deliveryDate": "2020-06-17", - "retrievedFromDhs": false, - "engineEnergyType": "OTHER", - "radioCode": "1234" - } - } - ] -}