Skip to content

Commit 9671bd5

Browse files
ivan-nikalaichanka-4ssivan-nikalaichanka-4ss
authored
ESS-2679: Match test responses to actual ones (#129)
1 parent a25a4c2 commit 9671bd5

8 files changed

Lines changed: 106 additions & 92 deletions

File tree

‎tests/response_cases.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322
# description: get metadata for id
323323
(
324324
"GET",
325-
"https://reservoir-api.4subsea.net/api/metadata/19b7230b-f88a-4217-b1c9-08daff938054",
325+
"https://reservoir-api.4subsea.net/api/metadata/8620c8cf-d9db-4ec6-9393-d45a7df6c115",
326326
): {
327327
"status_code": 200,
328328
"reason": "OK",
@@ -331,7 +331,7 @@
331331
/ "testdata"
332332
/ "response_cases"
333333
/ "datareservoirio_metadata_api"
334-
/ "metadata_get_ns_key.json"
334+
/ "metadata_get_id.json"
335335
).read_bytes(),
336336
},
337337
# description: search for metadata by namespace/key

‎tests/test_client.py‎

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -661,11 +661,10 @@ def test_metadata_get(self, client, response_cases, mock_requests):
661661
"Namespace": "foo.bar",
662662
"Key": "baz",
663663
"Value": {"vendor": "Sensor Corp", "type_": "Ampermeter"},
664-
"TimeSeriesReferenceCount": 0,
665-
"LastModifiedByEmail": None,
664+
"LastModifiedByEmail": "user@4subsea.com",
666665
"LastModified": "2023-05-05T09:01:32.6706215+00:00",
667666
"Created": "2023-01-26T11:50:20.4812338+00:00",
668-
"CreatedByEmail": None,
667+
"CreatedByEmail": "user@4subsea.com",
669668
}
670669

671670
assert response == response_expect
@@ -680,25 +679,35 @@ def test_metadata_get_by_id(self, client, response_cases, mock_requests):
680679
response_cases.set("datareservoirio-api")
681680

682681
response = client.metadata_get(
683-
metadata_id="19b7230b-f88a-4217-b1c9-08daff938054"
682+
metadata_id="8620c8cf-d9db-4ec6-9393-d45a7df6c115"
684683
)
685684

686685
response_expect = {
687-
"Id": "19b7230b-f88a-4217-b1c9-08daff938054",
686+
"Id": "8620c8cf-d9db-4ec6-9393-d45a7df6c115",
688687
"Namespace": "foo.bar",
689688
"Key": "baz",
690689
"Value": {"vendor": "Sensor Corp", "type_": "Ampermeter"},
691-
"TimeSeriesReferenceCount": 0,
692-
"LastModifiedByEmail": None,
690+
"TimeSeries": [
691+
{
692+
"TimeSeriesId": "fc485e50-e641-4410-bf10-8ce4b5d24405",
693+
"TimeOfFirstSample": 0,
694+
"TimeOfLastSample": -1,
695+
"LastModifiedByEmail": "user@4subsea.com",
696+
"Created": "2024-06-14T08:37:47.109Z",
697+
"LastModified": "2024-06-14T08:37:47.109Z",
698+
"CreatedByEmail": "user@4subsea.com",
699+
}
700+
],
701+
"LastModifiedByEmail": "user@4subsea.com",
693702
"LastModified": "2023-05-05T09:01:32.6706215+00:00",
694703
"Created": "2023-01-26T11:50:20.4812338+00:00",
695-
"CreatedByEmail": None,
704+
"CreatedByEmail": "user@4subsea.com",
696705
}
697706

698707
assert response == response_expect
699708

700709
# Check that the correct URL is poked
701-
request_url_expect = "https://reservoir-api.4subsea.net/api/metadata/19b7230b-f88a-4217-b1c9-08daff938054"
710+
request_url_expect = "https://reservoir-api.4subsea.net/api/metadata/8620c8cf-d9db-4ec6-9393-d45a7df6c115"
702711
assert mock_requests.call_args.args[1] == request_url_expect
703712

