Skip to content

Commit 4b57468

Browse files
committed
RDBC-697 Refurbished legacy time series tests
1 parent 9b9046a commit 4b57468

File tree

2 files changed

+68
-67
lines changed

2 files changed

+68
-67
lines changed

ravendb/tests/jvm_migrated_tests/client_tests/time_series_tests/test_time_series_operations.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
from ravendb.documents.operations.time_series import (
44
GetTimeSeriesOperation,
55
TimeSeriesOperation,
6-
TimeSeriesBatchOperation, GetTimeSeriesStatisticsOperation,
6+
TimeSeriesBatchOperation,
7+
GetTimeSeriesStatisticsOperation,
78
)
89
from ravendb.tests.test_base import TestBase, User
910

ravendb/tests/operations_tests/test_timeseries_operaiotn.py

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,87 @@
1-
from ravendb.tests.test_base import *
1+
from datetime import datetime, timedelta
2+
3+
from ravendb.documents.operations.time_series import (
4+
GetTimeSeriesOperation,
5+
TimeSeriesOperation,
6+
TimeSeriesBatchOperation,
7+
)
8+
29
import unittest
310

11+
from ravendb.tests.test_base import TestBase, User
12+
413

514
class TestTimeSeriesOperations(TestBase):
615
def setUp(self):
716
super(TestTimeSeriesOperations, self).setUp()
8-
self.timeseries_range = TimeSeriesRange("Heartrate")
17+
self.ts_name = "Heartrate"
918
with self.store.open_session() as session:
10-
user = User(name="Idan", age="31")
11-
session.store(user, key="users/1-A")
19+
session.store(User())
1220
session.save_changes()
1321

1422
def tearDown(self):
1523
super(TestTimeSeriesOperations, self).tearDown()
16-
TestBase.delete_all_topology_files()
1724

18-
def add_timeseries(self):
19-
# Add time_series to user/1-A document
20-
time_series_operation = TimeSeriesOperation(name="Heartrate")
21-
time_series_operation.append_single(datetime.now(), 73, tag="heart/rates")
22-
time_series_operation.append_single(datetime.now() + timedelta(minutes=5), 78, tag="heart/rates")
23-
time_series_operation.append_single(datetime(2019, 4, 23) + timedelta(minutes=5), 789, tag="heart/rates")
25+
def add_time_series(self):
26+
ts_operation = TimeSeriesOperation(self.ts_name)
27+
28+
base = datetime.now()
29+
base_24 = datetime(2023, 11, 14)
30+
31+
ts_operation.append(TimeSeriesOperation.AppendOperation(base, [73], "heart/rates"))
32+
ts_operation.append(TimeSeriesOperation.AppendOperation(base + timedelta(minutes=5), [78], "heart/rates"))
33+
ts_operation.append(TimeSeriesOperation.AppendOperation(base_24 + timedelta(minutes=5), [789], "heart/rates"))
2434

25-
time_series_batch_operation = TimeSeriesBatchOperation(document_id="users/1-A", operation=time_series_operation)
35+
time_series_batch_operation = TimeSeriesBatchOperation("users/1-A", ts_operation)
2636
self.store.operations.send(time_series_batch_operation)
2737

