From 5b321b368a1a3344b44f3234a1bc20b073e689d8 Mon Sep 17 00:00:00 2001
From: NolanB <nboukachab@teklia.com>
Date: Mon, 5 Sep 2022 15:00:37 +0200
Subject: [PATCH] Modif with the review
---
.../test_classifications.py | 22 +++++++++----------
tests/test_elements_worker/test_elements.py | 20 ++++++++++-------
2 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/tests/test_elements_worker/test_classifications.py b/tests/test_elements_worker/test_classifications.py
index 32f9d876..2ca10bee 100644
--- a/tests/test_elements_worker/test_classifications.py
+++ b/tests/test_elements_worker/test_classifications.py
@@ -15,7 +15,7 @@ def test_get_ml_class_id_load_classes(responses, mock_elements_worker):
corpus_id = "11111111-1111-1111-1111-111111111111"
responses.add(
responses.GET,
- f"http://testserver/api/v1/corpus/{corpus_id}/classes/",
+ f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
status=200,
json={
"count": 1,
@@ -42,7 +42,7 @@ def test_get_ml_class_id_load_classes(responses, mock_elements_worker):
),
]
assert mock_elements_worker.classes == {
- "11111111-1111-1111-1111-111111111111": {"good": "0000"}
+ "12341234-1234-1234-1234-123412341234": {"good": "0000"}
}
assert ml_class_id == "0000"
@@ -51,19 +51,19 @@ def test_get_ml_class_id_inexistant_class(mock_elements_worker, responses):
# A missing class is now created automatically
corpus_id = "11111111-1111-1111-1111-111111111111"
mock_elements_worker.classes = {
- "11111111-1111-1111-1111-111111111111": {"good": "0000"}
+ "12341234-1234-1234-1234-123412341234": {"good": "0000"}
}
responses.add(
responses.POST,
- f"http://testserver/api/v1/corpus/{corpus_id}/classes/",
+ f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
status=201,
json={"id": "new-ml-class-1234"},
)
# Missing class at first
assert mock_elements_worker.classes == {
- "11111111-1111-1111-1111-111111111111": {"good": "0000"}
+ "12341234-1234-1234-1234-123412341234": {"good": "0000"}
}
ml_class_id = mock_elements_worker.get_ml_class_id("bad")
@@ -71,7 +71,7 @@ def test_get_ml_class_id_inexistant_class(mock_elements_worker, responses):
# Now it's available
assert mock_elements_worker.classes == {
- "11111111-1111-1111-1111-111111111111": {
+ "12341234-1234-1234-1234-123412341234": {
"good": "0000",
"bad": "new-ml-class-1234",
}
@@ -80,7 +80,7 @@ def test_get_ml_class_id_inexistant_class(mock_elements_worker, responses):
def test_get_ml_class_id(mock_elements_worker):
mock_elements_worker.classes = {
- "11111111-1111-1111-1111-111111111111": {"good": "0000"}
+ "12341234-1234-1234-1234-123412341234": {"good": "0000"}
}
ml_class_id = mock_elements_worker.get_ml_class_id("good")
@@ -93,7 +93,7 @@ def test_get_ml_class_reload(responses, mock_elements_worker):
# Add some initial classes
responses.add(
responses.GET,
- f"http://testserver/api/v1/corpus/{corpus_id}/classes/",
+ f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
json={
"count": 1,
"next": None,
@@ -109,7 +109,7 @@ def test_get_ml_class_reload(responses, mock_elements_worker):
# Invalid response when trying to create class2
responses.add(
responses.POST,
- f"http://testserver/api/v1/corpus/{corpus_id}/classes/",
+ f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
status=400,
json={"non_field_errors": "Already exists"},
)
@@ -117,7 +117,7 @@ def test_get_ml_class_reload(responses, mock_elements_worker):
# Add both classes (class2 is created by another process)
responses.add(
responses.GET,
- f"http://testserver/api/v1/corpus/{corpus_id}/classes/",
+ f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/",
json={
"count": 2,
"next": None,
@@ -139,7 +139,7 @@ def test_get_ml_class_reload(responses, mock_elements_worker):
assert len(responses.calls) == len(BASE_API_CALLS) + 3
assert mock_elements_worker.classes == {
- corpus_id: {
+ mock_elements_worker.corpus_id: {
"class1": "class1_id",
"class2": "class2_id",
}
diff --git a/tests/test_elements_worker/test_elements.py b/tests/test_elements_worker/test_elements.py
index 46a60630..362e9112 100644
--- a/tests/test_elements_worker/test_elements.py
+++ b/tests/test_elements_worker/test_elements.py
@@ -35,9 +35,9 @@ def test_check_required_types(responses, mock_elements_worker):
corpus_id = "11111111-1111-1111-1111-111111111111"
responses.add(
responses.GET,
- f"http://testserver/api/v1/corpus/{corpus_id}/",
+ f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/",
json={
- "id": corpus_id,
+ "id": mock_elements_worker.corpus_id,
"name": "Some Corpus",
"types": [{"slug": "folder"}, {"slug": "page"}],
},
@@ -51,7 +51,7 @@ def test_check_required_types(responses, mock_elements_worker):
assert mock_elements_worker.check_required_types("page", "text_line", "act")
assert (
str(e.value)
- == "Element type(s) act, text_line were not found in the Some Corpus corpus (11111111-1111-1111-1111-111111111111)."
+ == "Element type(s) act, text_line were not found in the Some Corpus corpus (12341234-1234-1234-1234-123412341234)."
)
@@ -60,9 +60,9 @@ def test_create_missing_types(responses, mock_elements_worker):
responses.add(
responses.GET,
- f"http://testserver/api/v1/corpus/{corpus_id}/",
+ f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/",
json={
- "id": corpus_id,
+ "id": mock_elements_worker.corpus_id,
"name": "Some Corpus",
"types": [{"slug": "folder"}, {"slug": "page"}],
},
@@ -76,7 +76,7 @@ def test_create_missing_types(responses, mock_elements_worker):
"slug": "text_line",
"display_name": "text_line",
"folder": False,
- "corpus": corpus_id,
+ "corpus": mock_elements_worker.corpus_id,
}
)
],
@@ -90,7 +90,7 @@ def test_create_missing_types(responses, mock_elements_worker):
"slug": "act",
"display_name": "act",
"folder": False,
- "corpus": corpus_id,
+ "corpus": mock_elements_worker.corpus_id,
}
)
],
@@ -344,13 +344,17 @@ def test_load_corpus_classes(responses, mock_elements_worker):
assert [
(call.request.method, call.request.url) for call in responses.calls
] == BASE_API_CALLS + [
+<<<<<<< HEAD
(
"GET",
"http://testserver/api/v1/corpus/11111111-1111-1111-1111-111111111111/classes/",
),
+=======
+ ("GET", f"http://testserver/api/v1/corpus/{mock_elements_worker.corpus_id}/classes/"),
+>>>>>>> a47eb52... Modif with the review
]
assert mock_elements_worker.classes == {
- "11111111-1111-1111-1111-111111111111": {
+ "12341234-1234-1234-1234-123412341234": {
"good": "0000",
"average": "1111",
"bad": "2222",
--
GitLab