704713
def test_metadata_get_raises(self, client, response_cases):
@@ -718,11 +727,10 @@ def test_metadata_search(self, client, response_cases, mock_requests):
718727
"Namespace": "foo.bar",
719728
"Key": "baz",
720729
"Value": {"vendor": "Sensor Corp", "type_": "Ampermeter"},
721-
"TimeSeriesReferenceCount": 0,
722-
"LastModifiedByEmail": None,
730+
"LastModifiedByEmail": "user@4subsea.com",
723731
"LastModified": "2023-05-05T09:01:32.6706215+00:00",
724732
"Created": "2023-01-26T11:50:20.4812338+00:00",
725-
"CreatedByEmail": None,
733+
"CreatedByEmail": "user@4subsea.com",
726734
}
727735
]
728736

@@ -795,26 +803,23 @@ def test_set_metadata(self, client, response_cases, mock_requests):
795803
response_expect = {
796804
"TimeSeriesId": "857ca134-5bf7-4c14-b687-ede7d5cbf22f",
797805
"TimeOfFirstSample": 0,
798-
"TimeOfLastSample": 0,
799-
"LastModifiedByEmail": "string",
806+
"TimeOfLastSample": -1,
807+
"LastModifiedByEmail": "user@4subsea.com",
800808
"Created": "2023-05-03T10:25:44.572Z",
801809
"LastModified": "2023-05-03T10:25:44.572Z",
802-
"CreatedByEmail": "string",
810+
"CreatedByEmail": "user@4subsea.com",
803811
"Metadata": [
804812
{
805-
"Id": "string",
806-
"Namespace": "string",
807-
"Key": "string",
808-
"Value": {},
809-
"TimeSeriesReferenceCount": 0,
810-
"TimeSeries": [{}],
811-
"LastModifiedByEmail": "string",
813+
"Id": "8dc03b22-5a7c-499b-8861-fed5902e9f91",
814+
"Namespace": "ns",
815+
"Key": "key",
816+
"Value": {"some_name": "tress", "some_value": "emerald"},
817+
"LastModifiedByEmail": "user@4subsea.com",
812818
"LastModified": "2023-05-03T10:25:44.572Z",
813819
"Created": "2023-05-03T10:25:44.572Z",
814-
"CreatedByEmail": "string",
820+
"CreatedByEmail": "user@4subsea.com",
815821
}
816822
],
817-
"Aliases": ["string"],
818823
}
819824

820825
assert response == response_expect
@@ -843,26 +848,23 @@ def test_set_metadata_ns_key(self, client, response_cases, mock_requests):
843848
response_expect = {
844849
"TimeSeriesId": "857ca134-5bf7-4c14-b687-ede7d5cbf22f",
845850
"TimeOfFirstSample": 0,
846-
"TimeOfLastSample": 0,
847-
"LastModifiedByEmail": "string",
851+
"TimeOfLastSample": -1,
852+
"LastModifiedByEmail": "user@4subsea.com",
848853
"Created": "2023-05-03T10:25:44.572Z",
849854
"LastModified": "2023-05-03T10:25:44.572Z",
850-
"CreatedByEmail": "string",
855+
"CreatedByEmail": "user@4subsea.com",
851856
"Metadata": [
852857
{
853-
"Id": "string",
854-
"Namespace": "string",
855-
"Key": "string",
856-
"Value": {},
857-
"TimeSeriesReferenceCount": 0,
858-
"TimeSeries": [{}],
859-
"LastModifiedByEmail": "string",
858+
"Id": "8dc03b22-5a7c-499b-8861-fed5902e9f91",
859+
"Namespace": "ns",
860+
"Key": "key",
861+
"Value": {"some_name": "tress", "some_value": "emerald"},
862+
"LastModifiedByEmail": "user@4subsea.com",
860863
"LastModified": "2023-05-03T10:25:44.572Z",
861864
"Created": "2023-05-03T10:25:44.572Z",
862-
"CreatedByEmail": "string",
865+
"CreatedByEmail": "user@4subsea.com",
863866
}
864867
],
865-
"Aliases": ["string"],
866868
}
867869

