Make warning tests more explicit

This commit is contained in:
Ines Montani 2019-02-10 14:02:19 +01:00
parent 0d206cf47c
commit fe39fd4d13
4 changed files with 10 additions and 9 deletions

View File

@ -7,6 +7,7 @@ import numpy
from spacy.tokens import Doc from spacy.tokens import Doc
from spacy.vocab import Vocab from spacy.vocab import Vocab
from spacy.attrs import LEMMA from spacy.attrs import LEMMA
from spacy.errors import ModelsWarning
from ..util import get_doc from ..util import get_doc
@ -344,11 +345,10 @@ def test_doc_api_has_vector():
def test_doc_api_similarity_match(): def test_doc_api_similarity_match():
doc = Doc(Vocab(), words=["a"]) doc = Doc(Vocab(), words=["a"])
with pytest.warns(None): assert doc.similarity(doc[0]) == 1.0
assert doc.similarity(doc[0]) == 1.0 assert doc.similarity(doc.vocab["a"]) == 1.0
assert doc.similarity(doc.vocab["a"]) == 1.0
doc2 = Doc(doc.vocab, words=["a", "b", "c"]) doc2 = Doc(doc.vocab, words=["a", "b", "c"])
with pytest.warns(None): with pytest.warns(ModelsWarning):
assert doc.similarity(doc2[:1]) == 1.0 assert doc.similarity(doc2[:1]) == 1.0
assert doc.similarity(doc2) == 0.0 assert doc.similarity(doc2) == 0.0

View File

@ -5,6 +5,7 @@ import pytest
from spacy.attrs import ORTH, LENGTH from spacy.attrs import ORTH, LENGTH
from spacy.tokens import Doc, Span from spacy.tokens import Doc, Span
from spacy.vocab import Vocab from spacy.vocab import Vocab
from spacy.errors import ModelsWarning
from ..util import get_doc from ..util import get_doc
@ -104,7 +105,7 @@ def test_span_similarity_match():
doc = Doc(Vocab(), words=["a", "b", "a", "b"]) doc = Doc(Vocab(), words=["a", "b", "a", "b"])
span1 = doc[:2] span1 = doc[:2]
span2 = doc[2:] span2 = doc[2:]
with pytest.warns(None): with pytest.warns(ModelsWarning):
assert span1.similarity(span2) == 1.0 assert span1.similarity(span2) == 1.0
assert span1.similarity(doc) == 0.0 assert span1.similarity(doc) == 0.0
assert span1[:1].similarity(doc.vocab["a"]) == 1.0 assert span1[:1].similarity(doc.vocab["a"]) == 1.0

View File

@ -47,7 +47,7 @@ def test_vectors_similarity_TT(vocab, vectors):
def test_vectors_similarity_TD(vocab, vectors): def test_vectors_similarity_TD(vocab, vectors):
[(word1, vec1), (word2, vec2)] = vectors [(word1, vec1), (word2, vec2)] = vectors
doc = Doc(vocab, words=[word1, word2]) doc = Doc(vocab, words=[word1, word2])
with pytest.warns(None): with pytest.warns(UserWarning):
assert doc.similarity(doc[0]) == doc[0].similarity(doc) assert doc.similarity(doc[0]) == doc[0].similarity(doc)
@ -60,5 +60,5 @@ def test_vectors_similarity_DS(vocab, vectors):
def test_vectors_similarity_TS(vocab, vectors): def test_vectors_similarity_TS(vocab, vectors):
[(word1, vec1), (word2, vec2)] = vectors [(word1, vec1), (word2, vec2)] = vectors
doc = Doc(vocab, words=[word1, word2]) doc = Doc(vocab, words=[word1, word2])
with pytest.warns(None): with pytest.warns(UserWarning):
assert doc[:2].similarity(doc[0]) == doc[0].similarity(doc[:2]) assert doc[:2].similarity(doc[0]) == doc[0].similarity(doc[:2])

View File

@ -235,7 +235,7 @@ def test_vectors_lexeme_doc_similarity(vocab, text):
@pytest.mark.parametrize("text", [["apple", "orange", "juice"]]) @pytest.mark.parametrize("text", [["apple", "orange", "juice"]])
def test_vectors_span_span_similarity(vocab, text): def test_vectors_span_span_similarity(vocab, text):
doc = Doc(vocab, words=text) doc = Doc(vocab, words=text)
with pytest.warns(None): with pytest.warns(UserWarning):
assert doc[0:2].similarity(doc[1:3]) == doc[1:3].similarity(doc[0:2]) assert doc[0:2].similarity(doc[1:3]) == doc[1:3].similarity(doc[0:2])
assert -1.0 < doc[0:2].similarity(doc[1:3]) < 1.0 assert -1.0 < doc[0:2].similarity(doc[1:3]) < 1.0
@ -243,7 +243,7 @@ def test_vectors_span_span_similarity(vocab, text):
@pytest.mark.parametrize("text", [["apple", "orange", "juice"]]) @pytest.mark.parametrize("text", [["apple", "orange", "juice"]])
def test_vectors_span_doc_similarity(vocab, text): def test_vectors_span_doc_similarity(vocab, text):
doc = Doc(vocab, words=text) doc = Doc(vocab, words=text)
with pytest.warns(None): with pytest.warns(UserWarning):
assert doc[0:2].similarity(doc) == doc.similarity(doc[0:2]) assert doc[0:2].similarity(doc) == doc.similarity(doc[0:2])
assert -1.0 < doc[0:2].similarity(doc) < 1.0 assert -1.0 < doc[0:2].similarity(doc) < 1.0