- - init() (core.api.kettle_logic.CBPiKettleLogic method)
+
- setup() (core.api.kettle_logic.CBPiKettleLogic method)
- (core.controller.actor_controller.ActorController method)
diff --git a/docs/index.html b/docs/index.html
index ba077fc..8e32bc9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -189,7 +189,7 @@
- Python
- Web User Interface
diff --git a/docs/kettle_controller.html b/docs/kettle_controller.html
index ca67dfa..b419c8b 100644
--- a/docs/kettle_controller.html
+++ b/docs/kettle_controller.html
@@ -244,7 +244,7 @@
-
-
init()
+setup()
This method initializes all actors during startup. It creates actor instances
@@ -295,7 +295,7 @@
Base Class for a Kettle logic.
-
-
init()
+setup()
Code which will be executed when the logic is initialised. Needs to be overwritten by the implementing logic
diff --git a/docs/sensor.html b/docs/sensor.html
index 2c09b9c..241a383 100644
--- a/docs/sensor.html
+++ b/docs/sensor.html
@@ -170,7 +170,7 @@
-
-
init()
+setup()
This method initializes all actors during startup. It creates actor instances
diff --git a/docs/standards.html b/docs/standards.html
index f35fec9..f9ba140 100644
--- a/docs/standards.html
+++ b/docs/standards.html
@@ -89,7 +89,7 @@
- Python
- Web User Interface
@@ -202,14 +202,14 @@ Typically you perform just some basing parameter validation and fire an event so
Note
- The Events are process in an async way. Results will be pushed to the client via WebSocket Event.
+ The Events are process in an async way. Results will be pushed to the client via CBPiWebSocket Event.
- WebSocket
- The WebSocket is listening on http://<IP_ADDRESS>:<PORT>/ws
+ CBPiWebSocket
+ The CBPiWebSocket is listening on http://<IP_ADDRESS>:<PORT>/ws
All events are forwarded to all connected web socket clients.
- The WebSocket Event is having the following structure.
+ The CBPiWebSocket Event is having the following structure.
- topic -> is the bus topic
- data -> the event data
diff --git a/docs/step.html b/docs/step.html
index d17c7c6..5fdf47b 100644
--- a/docs/step.html
+++ b/docs/step.html
@@ -352,7 +352,7 @@ Stops the current step
-
-
init()
+setup()
Initializer of the the Step Controller.
:return:
diff --git a/docs_src/source/standards.rst b/docs_src/source/standards.rst
index a23c932..c905e67 100644
--- a/docs_src/source/standards.rst
+++ b/docs_src/source/standards.rst
@@ -55,16 +55,16 @@ Typically you perform just some basing parameter validation and fire an event so
.. note::
- The Events are process in an async way. Results will be pushed to the client via WebSocket Event.
+ The Events are process in an async way. Results will be pushed to the client via CBPiWebSocket Event.
-WebSocket
+CBPiWebSocket
---------
-The WebSocket is listening on `http://:/ws`
+The CBPiWebSocket is listening on `http://:/ws`
All events are forwarded to all connected web socket clients.
-The WebSocket Event is having the following structure.
+The CBPiWebSocket Event is having the following structure.
* topic -> is the bus topic
* data -> the event data
diff --git a/main.py b/main.py
index 6765348..7a95a24 100644
--- a/main.py
+++ b/main.py
@@ -7,7 +7,7 @@ from hbmqtt.broker import Broker
from hbmqtt.client import MQTTClient
from hbmqtt.mqtt.constants import QOS_1
-from core.websocket import websocket_handler
+from core.cbpiwebsocket import websocket_handler
TEST_DB = "test.db"
c = MQTTClient()
diff --git a/tests/test_app.py b/tests/test_app.py
index f346f93..159b82b 100644
--- a/tests/test_app.py
+++ b/tests/test_app.py
@@ -11,8 +11,6 @@ class MyAppTestCase(AioHTTPTestCase):
async def get_application(self):
self.cbpi = CraftBeerPi()
- self.cbpi.setup()
-
await self.cbpi.init_serivces()
return self.cbpi.app
@@ -21,11 +19,9 @@ class MyAppTestCase(AioHTTPTestCase):
async def test_example(self):
resp = await self.client.post(path="/login", data={"username": "cbpi", "password": "123"})
- print("resp.status",resp.status)
assert resp.status == 200
resp = await self.client.request("GET", "/actor/1/on")
- print("resp.status", resp.status)
assert resp.status == 204
i = await self.cbpi.actor.get_one(1)
assert i.instance.state is True
@@ -46,33 +42,5 @@ class MyAppTestCase(AioHTTPTestCase):
i = await self.cbpi.actor.get_one(1)
assert i.instance.state is False
- i = await self.cbpi.actor.get_all()
- assert len(i) == 2
- #ws = await self.client.ws_connect("/ws");
- #await ws.send_str(json.dumps({"key": "test"}))
-'''
- @unittest_run_loop
- async def test_example2(self):
- print("TEST2222")
-
- print("CLIENT ###### ", self.client)
-
-
-
-
- ws = await self.client.ws_connect("/ws");
- await ws.send_str(json.dumps({"topic": "test"}))
-
-
-
- #resp = await ws.receive()
-
- #print("##### REPSONE", resp)
- assert "Manuel" in await self.cbpi.actor.get_name(), "OH NOW"
-
- await self.client.close()
-
-'''
-
diff --git a/tests/test_config.py b/tests/test_config.py
index 1457d72..833f0a7 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,32 +1,33 @@
-import asyncio
import time
import aiosqlite
from aiohttp.test_utils import AioHTTPTestCase, unittest_run_loop
-from core.craftbeerpi import CraftBeerPi
from cbpi_api.config import ConfigType
+from core.craftbeerpi import CraftBeerPi
+
+
class ConfigTestCase(AioHTTPTestCase):
async def get_application(self):
self.cbpi = CraftBeerPi()
- self.cbpi.setup()
+ await self.cbpi.init_serivces()
return self.cbpi.app
@unittest_run_loop
async def test_get(self):
- assert await self.cbpi.config2.get("CBPI_TEST_1", 1) == "22"
+ assert self.cbpi.config.get("CBPI_TEST_1", 1) == "22"
@unittest_run_loop
async def test_set_get(self):
value = str(time.time())
- await self.cbpi.config2.set("CBPI_TEST_2", value)
+ await self.cbpi.config.set("CBPI_TEST_2", value)
- assert await self.cbpi.config2.get("CBPI_TEST_2", 1) == value
+ assert self.cbpi.config.get("CBPI_TEST_2", 1) == value
@unittest_run_loop
async def test_add(self):
@@ -36,18 +37,18 @@ class ConfigTestCase(AioHTTPTestCase):
await db.execute("DELETE FROM config WHERE name = ? ", (key,))
await db.commit()
- await self.cbpi.config2.add(key, value, type=ConfigType.STRING, description="test")
+ await self.cbpi.config.add(key, value, type=ConfigType.STRING, description="test")
@unittest_run_loop
async def test_http_set(self):
value = str(time.time())
key = "CBPI_TEST_3"
- await self.cbpi.config2.set(key, value)
- assert await self.cbpi.config2.get(key, 1) == value
+ await self.cbpi.config.set(key, value)
+ assert self.cbpi.config.get(key, 1) == value
resp = await self.client.request("POST", "/config/%s/" % key, json={'value': '1'})
assert resp.status == 204
- assert await self.cbpi.config2.get(key, -1) == "1"
+ assert self.cbpi.config.get(key, -1) == "1"
@unittest_run_loop
async def test_http_get(self):
diff --git a/tests/test_kettle.py b/tests/test_kettle.py
index c723027..67855ee 100644
--- a/tests/test_kettle.py
+++ b/tests/test_kettle.py
@@ -8,19 +8,33 @@ class KettleTestCase(AioHTTPTestCase):
async def get_application(self):
self.cbpi = CraftBeerPi()
- self.cbpi.setup()
+ await self.cbpi.init_serivces()
return self.cbpi.app
+ @unittest_run_loop
+ async def test_get(self):
+
+ resp = await self.client.request("GET", "/kettle")
+ assert resp.status == 200
+ print(await resp.json())
@unittest_run_loop
- async def test_example(self):
- await asyncio.sleep(10)
- for i in range(100):
- resp = await self.client.request("GET", "/actor/")
- print(resp)
- resp = await self.client.post(path="/actor/", json={ "name": "Test", "type": "CustomActor", "config": {"gpio": 22 }})
- print(resp)
+ async def test_add(self):
+ data = {
+ "name": "Test",
+ "sensor": None,
+ "heater": "1",
+ "automatic": None,
+ "logic": "CustomKettleLogic",
+ "config": {
+ "test": "WOOHO"
+ },
+ "agitator": None,
+ "target_temp": None
+ }
+ resp = await self.client.post(path="/kettle/", json=data)
+ assert resp.status == 200
'''
result = await self.cbpi.kettle.toggle_automtic(1)
|