868870
assert response == response_expect
@@ -913,26 +915,23 @@ def test_remove_metadata(self, client, response_cases, mock_requests):
913915
response_expect = {
914916
"TimeSeriesId": "857ca134-5bf7-4c14-b687-ede7d5cbf22f",
915917
"TimeOfFirstSample": 0,
916-
"TimeOfLastSample": 0,
917-
"LastModifiedByEmail": "string",
918+
"TimeOfLastSample": -1,
919+
"LastModifiedByEmail": "user@4subsea.com",
918920
"Created": "2023-05-03T10:25:44.567Z",
919921
"LastModified": "2023-05-03T10:25:44.567Z",
920-
"CreatedByEmail": "string",
922+
"CreatedByEmail": "user@4subsea.com",
921923
"Metadata": [
922924
{
923-
"Id": "string",
924-
"Namespace": "string",
925-
"Key": "string",
926-
"Value": {},
927-
"TimeSeriesReferenceCount": 0,
928-
"TimeSeries": [{}],
929-
"LastModifiedByEmail": "string",
925+
"Id": "8dc03b22-5a7c-499b-8861-fed5902e9f91",
926+
"Namespace": "ns",
927+
"Key": "key",
928+
"Value": {"some_name": "tress", "some_value": "emerald"},
929+
"LastModifiedByEmail": "user@4subsea.com",
930930
"LastModified": "2023-05-03T10:25:44.567Z",
931931
"Created": "2023-05-03T10:25:44.567Z",
932-
"CreatedByEmail": "string",
932+
"CreatedByEmail": "user@4subsea.com",
933933
}
934934
],
935-
"Aliases": ["string"],
936935
}
937936

938937
assert response == response_expect

‎tests/testdata/response_cases/datareservoirio_metadata_api/metadata_get_id.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"Id": "8620c8cf-d9db-4ec6-9393-d45a7df6c115",
3+
"Namespace": "foo.bar",
4+
"Key": "baz",
5+
"Value": {
6+
"vendor": "Sensor Corp",
7+
"type_": "Ampermeter"
8+
},
9+
"TimeSeries": [
10+
{
11+
"TimeSeriesId": "fc485e50-e641-4410-bf10-8ce4b5d24405",
12+
"TimeOfFirstSample": 0,
13+
"TimeOfLastSample": -1,
14+
"LastModifiedByEmail": "user@4subsea.com",
15+
"Created": "2024-06-14T08:37:47.109Z",
16+
"LastModified": "2024-06-14T08:37:47.109Z",
17+
"CreatedByEmail": "user@4subsea.com"
18+
}
19+
],
20+
"LastModifiedByEmail": "user@4subsea.com",
21+
"LastModified": "2023-05-05T09:01:32.6706215+00:00",
22+
"Created": "2023-01-26T11:50:20.4812338+00:00",
23+
"CreatedByEmail": "user@4subsea.com"
24+
}

‎tests/testdata/response_cases/datareservoirio_metadata_api/metadata_get_ns_key.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
"vendor": "Sensor Corp",
77
"type_": "Ampermeter"
88
},
9-
"TimeSeriesReferenceCount": 0,
10-
"LastModifiedByEmail": null,
9+
"LastModifiedByEmail": "user@4subsea.com",
1110
"LastModified": "2023-05-05T09:01:32.6706215+00:00",
1211
"Created": "2023-01-26T11:50:20.4812338+00:00",
13-
"CreatedByEmail": null
12+
"CreatedByEmail": "user@4subsea.com"
1413
}

‎tests/testdata/response_cases/datareservoirio_metadata_api/metadata_search.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
"vendor": "Sensor Corp",
88
"type_": "Ampermeter"
99
},
10-
"TimeSeriesReferenceCount": 0,
11-
"LastModifiedByEmail": null,
10+
"LastModifiedByEmail": "user@4subsea.com",
1211
"LastModified": "2023-05-05T09:01:32.6706215+00:00",
1312
"Created": "2023-01-26T11:50:20.4812338+00:00",
14-
"CreatedByEmail": null
13+
"CreatedByEmail": "user@4subsea.com"
1514
}
1615
]

