From 065e858a032f1315f702ccc19b7c23a8c5015025 Mon Sep 17 00:00:00 2001
From: cnico <nicolas@cazottes.net>
Date: Thu, 9 Sep 2021 09:45:58 +0200
Subject: [PATCH] Address post merge review of flipr binary sensor (#55983)

---
 homeassistant/components/flipr/__init__.py    |  2 +-
 homeassistant/components/flipr/sensor.py      |  2 +-
 tests/components/flipr/test_binary_sensor.py  | 58 +++++++++++++++++++
 .../flipr/{test_sensors.py => test_sensor.py} | 10 +---
 4 files changed, 61 insertions(+), 11 deletions(-)
 create mode 100644 tests/components/flipr/test_binary_sensor.py
 rename tests/components/flipr/{test_sensors.py => test_sensor.py} (89%)

diff --git a/homeassistant/components/flipr/__init__.py b/homeassistant/components/flipr/__init__.py
index f1320dafda1..fd7c3f5c02a 100644
--- a/homeassistant/components/flipr/__init__.py
+++ b/homeassistant/components/flipr/__init__.py
@@ -20,7 +20,7 @@ _LOGGER = logging.getLogger(__name__)
 SCAN_INTERVAL = timedelta(minutes=60)
 
 
-PLATFORMS = ["sensor", "binary_sensor"]
+PLATFORMS = ["binary_sensor", "sensor"]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
diff --git a/homeassistant/components/flipr/sensor.py b/homeassistant/components/flipr/sensor.py
index 6466c58fae2..e79ba131618 100644
--- a/homeassistant/components/flipr/sensor.py
+++ b/homeassistant/components/flipr/sensor.py
@@ -51,7 +51,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     coordinator = hass.data[DOMAIN][config_entry.entry_id]
 
     sensors = [FliprSensor(coordinator, description) for description in SENSOR_TYPES]
-    async_add_entities(sensors, True)
+    async_add_entities(sensors)
 
 
 class FliprSensor(FliprEntity, SensorEntity):
diff --git a/tests/components/flipr/test_binary_sensor.py b/tests/components/flipr/test_binary_sensor.py
new file mode 100644
index 00000000000..48f9361723c
--- /dev/null
+++ b/tests/components/flipr/test_binary_sensor.py
@@ -0,0 +1,58 @@
+"""Test the Flipr binary sensor."""
+from datetime import datetime
+from unittest.mock import patch
+
+from homeassistant.components.flipr.const import CONF_FLIPR_ID, DOMAIN
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
+from homeassistant.core import HomeAssistant
+from homeassistant.util import dt as dt_util
+
+from tests.common import MockConfigEntry
+
+# Data for the mocked object returned via flipr_api client.
+MOCK_DATE_TIME = datetime(2021, 2, 15, 9, 10, 32, tzinfo=dt_util.UTC)
+MOCK_FLIPR_MEASURE = {
+    "temperature": 10.5,
+    "ph": 7.03,
+    "chlorine": 0.23654886,
+    "red_ox": 657.58,
+    "date_time": MOCK_DATE_TIME,
+    "ph_status": "TooLow",
+    "chlorine_status": "Medium",
+}
+
+
+async def test_sensors(hass: HomeAssistant) -> None:
+    """Test the creation and values of the Flipr binary sensors."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id="test_entry_unique_id",
+        data={
+            CONF_EMAIL: "toto@toto.com",
+            CONF_PASSWORD: "myPassword",
+            CONF_FLIPR_ID: "myfliprid",
+        },
+    )
+
+    entry.add_to_hass(hass)
+
+    registry = await hass.helpers.entity_registry.async_get_registry()
+
+    with patch(
+        "flipr_api.FliprAPIRestClient.get_pool_measure_latest",
+        return_value=MOCK_FLIPR_MEASURE,
+    ):
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    # Check entity unique_id value that is generated in FliprEntity base class.
+    entity = registry.async_get("binary_sensor.flipr_myfliprid_ph_status")
+    assert entity.unique_id == "myfliprid-ph_status"
+
+    state = hass.states.get("binary_sensor.flipr_myfliprid_ph_status")
+    assert state
+    assert state.state == "on"  # Alert is on for binary sensor
+
+    state = hass.states.get("binary_sensor.flipr_myfliprid_chlorine_status")
+    assert state
+    assert state.state == "off"
diff --git a/tests/components/flipr/test_sensors.py b/tests/components/flipr/test_sensor.py
similarity index 89%
rename from tests/components/flipr/test_sensors.py
rename to tests/components/flipr/test_sensor.py
index 7c4855dae0a..7fd04fbc992 100644
--- a/tests/components/flipr/test_sensors.py
+++ b/tests/components/flipr/test_sensor.py
@@ -1,4 +1,4 @@
-"""Test the Flipr sensor and binary sensor."""
+"""Test the Flipr sensor."""
 from datetime import datetime
 from unittest.mock import patch
 
@@ -84,11 +84,3 @@ async def test_sensors(hass: HomeAssistant) -> None:
     assert state.attributes.get(ATTR_ICON) == "mdi:pool"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "mV"
     assert state.state == "0.23654886"
-
-    state = hass.states.get("binary_sensor.flipr_myfliprid_ph_status")
-    assert state
-    assert state.state == "on"  # Alert is on for binary sensor
-
-    state = hass.states.get("binary_sensor.flipr_myfliprid_chlorine_status")
-    assert state
-    assert state.state == "off"