diff --git a/docs/CARS.md b/docs/CARS.md
index ec7ef7f379..1be72005fd 100644
--- a/docs/CARS.md
+++ b/docs/CARS.md
@@ -84,13 +84,13 @@ How We Rate The Cars
|Hyundai|Elantra Hybrid 2021|SCC + LKAS|
|
||||
|Hyundai|Ioniq Electric 2020|SCC + LKAS||||||
|Hyundai|Ioniq Hybrid 2020-22|SCC + LFA||||||
-|Hyundai|Ioniq Plug-In Hybrid 2020-21|SCC + LKAS||||||
+|Hyundai|Ioniq Plug-in Hybrid 2020-21|SCC + LKAS||||||
|Hyundai|Kona 2020|SCC + LKAS||||||
|Hyundai|Kona Electric 2018-19|SCC + LKAS||||||
|Hyundai|Kona Hybrid 2020|SCC + LKAS||||||
|Hyundai|Santa Fe 2021-22|All||||||
|Hyundai|Santa Fe Hybrid 2022|All||||||
-|Hyundai|Santa Fe Plug-In Hybrid 2022|All||||||
+|Hyundai|Santa Fe Plug-in Hybrid 2022|All||||||
|Hyundai|Sonata 2018-19|SCC + LKAS||||||
|Kia|Ceed 2019|SCC + LKAS||||||
|Kia|Forte 2018-21|SCC + LKAS||||||
@@ -186,7 +186,7 @@ How We Rate The Cars
|Hyundai|Veloster 2019-20|SCC + LKAS||||||
|Jeep|Grand Cherokee 2016-18|Adaptive Cruise||||||
|Jeep|Grand Cherokee 2019-20|Adaptive Cruise||||||
-|Kia|Niro Plug-In Hybrid 2019|SCC + LKAS||||||
+|Kia|Niro Plug-in Hybrid 2019|SCC + LKAS||||||
|Kia|Optima 2017|SCC + LKAS||||||
|Lexus|IS 2017-19|All||||||
|Lexus|RC 2020|All||||||
diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py
index cb89adb724..9e5f5d8cbd 100644
--- a/selfdrive/car/hyundai/values.py
+++ b/selfdrive/car/hyundai/values.py
@@ -88,14 +88,14 @@ CAR_INFO: Dict[str, Union[HyundaiCarInfo, List[HyundaiCarInfo]]] = {
CAR.IONIQ_HEV_2022: HyundaiCarInfo("Hyundai Ioniq Hybrid 2020-22", "SCC + LFA"),
CAR.IONIQ_EV_LTD: HyundaiCarInfo("Hyundai Ioniq Electric 2019"),
CAR.IONIQ_EV_2020: HyundaiCarInfo("Hyundai Ioniq Electric 2020"),
- CAR.IONIQ_PHEV: HyundaiCarInfo("Hyundai Ioniq Plug-In Hybrid 2020-21"),
+ CAR.IONIQ_PHEV: HyundaiCarInfo("Hyundai Ioniq Plug-in Hybrid 2020-21"),
CAR.KONA: HyundaiCarInfo("Hyundai Kona 2020"),
CAR.KONA_EV: HyundaiCarInfo("Hyundai Kona Electric 2018-19"),
CAR.KONA_HEV: HyundaiCarInfo("Hyundai Kona Hybrid 2020", video_link="https://youtu.be/_EdYQtV52-c"),
CAR.SANTA_FE: HyundaiCarInfo("Hyundai Santa Fe 2019-20", "All"),
CAR.SANTA_FE_2022: HyundaiCarInfo("Hyundai Santa Fe 2021-22", "All"),
CAR.SANTA_FE_HEV_2022: HyundaiCarInfo("Hyundai Santa Fe Hybrid 2022", "All"),
- CAR.SANTA_FE_PHEV_2022: HyundaiCarInfo("Hyundai Santa Fe Plug-In Hybrid 2022", "All"),
+ CAR.SANTA_FE_PHEV_2022: HyundaiCarInfo("Hyundai Santa Fe Plug-in Hybrid 2022", "All"),
CAR.SONATA: HyundaiCarInfo("Hyundai Sonata 2020-22", "All", video_link="https://www.youtube.com/watch?v=ix63r9kE3Fw"),
CAR.SONATA_LF: HyundaiCarInfo("Hyundai Sonata 2018-19"),
CAR.PALISADE: [
@@ -109,7 +109,7 @@ CAR_INFO: Dict[str, Union[HyundaiCarInfo, List[HyundaiCarInfo]]] = {
CAR.KIA_FORTE: HyundaiCarInfo("Kia Forte 2018-21"),
CAR.KIA_K5_2021: HyundaiCarInfo("Kia K5 2021-22", "SCC + LFA"),
CAR.KIA_NIRO_EV: HyundaiCarInfo("Kia Niro Electric 2019-22", "All", video_link="https://www.youtube.com/watch?v=lT7zcG6ZpGo"),
- CAR.KIA_NIRO_HEV: HyundaiCarInfo("Kia Niro Plug-In Hybrid 2019", min_enable_speed=10. * CV.MPH_TO_MS),
+ CAR.KIA_NIRO_HEV: HyundaiCarInfo("Kia Niro Plug-in Hybrid 2019", min_enable_speed=10. * CV.MPH_TO_MS),
CAR.KIA_NIRO_HEV_2021: HyundaiCarInfo("Kia Niro Hybrid 2021-22"),
CAR.KIA_OPTIMA: [
HyundaiCarInfo("Kia Optima 2017", min_steer_speed=32. * CV.MPH_TO_MS),
diff --git a/selfdrive/car/tests/test_docs.py b/selfdrive/car/tests/test_docs.py
index 05c65fa3d8..9c43dfd141 100755
--- a/selfdrive/car/tests/test_docs.py
+++ b/selfdrive/car/tests/test_docs.py
@@ -5,14 +5,29 @@ from selfdrive.car.docs import CARS_MD_OUT, CARS_MD_TEMPLATE, generate_cars_md,
class TestCarDocs(unittest.TestCase):
- def test_car_docs(self):
- generated_cars_md = generate_cars_md(get_tier_car_info(), CARS_MD_TEMPLATE)
+ def setUp(self):
+ self.tier_cars = get_tier_car_info()
+
+ def test_generator(self):
+ generated_cars_md = generate_cars_md(self.tier_cars, CARS_MD_TEMPLATE)
with open(CARS_MD_OUT, "r") as f:
current_cars_md = f.read()
self.assertEqual(generated_cars_md, current_cars_md,
"Run selfdrive/car/docs.py to generate new supported cars documentation")
+ def test_naming_conventions(self):
+ # Asserts market-standard car naming conventions by make
+ for cars in self.tier_cars.values():
+ for car in cars:
+ if car.make in ["Hyundai", "Kia"]:
+ tokens = car.model.lower().split(" ")
+ self.assertNotIn("phev", tokens, "Use `Plug-in Hybrid`")
+ self.assertNotIn("hev", tokens, "Use `Hybrid`")
+ self.assertNotIn("ev", tokens, "Use `Electric`")
+ if "plug-in hybrid" in car.model.lower():
+ self.assertIn("Plug-in Hybrid", car.model, "Use correct capitalization")
+
if __name__ == "__main__":
unittest.main()