From 427944cc4491225bc043b43175d81fce6fd44e27 Mon Sep 17 00:00:00 2001
From: Oliver van Porten <oliver@van-porten.de>
Date: Fri, 20 Nov 2015 23:50:46 +0100
Subject: [PATCH] add test for mqtt+json switch

---
 tests/components/sensor/test_mqtt.py |  3 +--
 tests/components/switch/test_mqtt.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/tests/components/sensor/test_mqtt.py b/tests/components/sensor/test_mqtt.py
index 8d1aef4d57f..0c17b95e212 100644
--- a/tests/components/sensor/test_mqtt.py
+++ b/tests/components/sensor/test_mqtt.py
@@ -56,5 +56,4 @@ class TestSensorMQTT(unittest.TestCase):
         state = self.hass.states.get('sensor.test')
 
         self.assertEqual('100', state.state)
-        self.assertEqual('fav unit',
-                         state.attributes.get('unit_of_measurement'))
+
diff --git a/tests/components/switch/test_mqtt.py b/tests/components/switch/test_mqtt.py
index a09fcf86c58..4754e64e575 100644
--- a/tests/components/switch/test_mqtt.py
+++ b/tests/components/switch/test_mqtt.py
@@ -80,3 +80,31 @@ class TestSensorMQTT(unittest.TestCase):
                          self.mock_publish.mock_calls[-1][1])
         state = self.hass.states.get('switch.test')
         self.assertEqual(STATE_OFF, state.state)
+
+    def test_controlling_state_via_topic_and_json_message(self):
+        self.assertTrue(switch.setup(self.hass, {
+            'switch': {
+                'platform': 'mqtt',
+                'name': 'test',
+                'state_topic': 'state-topic',
+                'command_topic': 'command-topic',
+                'payload_on': 'beer on',
+                'payload_off': 'beer off',
+                'state_format': 'json:val'
+            }
+        }))
+
+        state = self.hass.states.get('switch.test')
+        self.assertEqual(STATE_OFF, state.state)
+
+        fire_mqtt_message(self.hass, 'state-topic', '{"val":"beer on"}')
+        self.hass.pool.block_till_done()
+
+        state = self.hass.states.get('switch.test')
+        self.assertEqual(STATE_ON, state.state)
+
+        fire_mqtt_message(self.hass, 'state-topic', '{"val":"beer off"}')
+        self.hass.pool.block_till_done()
+
+        state = self.hass.states.get('switch.test')
+        self.assertEqual(STATE_OFF, state.state)
\ No newline at end of file