28-
@unittest.skip("Time series")
29-
def test_append_new_timeseries(self):
30-
self.add_timeseries()
38+
def test_append_new_time_series(self):
39+
self.add_time_series()
40+
3141
# Fetch all time_series from the document
32-
time_series = self.store.operations.send(GetTimeSeriesOperation("users/1-A", ranges=self.timeseries_range))
33-
entries = time_series["Entries"]
34-
self.assertEqual(len(entries), 3)
35-
36-
@unittest.skip("Time series")
37-
def test_remove_timeseries_with_range(self):
38-
self.add_timeseries()
39-
time_series_operation_remove = TimeSeriesOperation(name="Heartrate")
40-
time_series_operation_remove.remove(
41-
from_date=datetime.now() - timedelta(days=2),
42-
to_date=datetime.now() + timedelta(days=2),
43-
)
44-
45-
time_series_batch_operation = TimeSeriesBatchOperation(
46-
document_id="users/1-A", operation=time_series_operation_remove
47-
)
42+
time_series_range_result = self.store.operations.send(GetTimeSeriesOperation("users/1-A", self.ts_name))
43+
self.assertEqual(len(time_series_range_result.entries), 3)
44+
45+
def test_remove_time_series_with_range(self):
46+
self.add_time_series()
47+
48+
base = datetime.now()
49+
ts_operation = TimeSeriesOperation(self.ts_name)
50+
ts_operation.delete(TimeSeriesOperation.DeleteOperation(base - timedelta(days=2), base + timedelta(days=2)))
51+
52+
time_series_batch_operation = TimeSeriesBatchOperation("users/1-A", ts_operation)
4853
self.store.operations.send(time_series_batch_operation)
49-
time_series = self.store.operations.send(GetTimeSeriesOperation("users/1-A", ranges=self.timeseries_range))
50-
entries = time_series["Entries"]
51-
self.assertEqual(len(entries), 1)
52-
53-
@unittest.skip("Time series")
54-
def test_remove_timeseries_without_range(self):
55-
self.add_timeseries()
56-
time_series_operation_remove = TimeSeriesOperation(name="Heartrate")
57-
time_series_operation_remove.remove()
58-
59-
time_series_batch_operation = TimeSeriesBatchOperation(
60-
document_id="users/1-A", operation=time_series_operation_remove
61-
)
54+
55+
time_series_range_result = self.store.operations.send(GetTimeSeriesOperation("users/1-A", self.ts_name))
56+
self.assertEqual(len(time_series_range_result.entries), 1)
57+
58+
def test_remove_time_series_without_range(self):
59+
self.add_time_series()
60+
61+
time_series_operation_remove = TimeSeriesOperation(self.ts_name)
62+
time_series_operation_remove.delete(TimeSeriesOperation.DeleteOperation())
63+
64+
time_series_batch_operation = TimeSeriesBatchOperation("users/1-A", time_series_operation_remove)
6265
self.store.operations.send(time_series_batch_operation)
63-
time_series = self.store.operations.send(GetTimeSeriesOperation("users/1-A", ranges=self.timeseries_range))
64-
self.assertIsNone(time_series)
65-
66-
@unittest.skip("TimeSeries")
67-
def test_get_timeseries_with_range(self):
68-
self.add_timeseries()
69-
time_series_range = TimeSeriesRange(
70-
"Heartrate",
71-
from_date=datetime.now() - timedelta(days=2),
72-
to_date=datetime.now() + timedelta(days=2),
73-
)
74-
time_series = self.store.operations.send(GetTimeSeriesOperation("users/1-A", ranges=time_series_range))
75-
entries = time_series["Entries"]
76-
self.assertEqual(len(entries), 2)
77-
78-
@unittest.skip("Time series")
79-
def test_get_timeseries_without_range(self):
80-
self.add_timeseries()
81-
time_series_range = TimeSeriesRange("Heartrate")
82-
time_series = self.store.operations.send(GetTimeSeriesOperation("users/1-A", ranges=time_series_range))
83-
entries = time_series["Entries"]
84-
self.assertEqual(len(entries), 3)
66+
67+
time_series_range_result = self.store.operations.send(GetTimeSeriesOperation("users/1-A", self.ts_name))
68+
self.assertIsNone(time_series_range_result)
69+
70+
def test_get_time_series_with_range(self):
71+
self.add_time_series()
72+
73+
base = datetime.now()
74+
from_base = base - timedelta(days=2)
75+
to_base = base + timedelta(days=2)
76+
77+
ts_result = self.store.operations.send(GetTimeSeriesOperation("users/1-A", self.ts_name, from_base, to_base))
78+
self.assertEqual(len(ts_result.entries), 2)
79+
80+
def test_get_time_series_without_range(self):
81+
self.add_time_series()
82+
83+
ts_range_result = self.store.operations.send(GetTimeSeriesOperation("users/1-A", self.ts_name))
84+
self.assertEqual(len(ts_range_result.entries), 3)
8585

8686

8787
if __name__ == "__main__":

0 commit comments

Comments
 (0)