‎tests/testdata/response_cases/datareservoirio_timeseries_api/info.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
"some_name": "tress",
1616
"some_value": "emerald"
1717
},
18-
"TimeSeriesReferenceCount": 1,
19-
"LastModifiedByEmail": null,
18+
"LastModifiedByEmail": "vrs@4subsea.com",
2019
"LastModified": "2023-01-26T11:34:07.8630181+00:00",
2120
"Created": "2018-05-30T06:52:47.6786499+00:00",
22-
"CreatedByEmail": null
21+
"CreatedByEmail": "vrs@4subsea.com"
2322
}
2423
],
25-
"Aliases": []
24+
"Aliases": [
25+
"alias"
26+
]
2627
}

‎tests/testdata/response_cases/datareservoirio_timeseries_api/timeseries_metadata_delete.json‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
{
22
"TimeSeriesId": "857ca134-5bf7-4c14-b687-ede7d5cbf22f",
33
"TimeOfFirstSample": 0,
4-
"TimeOfLastSample": 0,
5-
"LastModifiedByEmail": "string",
4+
"TimeOfLastSample": -1,
5+
"LastModifiedByEmail": "user@4subsea.com",
66
"Created": "2023-05-03T10:25:44.567Z",
77
"LastModified": "2023-05-03T10:25:44.567Z",
8-
"CreatedByEmail": "string",
8+
"CreatedByEmail": "user@4subsea.com",
99
"Metadata": [
1010
{
11-
"Id": "string",
12-
"Namespace": "string",
13-
"Key": "string",
14-
"Value": {},
15-
"TimeSeriesReferenceCount": 0,
16-
"TimeSeries": [
17-
{}
18-
],
19-
"LastModifiedByEmail": "string",
11+
"Id": "8dc03b22-5a7c-499b-8861-fed5902e9f91",
12+
"Namespace": "ns",
13+
"Key": "key",
14+
"Value": {
15+
"some_name": "tress",
16+
"some_value": "emerald"
17+
},
18+
"LastModifiedByEmail": "user@4subsea.com",
2019
"LastModified": "2023-05-03T10:25:44.567Z",
2120
"Created": "2023-05-03T10:25:44.567Z",
22-
"CreatedByEmail": "string"
21+
"CreatedByEmail": "user@4subsea.com"
2322
}
24-
],
25-
"Aliases": [
26-
"string"
2723
]
2824
}

‎tests/testdata/response_cases/datareservoirio_timeseries_api/timeseries_metadata_put.json‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
{
22
"TimeSeriesId": "857ca134-5bf7-4c14-b687-ede7d5cbf22f",
33
"TimeOfFirstSample": 0,
4-
"TimeOfLastSample": 0,
5-
"LastModifiedByEmail": "string",
4+
"TimeOfLastSample": -1,
5+
"LastModifiedByEmail": "user@4subsea.com",
66
"Created": "2023-05-03T10:25:44.572Z",
77
"LastModified": "2023-05-03T10:25:44.572Z",
8-
"CreatedByEmail": "string",
8+
"CreatedByEmail": "user@4subsea.com",
99
"Metadata": [
1010
{
11-
"Id": "string",
12-
"Namespace": "string",
13-
"Key": "string",
14-
"Value": {},
15-
"TimeSeriesReferenceCount": 0,
16-
"TimeSeries": [
17-
{}
18-
],
19-
"LastModifiedByEmail": "string",
11+
"Id": "8dc03b22-5a7c-499b-8861-fed5902e9f91",
12+
"Namespace": "ns",
13+
"Key": "key",
14+
"Value": {
15+
"some_name": "tress",
16+
"some_value": "emerald"
17+
},
18+
"LastModifiedByEmail": "user@4subsea.com",
2019
"LastModified": "2023-05-03T10:25:44.572Z",
2120
"Created": "2023-05-03T10:25:44.572Z",
22-
"CreatedByEmail": "string"
21+
"CreatedByEmail": "user@4subsea.com"
2322
}
24-
],
25-
"Aliases": [
26-
"string"
2723
]
2824
}

0 commit comments

Comments
 (0)